diff options
author | Rémy Coutable <remy@rymai.me> | 2018-12-04 16:39:35 +0300 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2018-12-04 16:39:35 +0300 |
commit | 4bcec7439b6228af84a902d4a7d1a3ad9d3b24c5 (patch) | |
tree | e56f967952045b119de78cc30d04c7d4528a9af0 /doc/integration/saml.md | |
parent | 8c94d245db71105f299622b31ff4192400fe8ffa (diff) | |
parent | 77f215b3f4feaab49f9d10975554b8c866e865f9 (diff) |
Merge branch 'master' into 'patch-28'
# Conflicts:
# doc/development/i18n/proofreader.md
Diffstat (limited to 'doc/integration/saml.md')
-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 |