Revert "Add reCAPTCHA to package uploads (#8948)" (#8952)

This reverts commit afb9219.

Author: drewgillies

src/AccountDeleter/EmptyFeatureFlagService.cs

@@ -285,10 +285,5 @@ public bool ProxyGravatarEnSubdomain()
         {
             throw new NotImplementedException();
         }
-
-        public bool IsRecaptchaEnabledForUploads()
-        {
-            throw new NotImplementedException();
-        }
     }
 }

src/GitHubVulnerabilities2Db/Fakes/FakeFeatureFlagService.cs

@@ -284,10 +284,5 @@ public bool IsRecentPackagesNoIndexEnabled()
         {
             throw new NotImplementedException();
         }
-
-        public bool IsRecaptchaEnabledForUploads()
-        {
-            throw new NotImplementedException();
-        }
     }
 }

src/NuGetGallery.Services/Configuration/FeatureFlagService.cs

@@ -55,7 +55,6 @@ public class FeatureFlagService : IFeatureFlagService
         private const string DisplayTargetFrameworkFeatureName = GalleryPrefix + "DisplayTargetFramework";
         private const string ComputeTargetFrameworkFeatureName = GalleryPrefix + "ComputeTargetFramework";
         private const string RecentPackagesNoIndexFeatureName = GalleryPrefix + "RecentPackagesNoIndex";
-        private const string RecaptchaEnabledForUploadsName = GalleryPrefix + "RecaptchaForUploads";
 
         private const string ODataV1GetAllNonHijackedFeatureName = GalleryPrefix + "ODataV1GetAllNonHijacked";
         private const string ODataV1GetAllCountNonHijackedFeatureName = GalleryPrefix + "ODataV1GetAllCountNonHijacked";
@@ -375,10 +374,5 @@ public bool IsRecentPackagesNoIndexEnabled()
         {
             return _client.IsEnabled(RecentPackagesNoIndexFeatureName, defaultValue: false);
         }
-
-        public bool IsRecaptchaEnabledForUploads()
-        {
-            return _client.IsEnabled(RecaptchaEnabledForUploadsName, defaultValue: false);
-        }
     }
 }

src/NuGetGallery.Services/Configuration/IFeatureFlagService.cs

@@ -301,10 +301,5 @@ public interface IFeatureFlagService
         /// Whether or not recent packages has no index applied to block search engine indexing.
         /// </summary>
         bool IsRecentPackagesNoIndexEnabled();
-
-        /// <summary>
-        /// Whether or not we have reCAPTCHA enabled for package uploads
-        /// </summary>
-        bool IsRecaptchaEnabledForUploads();
     }
 }

src/NuGetGallery/App_Data/Files/Content/flags.json

@@ -31,8 +31,7 @@
     "NuGetGallery.MarkdigMdRendering": "Enabled",
     "NuGetGallery.ImageAllowlist": "Enabled",
     "NuGetGallery.ShowReportAbuseSafetyChanges": "Enabled",
