diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-04-30 16:11:36 +0000 |
|---|---|---|
| committer | James Lopez <james@jameslopez.es> | 2018-05-02 12:34:38 +0200 |
| commit | c0a0443c1465e2737449a4e7a55c2adf54db766a (patch) | |
| tree | 49df18ce20c9c6588c8c0e7979d63ac1f806aa82 | |
| parent | 10ed401d435577f23f0c9c195c206f3201cac815 (diff) | |
| download | gitlab-ce-c0a0443c1465e2737449a4e7a55c2adf54db766a.tar.gz | |
Merge branch 'bvl-fix-openid-redirect' into 'master'
Skip `authenticate_user!` for Doorkeeper controllers
Closes #44639
See merge request gitlab-org/gitlab-ce!18599
| -rw-r--r-- | changelogs/unreleased/bvl-fix-openid-redirect.yml | 5 | ||||
| -rw-r--r-- | config/initializers/9_fast_gettext.rb (renamed from config/initializers/fast_gettext.rb) | 0 | ||||
| -rw-r--r-- | config/initializers/doorkeeper.rb | 2 | ||||
| -rw-r--r-- | lib/gitlab/base_doorkeeper_controller.rb | 8 | ||||
| -rw-r--r-- | spec/requests/openid_connect_spec.rb | 9 |
5 files changed, 23 insertions, 1 deletions
diff --git a/changelogs/unreleased/bvl-fix-openid-redirect.yml b/changelogs/unreleased/bvl-fix-openid-redirect.yml new file mode 100644 index 00000000000..83ee6d953e4 --- /dev/null +++ b/changelogs/unreleased/bvl-fix-openid-redirect.yml @@ -0,0 +1,5 @@ +--- +title: Fix redirection error for applications using OpenID +merge_request: 18599 +author: +type: fixed diff --git a/config/initializers/fast_gettext.rb b/config/initializers/9_fast_gettext.rb index fd0167aa476..fd0167aa476 100644 --- a/config/initializers/fast_gettext.rb +++ b/config/initializers/9_fast_gettext.rb diff --git a/config/initializers/doorkeeper.rb b/config/initializers/doorkeeper.rb index 2079d3acb72..e3a342590d4 100644 --- a/config/initializers/doorkeeper.rb +++ b/config/initializers/doorkeeper.rb @@ -104,5 +104,5 @@ Doorkeeper.configure do # set to true if you want this to be allowed # wildcard_redirect_uri false - base_controller 'ApplicationController' + base_controller '::Gitlab::BaseDoorkeeperController' end diff --git a/lib/gitlab/base_doorkeeper_controller.rb b/lib/gitlab/base_doorkeeper_controller.rb new file mode 100644 index 00000000000..e4227af25d2 --- /dev/null +++ b/lib/gitlab/base_doorkeeper_controller.rb @@ -0,0 +1,8 @@ +# This is a base controller for doorkeeper. +# It adds the `can?` helper used in the views. +module Gitlab + class BaseDoorkeeperController < ActionController::Base + include Gitlab::Allowable + helper_method :can? + end +end diff --git a/spec/requests/openid_connect_spec.rb b/spec/requests/openid_connect_spec.rb index 6bed8e812c0..cd1a6cfc427 100644 --- a/spec/requests/openid_connect_spec.rb +++ b/spec/requests/openid_connect_spec.rb @@ -153,4 +153,13 @@ describe 'OpenID Connect requests' do end end end + + context 'OpenID configuration information' do + it 'correctly returns the configuration' do + get '/.well-known/openid-configuration' + + expect(response).to have_gitlab_http_status(200) + expect(json_response).to have_key('issuer') + end + end end |