Skip to content

Use new server for LDAP lookups. #311

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

Open
timparenti wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Use new server for LDAP lookups. #311

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3bebce7
Use new server for LDAP lookups.
timparenti Feb 20, 2022
69f655b
Log LDAP find errors.
timparenti Feb 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions app/models/carnegie_mellon_person.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
class CarnegieMellonPerson < ActiveLdap::Base
ldap_mapping :dn_attribute => "guid",
:prefix => "ou=Person",
:classes => ["cmuPerson"]
:prefix => "ou=AndrewPerson",
:classes => ["cmuAccountPerson"]

def self.find_by_andrewid( andrewid )

begin
person = find("cmuandrewid=#{andrewid}", :attributes => ['cmuandrewid',
person = find("cmuAndrewId=#{andrewid}", :attributes => ['cmuAndrewId',
'cn',
'mail',
'sn',
Expand All @@ -19,7 +19,8 @@ def self.find_by_andrewid( andrewid )
end

return person unless person[:cn] == "Merged Person"
rescue
rescue => e
logger.error e
return nil
end
end
Expand Down
28 changes: 16 additions & 12 deletions config/ldap.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,23 @@
development:
host: ldap.andrew.cmu.edu
port: 389
base: dc=cmu,dc=edu
host: ldap.cmu.edu
port: 636
method: ssl
base: dc=andrew,dc=cmu,dc=edu

test:
host: ldap.andrew.cmu.edu
port: 389
base: dc=cmu,dc=edu
host: ldap.cmu.edu
port: 636
method: ssl
base: dc=andrew,dc=cmu,dc=edu

staging:
host: ldap.andrew.cmu.edu
port: 389
base: dc=cmu,dc=edu
host: ldap.cmu.edu
port: 636
method: ssl
base: dc=andrew,dc=cmu,dc=edu

production:
host: ldap.andrew.cmu.edu
port: 389
base: dc=cmu,dc=edu
host: ldap.cmu.edu
port: 636
method: ssl
base: dc=andrew,dc=cmu,dc=edu