Return 400 Bad Request instead of 500 Internal Server Error when NuGe…

…t.exe push encounters a validation error Return 400 Bad Request instead of 500 Internal Server Error when NuGet.exe push encounters a validation error
AtwoodTM · Mar 30, 2016 · 5ebbf06 · 5ebbf06
1 parent 12e96a0
commit 5ebbf06
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 7 deletions.
diff --git a/src/NuGetGallery/Controllers/ApiController.cs b/src/NuGetGallery/Controllers/ApiController.cs
@@ -12,6 +12,7 @@
 using System.Web.Mvc;
 using System.Web.UI;
 using Newtonsoft.Json.Linq;
+using NuGet.Frameworks;
 using NuGet.Packaging;
 using NuGet.Versioning;
 using NuGetGallery.Configuration;
@@ -247,7 +248,8 @@ private async Task<ActionResult> CreatePackageInternal()
                         {
                             if (!packageRegistration.IsOwner(user))
                             {
-                                return new HttpStatusCodeWithBodyResult(HttpStatusCode.Forbidden, Strings.ApiKeyNotAuthorized);
+                                return new HttpStatusCodeWithBodyResult(HttpStatusCode.Forbidden,
+                                    Strings.ApiKeyNotAuthorized);
                             }
 
                             // Check if a particular Id-Version combination already exists. We eventually need to remove this check.
@@ -275,7 +277,10 @@ private async Task<ActionResult> CreatePackageInternal()
                             Size = packageStream.Length,
                         };
 
-                        var package = await PackageService.CreatePackageAsync(packageToPush, packageStreamMetadata, user, commitChanges: false);
+                        var package =
+                            await
+                                PackageService.CreatePackageAsync(packageToPush, packageStreamMetadata, user,
+                                    commitChanges: false);
                         await AutoCuratePackage.ExecuteAsync(package, packageToPush, commitChanges: false);
                         await EntitiesContext.SaveChangesAsync();
 
@@ -289,15 +294,32 @@ private async Task<ActionResult> CreatePackageInternal()
                         return new HttpStatusCodeResult(HttpStatusCode.Created);
                     }
                 }
+                catch (InvalidPackageException ex)
+                {
+                    return BadRequestForExceptionMessage(ex);
+                }
                 catch (InvalidDataException ex)
                 {
-                    return new HttpStatusCodeWithBodyResult(
-                        HttpStatusCode.BadRequest,
-                        string.Format(CultureInfo.CurrentCulture, Strings.UploadPackage_InvalidPackage, ex.Message));
+                    return BadRequestForExceptionMessage(ex);
+                }
+                catch (EntityException ex)
+                {
+                    return BadRequestForExceptionMessage(ex);
+                }
+                catch (FrameworkException ex)
+                {
+                    return BadRequestForExceptionMessage(ex);
                 }
             }
         }
 
+        private static ActionResult BadRequestForExceptionMessage(Exception ex)
+        {
+            return new HttpStatusCodeWithBodyResult(
+                HttpStatusCode.BadRequest,
+                string.Format(CultureInfo.CurrentCulture, Strings.UploadPackage_InvalidPackage, ex.Message));
+        }
+
         [HttpDelete]
         [RequireSsl]
         [ApiAuthorize]

diff --git a/src/NuGetGallery/Strings.Designer.cs b/src/NuGetGallery/Strings.Designer.cs
diff --git a/src/NuGetGallery/Strings.resx b/src/NuGetGallery/Strings.resx
@@ -306,7 +306,7 @@ The {2} Team</value>
     <value>You canceled your email address change request.</value>
   </data>
   <data name="UploadPackage_InvalidPackage" xml:space="preserve">
-    <value>The NuGet is invalid. The error encountered was:'{0}'. Correct the error and try again.</value>
+    <value>The NuGet package is invalid. The error encountered was:'{0}'. Correct the error and try again.</value>
   </data>
   <data name="UploadPackage_InvalidNuspec" xml:space="preserve">
     <value>The NuGet package contains an invalid .nuspec file. The error encountered was:'{0}'. Correct the error and try again.</value>