diff options
author | Stan Hu <stanhu@gmail.com> | 2018-02-13 22:08:47 +0300 |
---|---|---|
committer | Mark Fletcher <mark@gitlab.com> | 2018-02-14 14:50:01 +0300 |
commit | ed9f6c845911eacba1b74f61df319eef76e3b701 (patch) | |
tree | c71f07751b0c65c1deb481e71bff475ee93cbf63 /lib | |
parent | 6f92957248ee6a54b4eabca06ded6685f8511dd2 (diff) |
Merge branch 'remove_ldap_person_validation' into 'master'
Remove problematic LDAP::Person validation for new strategy
Closes #42412 and #42359
See merge request gitlab-org/gitlab-ce!16727
Diffstat (limited to 'lib')
-rw-r--r-- | lib/gitlab/ldap/person.rb | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/lib/gitlab/ldap/person.rb b/lib/gitlab/ldap/person.rb index b91757c2a4b..c59df556247 100644 --- a/lib/gitlab/ldap/person.rb +++ b/lib/gitlab/ldap/person.rb @@ -63,8 +63,6 @@ module Gitlab Rails.logger.debug { "Instantiating #{self.class.name} with LDIF:\n#{entry.to_ldif}" } @entry = entry @provider = provider - - validate_entry end def name @@ -117,19 +115,6 @@ module Gitlab entry.public_send(selected_attr) # rubocop:disable GitlabSecurity/PublicSend end - - def validate_entry - allowed_attrs = self.class.ldap_attributes(config).map(&:downcase) - - # Net::LDAP::Entry transforms keys to symbols. Change to strings to compare. - entry_attrs = entry.attribute_names.map { |n| n.to_s.downcase } - invalid_attrs = entry_attrs - allowed_attrs - - if invalid_attrs.any? - raise InvalidEntryError, - "#{self.class.name} initialized with Net::LDAP::Entry containing invalid attributes(s): #{invalid_attrs}" - end - end end end end |