Merge branch 'stop-overriding-spamcheck-verdicts' into 'master'

Stop overriding spamcheck verdicts !=ALLOW to allow rescuing via reCAPTCHA.

See merge request gitlab-org/gitlab!71496

app/services/spam/spam_verdict_service.rb

@@ -73,18 +73,12 @@ module Spam
 
       begin
         result, attribs, _error = spamcheck_client.issue_spam?(spam_issue: target, user: user, context: context)
-        return [nil, attribs] unless result
-
         # @TODO log if error is not nil https://gitlab.com/gitlab-org/gitlab/-/issues/329545
 
-        return [result, attribs] if result == NOOP || attribs["monitorMode"] == "true"
+        return [nil, attribs] unless result
 
-        # Duplicate logic with Akismet logic in #akismet_verdict
-        if Gitlab::Recaptcha.enabled? && result != ALLOW
-          [CONDITIONAL_ALLOW, attribs]
-        else
         [result, attribs]
-        end
+
       rescue StandardError => e
         Gitlab::ErrorTracking.log_exception(e)
 

spec/services/spam/spam_verdict_service_spec.rb

@@ -267,8 +267,8 @@ RSpec.describe Spam::SpamVerdictService do
           where(:verdict_value, :expected) do
             ::Spam::SpamConstants::ALLOW               | ::Spam::SpamConstants::ALLOW
             ::Spam::SpamConstants::CONDITIONAL_ALLOW   | ::Spam::SpamConstants::CONDITIONAL_ALLOW
-            ::Spam::SpamConstants::DISALLOW            | ::Spam::SpamConstants::CONDITIONAL_ALLOW
-            ::Spam::SpamConstants::BLOCK_USER          | ::Spam::SpamConstants::CONDITIONAL_ALLOW
+            ::Spam::SpamConstants::DISALLOW            | ::Spam::SpamConstants::DISALLOW
+            ::Spam::SpamConstants::BLOCK_USER          | ::Spam::SpamConstants::BLOCK_USER
           end
           # rubocop: enable Lint/BinaryOperatorWithIdenticalOperands