diff options
author | Rémy Coutable <remy@rymai.me> | 2018-02-05 11:04:55 +0000 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2018-02-05 11:04:55 +0000 |
commit | 4ff15fcf8fdafb068c20ca99697e56a145debaaf (patch) | |
tree | 5a1f7cdb0374f17f2e8d8ef5a730fbee5a8a793e | |
parent | 5ac4eddbbf44b8bff0b0998fb93a2b9d882d0114 (diff) | |
parent | bd132dfe72ba6c083e696dfc20ce895f6e5021c3 (diff) | |
download | gitlab-ce-4ff15fcf8fdafb068c20ca99697e56a145debaaf.tar.gz |
Merge branch 'api-guard' into 'master'
Make find_user_from_sources extensible for EE
See merge request gitlab-org/gitlab-ce!16924
-rw-r--r-- | lib/api/api_guard.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/api/api_guard.rb b/lib/api/api_guard.rb index 9aeebc34525..c2113551207 100644 --- a/lib/api/api_guard.rb +++ b/lib/api/api_guard.rb @@ -42,7 +42,7 @@ module API include Gitlab::Auth::UserAuthFinders def find_current_user! - user = find_user_from_access_token || find_user_from_warden + user = find_user_from_sources return unless user forbidden!('User is blocked') unless Gitlab::UserAccess.new(user).allowed? && user.can?(:access_api) @@ -50,6 +50,10 @@ module API user end + def find_user_from_sources + find_user_from_access_token || find_user_from_warden + end + private # An array of scopes that were registered (using `allow_access_with_scope`) |