Commit 7f8abaeb authored by Stan Hu's avatar Stan Hu

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
parents dd8f56e8 b45c7dd5
---
title: LDAP Person no longer throws exception on invalid entry
merge_request:
author:
type: fixed
...@@ -63,8 +63,6 @@ module Gitlab ...@@ -63,8 +63,6 @@ module Gitlab
Rails.logger.debug { "Instantiating #{self.class.name} with LDIF:\n#{entry.to_ldif}" } Rails.logger.debug { "Instantiating #{self.class.name} with LDIF:\n#{entry.to_ldif}" }
@entry = entry @entry = entry
@provider = provider @provider = provider
validate_entry
end end
def name def name
...@@ -117,19 +115,6 @@ module Gitlab ...@@ -117,19 +115,6 @@ module Gitlab
entry.public_send(selected_attr) # rubocop:disable GitlabSecurity/PublicSend entry.public_send(selected_attr) # rubocop:disable GitlabSecurity/PublicSend
end 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 end
end end
...@@ -66,15 +66,6 @@ describe Gitlab::LDAP::Person do ...@@ -66,15 +66,6 @@ describe Gitlab::LDAP::Person do
end end
end end
describe '.validate_entry' do
it 'raises InvalidEntryError' do
entry['foo'] = 'bar'
expect { described_class.new(entry, 'ldapmain') }
.to raise_error(Gitlab::LDAP::Person::InvalidEntryError)
end
end
describe '#name' do describe '#name' do
it 'uses the configured name attribute and handles values as an array' do it 'uses the configured name attribute and handles values as an array' do
name = 'John Doe' name = 'John Doe'
......
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