diff options
author | Evan Read <eread@gitlab.com> | 2018-10-23 03:22:09 +0000 |
---|---|---|
committer | Evan Read <eread@gitlab.com> | 2018-10-23 03:22:09 +0000 |
commit | 6691d5f9b6fb60bacd7252d001e7a5fe59c90e3f (patch) | |
tree | 6548558f51070f63b28ab2dc3593f3947ca0afa5 /doc | |
parent | c90447e58accaaa53c013b9d554db1c33b14fb69 (diff) | |
parent | ba525ca938c7c9b156893a1d8217e1cdcab25143 (diff) | |
download | gitlab-ce-6691d5f9b6fb60bacd7252d001e7a5fe59c90e3f.tar.gz |
Merge branch 'patch-31' into 'master'
Add information about the uid_attribute custom setting in the SAML docs
See merge request gitlab-org/gitlab-ce!22500
Diffstat (limited to 'doc')
-rw-r--r-- | doc/integration/saml.md | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/doc/integration/saml.md b/doc/integration/saml.md index e2eea57d694..a7470d27b4b 100644 --- a/doc/integration/saml.md +++ b/doc/integration/saml.md @@ -339,6 +339,23 @@ args: { } ``` +### `uid_attribute` + +> [Introduced](https://gitlab.com/gitlab-org/gitlab-ce/issues/43806) in GitLab 10.7. + +By default, the `uid` is set as the `name_id` in the SAML response. If you'd like to designate a unique attribute for the `uid`, you can set the `uid_attribute`. In the example below, the value of `uid` attribute in the SAML response is set as the `uid_attribute`. + +```yaml +args: { + assertion_consumer_service_url: 'https://gitlab.example.com/users/auth/saml/callback', + idp_cert_fingerprint: '43:51:43:a1:b5:fc:8b:b7:0a:3a:a9:b1:0f:66:73:a8', + idp_sso_target_url: 'https://login.example.com/idp', + issuer: 'https://gitlab.example.com', + name_identifier_format: 'urn:oasis:names:tc:SAML:2.0:nameid-format:persistent', + uid_attribute: 'uid' +} +``` + ## Troubleshooting ### 500 error after login |