diff options
| author | Stan Hu <stanhu@gmail.com> | 2019-01-29 09:35:25 +0300 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2019-01-29 22:15:06 +0300 |
| commit | ab4aba7065b52281fcd1224e1e883fe35128751c (patch) | |
| tree | 819c7939825c4fa53c1bc446d7ac8ac8c841c29f /changelogs | |
| parent | bbf6e65dd2874ae1866ee6d87713f45de1f95d55 (diff) | |
Fix failed LDAP logins when nil user_id present
When a LDAP user signs in the for the first time and if there
is an `Identity` object with `user_id` of `nil`, new users
will not be able to be register until that entry is cleared
because of the way identities are created:
1. First, the User object is built but not saved, so it has no `id`.
2. Then, `user.identities.build(provider: 'ldapmain')` is called,
but it does not have an associated `user_id` as a result.
3. `User#save` is called, but the `Identity` validation fails if an
existing entry with `user_id` of `nil` already exists.
The uniqueness validation for `nil` values doesn't make any sense in
this case. We should be enforcing this at the database level with a
foreign key constraint. To work around the issue we can validate
against the user instead, which does the right thing even when
the user isn't saved yet.
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/56734
Diffstat (limited to 'changelogs')
| -rw-r--r-- | changelogs/unreleased/sh-disable-nil-user-id-identity-validation.yml | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/changelogs/unreleased/sh-disable-nil-user-id-identity-validation.yml b/changelogs/unreleased/sh-disable-nil-user-id-identity-validation.yml new file mode 100644 index 00000000000..5af3bdce51b --- /dev/null +++ b/changelogs/unreleased/sh-disable-nil-user-id-identity-validation.yml @@ -0,0 +1,5 @@ +--- +title: Fix failed LDAP logins when nil user_id present +merge_request: 24749 +author: +type: fixed |