Archive-Team
/
sonarr-repo-only
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Always validate Custom Script path

This commit is contained in:
Mark McDowall 2023-11-19 00:17:32 -08:00
parent c3dcc542da
commit c922cc5dc6
2 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/NzbDrone.Core/Notifications/CustomScript/CustomScript.cs
View File

@ -363,14 +363,6 @@ namespace NzbDrone.Core.Notifications.CustomScript
failures.Add(new NzbDroneValidationFailure("Path", "File does not exist")); failures.Add(new NzbDroneValidationFailure("Path", "File does not exist"));
} }
foreach (var systemFolder in SystemFolders.GetSystemFolders())
{
if (systemFolder.IsParentPath(Settings.Path))
{
failures.Add(new NzbDroneValidationFailure("Path", $"Must not be a descendant of '{systemFolder}'"));
}
}
if (failures.Empty()) if (failures.Empty())
{ {
try try

1
src/NzbDrone.Core/Notifications/CustomScript/CustomScriptSettings.cs
View File

@ -11,6 +11,7 @@ namespace NzbDrone.Core.Notifications.CustomScript
public CustomScriptSettingsValidator() public CustomScriptSettingsValidator()
{ {
RuleFor(c => c.Path).IsValidPath(); RuleFor(c => c.Path).IsValidPath();
RuleFor(c => c.Path).SetValidator(new SystemFolderValidator()).WithMessage("Must not be a descendant of '{systemFolder}'");
RuleFor(c => c.Arguments).Empty().WithMessage("Arguments are no longer supported for custom scripts"); RuleFor(c => c.Arguments).Empty().WithMessage("Arguments are no longer supported for custom scripts");
} }
} }