Issue 16229. Validation for empty filenames when uploading media

src/Orchard.Tests/Extensions/NullOrEmptyTrimmedStringExtensionsTests.cs

@@ -0,0 +1,33 @@
+using NUnit.Framework;
+using Orchard.Extensions;
+
+namespace Orchard.Tests.Extensions
+{
+    [TestFixture]
+    public class NullOrEmptyTrimmedStringExtensionsTests
+    {
+        [Test]
+        public void Trimmed_EmptyStringReturnsTrue() {
+            const string testString = "";
+            Assert.AreEqual(true, testString.IsNullOrEmptyTrimmed());
+        }
+
+        [Test]
+        public void NullStringReturnsTrue() {
+            const string testString = null;
+            Assert.AreEqual(true, testString.IsNullOrEmptyTrimmed());
+        }
+
+        [Test]
+        public void SpacedStringReturnsTrue() {
+            const string testString = "    ";
+            Assert.AreEqual(true, testString.IsNullOrEmptyTrimmed());
+        }
+
+        [Test]
+        public void ActualStringReturnsFalse() {
+            const string testString = "testString";
+            Assert.AreEqual(false, testString.IsNullOrEmptyTrimmed());
+        }
+    }
+}

src/Orchard.Tests/Orchard.Tests.csproj

@@ -148,6 +148,7 @@
     <Compile Include="EventsTests.cs" />
     <Compile Include="Extensions\ExtensionFoldersTests.cs" />
     <Compile Include="Extensions\ExtensionManagerTests.cs" />
+    <Compile Include="Extensions\NullOrEmptyTrimmedStringExtensionsTests.cs" />
     <Compile Include="Localization\NullLocalizerTests.cs" />
     <Compile Include="Logging\LoggingModuleTests.cs" />
     <Compile Include="Mvc\ModelBinders\KeyedListModelBinderTests.cs" />

src/Orchard.Web/Modules/Orchard.Media/Controllers/AdminController.cs

@@ -4,6 +4,7 @@ using System.IO;
 using System.Text;
 using System.Web;
 using System.Web.Mvc;
+using Orchard.Extensions;
 using Orchard.Localization;
 using Orchard.Media.Models;
 using Orchard.Media.Services;
@@ -139,21 +140,32 @@ namespace Orchard.Media.Controllers {
         }
 
         [HttpPost]
-        public ActionResult Add() {
+        public ActionResult Add()
+        {
             var viewModel = new MediaItemAddViewModel();
-            try {
+            try
+            {
                 UpdateModel(viewModel);
                 if (!Services.Authorizer.Authorize(Permissions.UploadMediaFiles, T("Couldn't upload media file")))
                     return new HttpUnauthorizedResult();
 
-                foreach (string fileName in Request.Files) {
+                if(Request.Files[0].FileName.IsNullOrEmptyTrimmed()) {
+                    ModelState.AddModelError("File", "Select a file to upload");
+                }
+
+                if (!ModelState.IsValid)
+                    return View(viewModel);
+
+                foreach (string fileName in Request.Files)
+                {
                     HttpPostedFileBase file = Request.Files[fileName];
                     _mediaService.UploadMediaFile(viewModel.MediaPath, file);
                 }
 
                 return RedirectToAction("Edit", new { name = viewModel.FolderName, mediaPath = viewModel.MediaPath });
             }
-            catch (Exception exception) {
+            catch (Exception exception)
+            {
                 Services.Notifier.Error("Uploading media file failed: " + exception.Message);
                 return View(viewModel);
             }

src/Orchard/Extensions/StringExtensions.cs

@@ -15,5 +15,11 @@ namespace Orchard.Extensions {
 
             return cleanTailRegex.Replace(text.Substring(0, characterCount + 1), "") + ellipsis;
         }
+
+        public static bool IsNullOrEmptyTrimmed(this string text)
+        {
+            if(text == null) return true;
+            return string.IsNullOrEmpty(text.Trim());
+        }
     }
 }