Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

get ldap filter for full name #1107

Merged
merged 3 commits into from
Oct 4, 2017
Merged

get ldap filter for full name #1107

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a84f844
get ldap filter for full name
Sep 3, 2017
41bd23d
forget fields [#151338873]
Sep 3, 2017
da930f4
Merge branch 'v3.0.0b' into get_ldap_filter_by_full_name
Stuart-Johnson Oct 4, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
23 changes: 19 additions & 4 deletions app/lib/directory.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,23 @@ def self.search_database(term)
return identities
end

def self.get_ldap_filter_for_full_name(term)
search_terms = term.strip.split
givenName = search_terms[0]
sn = search_terms[1]
"(& (sn=#{sn}*) (givenName=#{givenName}*))"
end

def self.get_ldap_filter(term, fields)
search_terms = term.strip.split
if search_terms.length == 2
filter = self.get_ldap_filter_for_full_name(term)
else
filter = (LDAP_FILTER && LDAP_FILTER.gsub('#{term}', term)) || fields.map { |f| Net::LDAP::Filter.contains(f, term) }.inject(:|)
end
filter
end

def self.find_or_create(ldap_uid)
identity = Identity.find_by_ldap_uid(ldap_uid)
return identity if identity
Expand All @@ -105,9 +122,7 @@ def self.search_ldap(term)
base: LDAP_BASE,
encryption: LDAP_ENCRYPTION)
ldap.auth LDAP_AUTH_USERNAME, LDAP_AUTH_PASSWORD unless !LDAP_AUTH_USERNAME || !LDAP_AUTH_PASSWORD
# use LDAP_FILTER to override default filter with custom string
filter = (LDAP_FILTER && LDAP_FILTER.gsub('#{term}', term)) || fields.map { |f| Net::LDAP::Filter.contains(f, term) }.inject(:|)
res = ldap.search(:attributes => fields, :filter => filter)
res = ldap.search(:attributes => fields, :filter => self.get_ldap_filter(term, fields))
Rails.logger.info ldap.get_operation_result unless res
rescue => e
Rails.logger.info '#'*100
Expand Down Expand Up @@ -216,7 +231,7 @@ def self.find_for_cas_oauth(cas_uid)
Directory.create_or_update_database_from_ldap(ldap_results, [])
Identity.find_by_ldap_uid(ldap_uid)
end

# search and merge results but don't change the database
# this assumes USE_LDAP = true, otherwise you wouldn't use this function
def self.search_and_merge_ldap_and_database_results(term)
Expand Down