mirror
/
Radarr
mirror of https://github.com/Radarr/Radarr
1
0
Fork 0
Code Issues Releases Wiki Activity

fixed input validation for indexers

This commit is contained in:
kay.one 2013-08-25 21:01:03 -07:00
parent 147bb5476b
commit 438e3199de
6 changed files with 48 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
NzbDrone.Api/Indexers/IndexerModule.cs
View File

@ -64,7 +64,7 @@ namespace NzbDrone.Api.Indexers
indexer.InjectFrom(indexerResource);
indexer.Settings = SchemaDeserializer.DeserializeSchema(indexer.Settings, indexerResource.Fields);
ValidateSetting(indexer.Settings);
ValidateIndexer(indexer);
indexer = _indexerService.Update(indexer);
@ -75,13 +75,16 @@ namespace NzbDrone.Api.Indexers
}
private static void ValidateSetting(IIndexerSetting setting)
private static void ValidateIndexer(Indexer indexer)
{
var validationResult = setting.Validate();
if (!validationResult.IsValid)
if (indexer.Enable)
{
throw new ValidationException(validationResult.Errors);
var validationResult = indexer.Settings.Validate();
if (!validationResult.IsValid)
{
throw new ValidationException(validationResult.Errors);
}
}
}
@ -100,7 +103,7 @@ namespace NzbDrone.Api.Indexers
indexer.InjectFrom(indexerResource);
indexer.Settings = SchemaDeserializer.DeserializeSchema(indexer.Settings, indexerResource.Fields);
ValidateSetting(indexer.Settings);
ValidateIndexer(indexer);
return indexer;
}

11
NzbDrone.Core/Indexers/IIndexerSetting.cs
View File

@ -6,15 +6,4 @@ namespace NzbDrone.Core.Indexers
{
ValidationResult Validate();
}
public class NullSetting : IIndexerSetting
{
public static readonly NullSetting Instance = new NullSetting();
public ValidationResult Validate()
{
return new ValidationResult();
}
}
}

23
NzbDrone.Core/Indexers/Newznab/NewznabSettings.cs
View File

@ -7,12 +7,22 @@ using NzbDrone.Core.Validation;
namespace NzbDrone.Core.Indexers.Newznab
{
public class NewznabSettingsValidator : AbstractValidator<NewznabSettings>
{
public NewznabSettingsValidator()
{
RuleFor(c => c.Url).ValidRootUrl();
}
}
public class NewznabSettings : IIndexerSetting
{
private static readonly NewznabSettingsValidator Validator = new NewznabSettingsValidator();
public NewznabSettings()
{
Categories = new[] { 5030, 5040 };
//RuleFor(c => c.Url).ValidRootUrl();
}
[FieldDefinition(0, Label = "URL")]
@ -23,18 +33,9 @@ namespace NzbDrone.Core.Indexers.Newznab
public IEnumerable<Int32> Categories { get; set; }
public bool IsValid
{
get
{
return !string.IsNullOrWhiteSpace(Url);
}
}
public ValidationResult Validate()
{
return new ValidationResult();
//return Validate(this);
return Validator.Validate(this);
}
}
}

14
NzbDrone.Core/Indexers/NullSetting.cs Normal file
View File

@ -0,0 +1,14 @@
using FluentValidation.Results;
namespace NzbDrone.Core.Indexers
{
public class NullSetting : IIndexerSetting
{
public static readonly NullSetting Instance = new NullSetting();
public ValidationResult Validate()
{
return new ValidationResult();
}
}
}

19
NzbDrone.Core/Indexers/Omgwtfnzbs/OmgwtfnzbsSettings.cs
View File

@ -1,18 +1,22 @@
using System;
using FluentValidation;
using FluentValidation.Results;
using Newtonsoft.Json;
using NzbDrone.Core.Annotations;
namespace NzbDrone.Core.Indexers.Omgwtfnzbs
{
public class OmgwtfnzbsSettingsValidator : AbstractValidator<OmgwtfnzbsSettings>
{
public OmgwtfnzbsSettingsValidator()
{
RuleFor(c => c.Username).NotEmpty();
RuleFor(c => c.ApiKey).NotEmpty();
}
}
public class OmgwtfnzbsSettings : IIndexerSetting
{
// public OmgwtfnzbsSettings()
// {
// RuleFor(c => c.Username).NotEmpty();
// RuleFor(c => c.ApiKey).NotEmpty();
// }
private static readonly OmgwtfnzbsSettingsValidator Validator = new OmgwtfnzbsSettingsValidator();
[FieldDefinition(0, Label = "Username")]
public String Username { get; set; }
@ -22,8 +26,7 @@ namespace NzbDrone.Core.Indexers.Omgwtfnzbs
public ValidationResult Validate()
{
return new ValidationResult();
//return Validate(this);
return Validator.Validate(this);
}
}
}

1
NzbDrone.Core/NzbDrone.Core.csproj
View File

@ -210,6 +210,7 @@
<Compile Include="Indexers\IndexerSettingUpdatedEvent.cs" />
<Compile Include="Indexers\IndexerWithSetting.cs" />
<Compile Include="Indexers\Newznab\SizeParsingException.cs" />
<Compile Include="Indexers\NullSetting.cs" />
<Compile Include="Indexers\RssSyncCommand.cs" />
<Compile Include="Indexers\XElementExtensions.cs" />
<Compile Include="Instrumentation\Commands\ClearLogCommand.cs" />