-    "NuGetGallery.ComputeTargetFramework": "Enabled",
-    "NuGetGallery.RecaptchaForUploads": "Disabled"
+    "NuGetGallery.ComputeTargetFramework": "Enabled"
   },
   "Flights": {
     "NuGetGallery.TyposquattingFlight": {

src/NuGetGallery/App_Start/DefaultDependenciesModule.cs

@@ -20,7 +20,6 @@
 using Autofac;
 using Autofac.Core;
 using Autofac.Extensions.DependencyInjection;
-using Autofac.Integration.Mvc;
 using Elmah;
 using Microsoft.ApplicationInsights.Extensibility;
 using Microsoft.ApplicationInsights.Extensibility.Implementation;
@@ -48,8 +47,8 @@
 using NuGetGallery.Cookies;
 using NuGetGallery.Diagnostics;
 using NuGetGallery.Features;
-using NuGetGallery.Filters;
 using NuGetGallery.Frameworks;
+using NuGetGallery.Helpers;
 using NuGetGallery.Infrastructure;
 using NuGetGallery.Infrastructure.Authentication;
 using NuGetGallery.Infrastructure.Lucene;
@@ -510,8 +509,6 @@ protected override void Load(ContainerBuilder builder)
 
             RegisterCookieComplianceService(configuration, loggerFactory);
 
-            RegisterCustomMvcFilters(builder, configuration);
-
             builder.RegisterType<CookieExpirationService>()
                 .As<ICookieExpirationService>()
                 .SingleInstance();
@@ -863,17 +860,6 @@ private static void RegisterFeatureFlagsService(ContainerBuilder builder, Config
                 .SingleInstance();
         }
 
-        private static void RegisterCustomMvcFilters(ContainerBuilder builder, ConfigurationService configuration)
-        {
-#pragma warning disable CS4014 // VerifyPackage is not awaited because this is attachment, not execution
-            builder
-                .Register(context => new ValidateRecaptchaResponseForUploadsAttribute(context.Resolve<IFeatureFlagService>()))
-                .AsActionFilterFor<PackagesController>(controller => controller.VerifyPackage(default(VerifyPackageRequest)));
-#pragma warning restore CS4014 // VerifyPackage is not awaited because this is attachment, not execution
-
-            builder.RegisterFilterProvider();
-        }
-
         private static void RegisterMessagingService(ContainerBuilder builder, ConfigurationService configuration)
         {
             if (configuration.Current.AsynchronousEmailServiceEnabled)

src/NuGetGallery/Controllers/PackagesController.cs

@@ -326,7 +326,6 @@ private async Task<ActionResult> UploadSymbolsPackageInternal(SubmitPackageReque
             var verifyRequest = new VerifyPackageRequest(packageMetadata, accountsAllowedOnBehalfOf, existingPackageRegistration);
             verifyRequest.IsSymbolsPackage = true;
             verifyRequest.HasExistingAvailableSymbols = packageForUploadingSymbols.IsLatestSymbolPackageAvailable();
-            verifyRequest.RecaptchaEnabled = false; // No need for recaptcha for symbols packages
 
             model.InProgressUpload = verifyRequest;
 
@@ -374,7 +373,6 @@ private async Task<ActionResult> UploadPackageInternal(SubmitPackageRequest mode
             verifyRequest.LicenseFileContents = await GetLicenseFileContentsOrNullAsync(packageMetadata, packageArchiveReader);
             verifyRequest.LicenseExpressionSegments = GetLicenseExpressionSegmentsOrNull(packageMetadata.LicenseMetadata);
             verifyRequest.ReadmeFileContents = await GetReadmeFileContentsOrNullAsync(packageMetadata, packageArchiveReader);
-            verifyRequest.RecaptchaEnabled = _featureFlagService.IsRecaptchaEnabledForUploads();
 
             model.InProgressUpload = verifyRequest;
             return View(model);
@@ -2407,7 +2405,6 @@ public virtual ActionResult CancelPendingOwnershipRequest(string id, string requ
             return Redirect(Url.ManagePackageOwnership(id));
         }
 
-        /// Note that for Recaptcha filtering we attach ValidateRecaptchaResponseForUploadsAttribute directly here: <see cref="DefaultDependenciesModule.RegisterCustomMvcFilters" />.
         [UIAuthorize]
         [HttpPost]
         [RequiresAccountConfirmation("upload a package")]

src/NuGetGallery/Filters/ValidateRecaptchaResponseAttribute.cs

@@ -12,7 +12,7 @@
 namespace NuGetGallery.Filters
 {
     [AttributeUsage(AttributeTargets.Method | AttributeTargets.Class, Inherited = true, AllowMultiple = true)]
-    public class ValidateRecaptchaResponseAttribute : ActionFilterAttribute
+    public sealed class ValidateRecaptchaResponseAttribute : ActionFilterAttribute
     {
         private const string RecaptchaResponseId = "g-recaptcha-response";
         private const string RecaptchaValidationUrl = "https://www.google.com/recaptcha/api/siteverify?secret={0}&response={1}";

src/NuGetGallery/Filters/ValidateRecaptchaResponseForUploadsAttribute.cs

@@ -220,7 +220,6 @@
     <Compile Include="Extensions\CakeBuildManagerExtensions.cs" />
     <Compile Include="Extensions\ImageExtensions.cs" />
     <Compile Include="Filters\AdminActionAttribute.cs" />
-    <Compile Include="Filters\ValidateRecaptchaResponseForUploadsAttribute.cs" />
     <Compile Include="Helpers\AdminHelper.cs" />
     <Compile Include="Helpers\ValidationHelper.cs" />
     <Compile Include="Helpers\ViewModelExtensions\DeleteAccountListPackageItemViewModelFactory.cs" />