Skip to content

Handle when Azure AD returns byte/list for contact mode #367

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
diegocepedaw merged 1 commit into from
Feb 25, 2022
Merged

Handle when Azure AD returns byte/list for contact mode #367

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 12 additions & 0 deletions src/oncall/user_sync/ldap_sync.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,12 @@ def update_user(username, ldap_contacts, engine):
stats['user_photos_updated'] += 1
for mode in modes:
if mode in ldap_contacts and ldap_contacts[mode]:
if isinstance(ldap_contacts[mode], list):
ldap_contacts[mode] = ldap_contacts[mode][0]
try:
ldap_contacts[mode] = ldap_contacts[mode].decode()
except (UnicodeDecodeError, AttributeError):
pass
if mode in db_contacts:
if ldap_contacts[mode] != db_contacts[mode]:
logger.debug('\tupdating %s (%s -> %s)' % (mode, db_contacts[mode], ldap_contacts[mode]))
Expand Down Expand Up @@ -372,6 +378,12 @@ def sync(config, engine):
stats['user_photos_updated'] += 1
for mode in modes:
if mode in ldap_contacts and ldap_contacts[mode]:
if isinstance(ldap_contacts[mode], list):
ldap_contacts[mode] = ldap_contacts[mode][0]
try:
ldap_contacts[mode] = ldap_contacts[mode].decode()
except (UnicodeDecodeError, AttributeError):
pass
if mode in db_contacts:
if ldap_contacts[mode] != db_contacts[mode]:
logger.debug('\tupdating %s', mode)
Expand Down