diff --git a/src/oncall/auth/modules/ldap_import.py b/src/oncall/auth/modules/ldap_import.py index 59b102cd..3c273842 100644 --- a/src/oncall/auth/modules/ldap_import.py +++ b/src/oncall/auth/modules/ldap_import.py @@ -61,11 +61,11 @@ def ldap_auth(self, username, password): for key, val in self.attrs.items(): if ldap_attrs.get(val): if type(ldap_attrs.get(val)) == list: - ldap_contacts[key] = ldap_attrs.get(val)[0] + ldap_contacts[key] = ldap_attrs.get(val)[0].decode("utf-8") else: - ldap_contacts[key] = ldap_attrs.get(val) + ldap_contacts[key] = ldap_attrs.get(val).decode("utf-8") else: - ldap_contacts[key] = val + ldap_contacts[key] = val.decode("utf-8") connection.simple_bind_s(auth_user, password) diff --git a/src/oncall/user_sync/ldap_sync.py b/src/oncall/user_sync/ldap_sync.py index fe8c28c8..955a20b7 100644 --- a/src/oncall/user_sync/ldap_sync.py +++ b/src/oncall/user_sync/ldap_sync.py @@ -130,11 +130,11 @@ def fetch_ldap(): except KeyError: username_field = "sAMAccountName" - username = ldap_dict[username_field][0] + username = ldap_dict[username_field][0].decode("utf-8") - mobile = ldap_dict.get(LDAP_SETTINGS['attrs']['mobile']) - mail = ldap_dict.get(LDAP_SETTINGS['attrs']['mail']) - name = ldap_dict.get(LDAP_SETTINGS['attrs']['full_name'])[0] + mobile = ldap_dict.get(LDAP_SETTINGS['attrs']['mobile']).decode("utf-8") + mail = ldap_dict.get(LDAP_SETTINGS['attrs']['mail']).decode("utf-8") + name = ldap_dict.get(LDAP_SETTINGS['attrs']['full_name'])[0].decode("utf-8") if mobile: try: @@ -145,7 +145,7 @@ def fetch_ldap(): mobile = None if mail: - mail = mail[0] + mail = mail[0].decode("utf-8") slack = mail.split('@')[0] else: slack = None