diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-11-20 11:07:59 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-11-20 11:07:59 +0000 |
| commit | 6f0ff56ef8d2a3c33c13bd8af7821e9fa5fd2d76 (patch) | |
| tree | 52992a09876c74ee354db9d78dcd8459c9058cf8 /lib | |
| parent | 5cd0e7d29ff4c9fbe3a542212e6823b741abcac9 (diff) | |
| parent | 2a8a4897ffebd01c784c028200d0cbdfaf32695e (diff) | |
| download | gitlab-ce-6f0ff56ef8d2a3c33c13bd8af7821e9fa5fd2d76.tar.gz | |
Merge branch 'fix/allow-saml2-for-2fa-bypass' into 'master'
saml/auth_hash: Allow 2FA bypass for SAML 2.0 responses
See merge request gitlab-org/gitlab-ce!22568
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/auth/saml/auth_hash.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/auth/saml/auth_hash.rb b/lib/gitlab/auth/saml/auth_hash.rb index 316354fd50c..1af9fa40c3a 100644 --- a/lib/gitlab/auth/saml/auth_hash.rb +++ b/lib/gitlab/auth/saml/auth_hash.rb @@ -28,7 +28,7 @@ module Gitlab end def extract_authn_context(document) - REXML::XPath.first(document, "//saml:AuthnStatement/saml:AuthnContext/saml:AuthnContextClassRef/text()").to_s + REXML::XPath.first(document, "//*[name()='saml:AuthnStatement' or name()='saml2:AuthnStatement']/*[name()='saml:AuthnContext' or name()='saml2:AuthnContext']/*[name()='saml:AuthnContextClassRef' or name()='saml2:AuthnContextClassRef']/text()").to_s end end end |