diff options
| author | Patricio Cano <suprnova32@gmail.com> | 2016-06-28 18:19:04 -0500 |
|---|---|---|
| committer | Patricio Cano <suprnova32@gmail.com> | 2016-06-29 10:37:54 -0500 |
| commit | 10444f61f85219eb6b2c10586996717d3b0afa8b (patch) | |
| tree | 68e635fc03b159ce21c9a48a3034367a6865eefb /lib/gitlab/o_auth | |
| parent | ebe21acc2a2f0a569e1e10314ac9407024becafb (diff) | |
| download | gitlab-ce-10444f61f85219eb6b2c10586996717d3b0afa8b.tar.gz | |
Fixed privilege escalation issue where manually set external users would be reverted back to internal users if they logged in via OAuth and that provider was not in the `external_providers` list.
Diffstat (limited to 'lib/gitlab/o_auth')
| -rw-r--r-- | lib/gitlab/o_auth/user.rb | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/lib/gitlab/o_auth/user.rb b/lib/gitlab/o_auth/user.rb index 7af75a9cc4c..0a91d3918d5 100644 --- a/lib/gitlab/o_auth/user.rb +++ b/lib/gitlab/o_auth/user.rb @@ -56,8 +56,6 @@ module Gitlab if external_provider? && @user @user.external = true - elsif @user - @user.external = false end @user |