lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-04-05 13:51:22 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Media Library: Fixing that renaming files to a reserved Windows name should cause an error, fixes #6802 (#6919)

Browse Source
This commit is contained in:
Jack Cheng 2019-08-22 10:39:09 -07:00 committed by Benedek Farkas
parent 0279b1e79e
commit a3e9bef3ca
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Orchard.Web/Modules/Orchard.MediaLibrary/MediaFileName/MediaFileNameDriver.cs
View File

@ -61,9 +61,12 @@ namespace Orchard.MediaLibrary.MediaFileName
try {
_mediaLibraryService.RenameFile(part.FolderPath, priorFileName, model.FileName);
part.FileName = model.FileName;
_notifier.Add(NotifyType.Information, T("File '{0}' was renamed to '{1}'", priorFileName, model.FileName));
}
catch (OrchardException) {
updater.AddModelError("MediaFileNameEditorSettings.FileName", T("Unable to rename file. Invalid Windows file path."));
}
catch (Exception) {
updater.AddModelError("MediaFileNameEditorSettings.FileName", T("Unable to rename file"));
}

4
src/Orchard/Validation/PathValidation.cs
View File

@ -1,11 +1,13 @@
using System;
using System.IO;
using Orchard.Localization;
namespace Orchard.Validation {
/// <summary>
/// Provides methods to validate paths.
/// </summary>
public static class PathValidation {
/// <summary>
/// Determines if a path lies within the base path boundaries.
/// If not, an exception is thrown.
@ -26,7 +28,7 @@ namespace Orchard.Validation {
}
if (!valid) {
throw new ArgumentException("Invalid path");
throw new OrchardException(new LocalizedString("Invalid Path"));
}
return mappedPath;