diff options
author | Francisco Javier López <fjlopez@gitlab.com> | 2017-12-21 14:31:15 +0000 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2017-12-21 14:31:15 +0000 |
commit | 8c6b5baba1d784b1615d023c63fb4531713ef8db (patch) | |
tree | 5a7ebfc046dc8a006db0520350e3378f00fa2bd2 /app/models/identity.rb | |
parent | 3ee5fd156e3465a1e1c04b2b321c62b577496ee8 (diff) | |
download | gitlab-ce-8c6b5baba1d784b1615d023c63fb4531713ef8db.tar.gz |
LDAP extern_uids are not normalized when updated via API
Diffstat (limited to 'app/models/identity.rb')
-rw-r--r-- | app/models/identity.rb | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/app/models/identity.rb b/app/models/identity.rb index 99d99bc6deb..b3fa7d8176a 100644 --- a/app/models/identity.rb +++ b/app/models/identity.rb @@ -8,6 +8,8 @@ class Identity < ActiveRecord::Base validates :extern_uid, allow_blank: true, uniqueness: { scope: :provider, case_sensitive: false } validates :user_id, uniqueness: { scope: :provider } + before_save :ensure_normalized_extern_uid, if: :extern_uid_changed? + scope :with_provider, ->(provider) { where(provider: provider) } scope :with_extern_uid, ->(provider, extern_uid) do iwhere(extern_uid: normalize_uid(provider, extern_uid)).with_provider(provider) @@ -24,4 +26,12 @@ class Identity < ActiveRecord::Base uid.to_s end end + + private + + def ensure_normalized_extern_uid + return if extern_uid.nil? + + self.extern_uid = Identity.normalize_uid(self.provider, self.extern_uid) + end end |