[HotFix]Fix rejection of all safety reasons. (#9849)

Author: ryuyu

src/NuGetGallery/Controllers/PackagesController.cs

@@ -80,13 +80,12 @@ public partial class PackagesController
             ReportPackageReason.OtherNudityOrPornography,
         };
 
-        private static readonly IReadOnlyList<ReportPackageReason> ReportAbuseWithSafetyReasons = new[]
+        private static readonly IReadOnlyList<ReportPackageReason> DisallowedReportAbuseReasons = new[]
         {
             ReportPackageReason.ViolatesALicenseIOwn,
-            ReportPackageReason.ContainsMaliciousCode,
             ReportPackageReason.ContainsSecurityVulnerability,
             ReportPackageReason.HasABugOrFailedToInstall,
-            ReportPackageReason.Other
+            ReportPackageReason.RevengePorn,
         };
 
         private static readonly IReadOnlyList<ReportPackageReason> ReportMyPackageReasons = new[]
@@ -1507,14 +1506,6 @@ public virtual async Task<ActionResult> ReportAbuse(string id, string version, R
         {
             reportForm.Message = HttpUtility.HtmlEncode(reportForm.Message);
 
-            if (reportForm.Reason == ReportPackageReason.ViolatesALicenseIOwn
-                && string.IsNullOrWhiteSpace(reportForm.Signature))
-            {
-                ModelState.AddModelError(
-                    nameof(ReportAbuseViewModel.Signature),
-                    "The signature is required.");
-            }
-
             var package = _packageService.FindPackageByIdAndVersionStrict(id, version);
 
             if (package == null)
@@ -1528,7 +1519,7 @@ public virtual async Task<ActionResult> ReportAbuse(string id, string version, R
                     : ReportAbuseReasons;
 
             var reportReason = (ReportPackageReason)reportForm.Reason;
-            if (!ReasonChoices.Contains(reportReason) || SafetyReportAbuseReasons.Contains(reportReason))
+            if (!ReasonChoices.Contains(reportReason) || DisallowedReportAbuseReasons.Contains(reportReason))
             {
                 return HttpNotFound();
             }

tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs

@@ -5876,13 +5876,38 @@ public async Task FormSendsMessageToGalleryOwnerWithEmailOnlyWhenUnauthenticated
                         It.Is<ReportAbuseMessage>(
                             r => r.Request.FromAddress.Address == ReporterEmailAddress
                                  && r.Request.Package == package
-                                 && r.Request.Reason == EnumHelper.GetDescription(ReportPackageReason.ViolatesALicenseIOwn)
+                                 && r.Request.Reason == EnumHelper.GetDescription(ReportPackageReason.ContainsMaliciousCode)
                                  && r.Request.Message == EncodedMessage
                                  && r.AlreadyContactedOwners),
                         false,
                         false));
             }
 
+            [Theory]
+            [InlineData(ReportPackageReason.ViolatesALicenseIOwn, true)]
+            [InlineData(ReportPackageReason.ContainsSecurityVulnerability, true)]
+            [InlineData(ReportPackageReason.RevengePorn, true)]
+            [InlineData(ReportPackageReason.HasABugOrFailedToInstall, true)]
+            [InlineData(ReportPackageReason.ContainsMaliciousCode, false)]
+            [InlineData(ReportPackageReason.Other, false)]
+            [InlineData(ReportPackageReason.ChildSexualExploitationOrAbuse, false)]
+            [InlineData(ReportPackageReason.TerrorismOrViolentExtremism, false)]
+            [InlineData(ReportPackageReason.HateSpeech, false)]
+            [InlineData(ReportPackageReason.ImminentHarm, false)]
+            [InlineData(ReportPackageReason.OtherNudityOrPornography, false)]
+            public async Task FormRejectsDisallowedReportReasons(ReportPackageReason reason, bool shouldReject)
+            {
+                var result = await GetReportAbuseFormResult(null, Owner, out var package, out var messageService, reason);
+                if (shouldReject)
+                {
+                    Assert.IsType<HttpNotFoundResult>(result);
+                }
+                else
+                {
+                    Assert.IsNotType<HttpNotFoundResult>(result);
+                }
+            }
+
             public static IEnumerable<object[]> FormSendsMessageToGalleryOwnerWithUserInfoWhenAuthenticated_Data
             {
                 get
@@ -5914,13 +5939,13 @@ public async Task FormSendsMessageToGalleryOwnerWithUserInfoWhenAuthenticated(Us
                                  && r.Request.FromAddress.Address == currentUser.EmailAddress
                                  && r.Request.FromAddress.DisplayName == currentUser.Username
                                  && r.Request.Package == package
-                                 && r.Request.Reason == EnumHelper.GetDescription(ReportPackageReason.ViolatesALicenseIOwn)
+                                 && r.Request.Reason == EnumHelper.GetDescription(ReportPackageReason.ContainsMaliciousCode)
                                  && r.AlreadyContactedOwners),
                         false,
                         false));
             }
 
-            public Task<ActionResult> GetReportAbuseFormResult(User currentUser, User owner, out Package package, out Mock<IMessageService> messageService)
+            public Task<ActionResult> GetReportAbuseFormResult(User currentUser, User owner, out Package package, out Mock<IMessageService> messageService, ReportPackageReason reason = ReportPackageReason.ContainsMaliciousCode)
             {
                 messageService = new Mock<IMessageService>();
                 messageService.Setup(
@@ -5943,7 +5968,7 @@ public Task<ActionResult> GetReportAbuseFormResult(User currentUser, User owner,
                 {
                     Email = ReporterEmailAddress,
                     Message = UnencodedMessage,
-                    Reason = ReportPackageReason.ViolatesALicenseIOwn,
+                    Reason = reason,
                     AlreadyContactedOwner = true,
                     Signature = Signature
                 };