Skip to content

Making the mail attribute optional if the user attribute is there #108

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

Merged
merged 3 commits into from
Jan 5, 2022
Merged

Making the mail attribute optional if the user attribute is there #108

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b7cec73
Making the mail attribute optional if the user attribute is there
Dec 22, 2021
7dac626
Fixing logic around mail attribute
Dec 22, 2021
bd9b149
Merge branch 'main' into c/optional-mail-attribute
Jan 5, 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
27 changes: 22 additions & 5 deletions githubapp/ldap.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ def __init__(self):
self.LDAP_BIND_PASSWORD = os.environ["LDAP_BIND_PASSWORD"]
else:
raise Exception("LDAP credentials have not been specified")

self.USER_SYNC_ATTRIBUTE = os.environ["USER_SYNC_ATTRIBUTE"]
self.conn = Connection(
self.LDAP_SERVER_HOST,
user=self.LDAP_BIND_USER,
Expand Down Expand Up @@ -84,11 +86,26 @@ def get_group_members(self, group_name):
username = str(
member_dn["attributes"][self.LDAP_USER_ATTRIBUTE][0]
).casefold()
email = str(
member_dn["attributes"][
self.LDAP_USER_MAIL_ATTRIBUTE
][0]
).casefold()
if (
self.USER_SYNC_ATTRIBUTE == "mail"
and self.LDAP_USER_MAIL_ATTRIBUTE
not in member_dn["attributes"]
):
raise Exception(
f"{self.USER_SYNC_ATTRIBUTE} not found"
)
elif (
self.LDAP_USER_MAIL_ATTRIBUTE
in member_dn["attributes"]
):
email = str(
member_dn["attributes"][
self.LDAP_USER_MAIL_ATTRIBUTE
][0]
).casefold()
else:
email = None

user_info = {"username": username, "email": email}
member_list.append(user_info)
except Exception as e:
Expand Down