diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-06-12 08:24:27 +0000 |
|---|---|---|
| committer | Timothy Andrew <mail@timothyandrew.net> | 2017-06-12 08:31:20 +0000 |
| commit | 09420c6d8fe4f428d0a7aaebadf15ddd4cfc36fc (patch) | |
| tree | a19a3e7bf364d2c1010b494d766deef4b719bed1 | |
| parent | 04ba6ae564e406b3bfa244f5bdb4ab80151fbfd3 (diff) | |
| download | gitlab-ce-09420c6d8fe4f428d0a7aaebadf15ddd4cfc36fc.tar.gz | |
Merge branch 'sh-recaptcha-fix-try2' into 'master'
Make sure reCAPTCHA configuration is loaded when spam checks are initiated
Closes #33532
See merge request !12080
| -rw-r--r-- | app/controllers/concerns/spammable_actions.rb | 10 | ||||
| -rw-r--r-- | changelogs/unreleased/sh-recaptcha-fix-try2.yml | 4 | ||||
| -rw-r--r-- | spec/controllers/projects/issues_controller_spec.rb | 1 |
3 files changed, 14 insertions, 1 deletions
diff --git a/app/controllers/concerns/spammable_actions.rb b/app/controllers/concerns/spammable_actions.rb index d0a692070d9..b68d76aeff0 100644 --- a/app/controllers/concerns/spammable_actions.rb +++ b/app/controllers/concerns/spammable_actions.rb @@ -17,10 +17,18 @@ module SpammableActions private + def ensure_spam_config_loaded! + return @spam_config_loaded if defined?(@spam_config_loaded) + + @spam_config_loaded = Gitlab::Recaptcha.load_configurations! + end + def recaptcha_check_with_fallback(&fallback) if spammable.valid? redirect_to spammable elsif render_recaptcha? + ensure_spam_config_loaded! + if params[:recaptcha_verification] flash[:alert] = 'There was an error with the reCAPTCHA. Please solve the reCAPTCHA again.' end @@ -35,7 +43,7 @@ module SpammableActions default_params = { request: request } recaptcha_check = params[:recaptcha_verification] && - Gitlab::Recaptcha.load_configurations! && + ensure_spam_config_loaded! && verify_recaptcha return default_params unless recaptcha_check diff --git a/changelogs/unreleased/sh-recaptcha-fix-try2.yml b/changelogs/unreleased/sh-recaptcha-fix-try2.yml new file mode 100644 index 00000000000..94729252c6f --- /dev/null +++ b/changelogs/unreleased/sh-recaptcha-fix-try2.yml @@ -0,0 +1,4 @@ +--- +title: Make sure reCAPTCHA configuration is loaded when spam checks are initiated +merge_request: +author: diff --git a/spec/controllers/projects/issues_controller_spec.rb b/spec/controllers/projects/issues_controller_spec.rb index 1f79e72495a..60a327c43c0 100644 --- a/spec/controllers/projects/issues_controller_spec.rb +++ b/spec/controllers/projects/issues_controller_spec.rb @@ -234,6 +234,7 @@ describe Projects::IssuesController do before { allow_any_instance_of(described_class).to receive(:verify_recaptcha).and_return(false) } it 'rejects an issue recognized as a spam' do + expect(Gitlab::Recaptcha).to receive(:load_configurations!).and_return(true) expect { update_spam_issue }.not_to change{ issue.reload.title } end |