Skip to content

Commit 981c387

Browse files
Chris McIntoshJared Murrell
authored andcommitted
adding some debugging but ultimately everything was fine
1 parent e873f0e commit 981c387

2 files changed

Lines changed: 26 additions & 17 deletions

File tree

app.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,8 @@ def sync_team(client=None, owner=None, team_id=None, slug=None):
7070
directory_members = directory_group_members(group=directory_group)
7171
except Exception as e:
7272
directory_members = []
73-
print(e)
73+
traceback.print_exc(file=sys.stderr)
74+
7475
team_members = github_team_members(
7576
client=client, owner=owner, team_id=team_id, attribute=USER_SYNC_ATTRIBUTE
7677
)
@@ -108,7 +109,7 @@ def directory_group_members(group=None):
108109
group_members = [member for member in members]
109110
except Exception as e:
110111
group_members = []
111-
print(e)
112+
traceback.print_exc(file=sys.stderr)
112113
return group_members
113114

114115

githubapp/ldap.py

Lines changed: 23 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
import os
2+
import traceback
3+
import sys
24
import json
35
import logging
46
from ldap3 import Server, Connection, ALL
@@ -73,18 +75,23 @@ def get_group_members(self, group_name):
7375
try:
7476
member_dn = self.get_user_info(user=member)
7577
# pprint(member_dn)
76-
username = str(
77-
member_dn["attributes"][self.LDAP_USER_ATTRIBUTE][0]
78-
).casefold()
79-
email = str(
80-
member_dn["attributes"][self.LDAP_USER_MAIL_ATTRIBUTE][
81-
0
82-
]
83-
).casefold()
84-
user_info = {"username": username, "email": email}
85-
member_list.append(user_info)
78+
if (
79+
member_dn
80+
and member_dn["attributes"]
81+
and member_dn["attributes"][self.LDAP_USER_ATTRIBUTE]
82+
):
83+
username = str(
84+
member_dn["attributes"][self.LDAP_USER_ATTRIBUTE][0]
85+
).casefold()
86+
email = str(
87+
member_dn["attributes"][
88+
self.LDAP_USER_MAIL_ATTRIBUTE
89+
][0]
90+
).casefold()
91+
user_info = {"username": username, "email": email}
92+
member_list.append(user_info)
8693
except Exception as e:
87-
print(e)
94+
traceback.print_exc(file=sys.stderr)
8895
return member_list
8996

9097
def get_user_info(self, user=None):
@@ -106,9 +113,10 @@ def get_user_info(self, user=None):
106113
search_filter=self.LDAP_USER_FILTER.replace("{username}", user),
107114
attributes=["*"],
108115
)
109-
data = json.loads(self.conn.entries[0].entry_to_json())
110-
return data
116+
if len(self.conn.entries) > 0:
117+
data = json.loads(self.conn.entries[0].entry_to_json())
118+
return data
111119
except Exception as e:
112-
print(e)
120+
traceback.print_exc(file=sys.stderr)
113121
except Exception as e:
114-
print(e)
122+
traceback.print_exc(file=sys.stderr)

0 commit comments

Comments
 (0)