Commit 6691d5f9 authored by Evan Read's avatar Evan Read

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
parents c90447e5 ba525ca9
...@@ -339,6 +339,23 @@ args: { ...@@ -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 ## Troubleshooting
### 500 error after login ### 500 error after login
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment