summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBlair Lunceford <blunceford@gitlab.com>2018-10-19 19:59:53 +0000
committerBlair Lunceford <blunceford@gitlab.com>2018-10-19 19:59:53 +0000
commit81e954f884d8b5060ce89918c74577fab8d90ffd (patch)
tree98d3cfe921b558d5ac601d2a79d50b50e97bd035
parentec0199b8fa0abe203905e0abb3a5d5c4c0748688 (diff)
downloadgitlab-ce-81e954f884d8b5060ce89918c74577fab8d90ffd.tar.gz
Add information about the uid_attribute custom setting in the SAML docs
-rw-r--r--doc/integration/saml.md18
1 files changed, 18 insertions, 0 deletions
diff --git a/doc/integration/saml.md b/doc/integration/saml.md
index e2eea57d694..ccfce278438 100644
--- a/doc/integration/saml.md
+++ b/doc/integration/saml.md
@@ -339,6 +339,24 @@ args: {
}
```
+### `uid_attribute`
+
+>**Note:**
+This setting is only available on GitLab 10.7 and above.
+
+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 below example, there is an attribute named `uid` in the SAML response that the user would like to set as the `uid`.
+
+```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