# HG changeset patch
# User Mads Kiilerich <mads@kiilerich.com>
# Date 1564601483 -7200
# Node ID 1943c6f00cd8c1c110ecbf7bccdedde997ba20de
# Parent  5763182f79b5e94f53cb701ec4a1638194ca1b68
user: allow LDAP users with non-ASCII characters in the DN

The database and sqlalchemy use unicode, so any attempt at storing encoded data
is wrong and might fail.

Thus, use safe_unicode instead of encoding it using safe_str.

diff -r 5763182f79b5 -r 1943c6f00cd8 kallithea/model/user.py
--- a/kallithea/model/user.py	Wed May 22 12:49:38 2019 +0200
+++ b/kallithea/model/user.py	Wed Jul 31 21:31:23 2019 +0200
@@ -37,7 +37,7 @@
 
 from sqlalchemy.exc import DatabaseError
 
-from kallithea.lib.utils2 import safe_str, generate_api_key, get_current_authuser
+from kallithea.lib.utils2 import safe_unicode, generate_api_key, get_current_authuser
 from kallithea.lib.caching_query import FromCache
 from kallithea.model.db import Permission, User, UserToPerm, \
     UserEmailMap, UserIpMap
@@ -145,9 +145,9 @@
             new_user.admin = admin
             new_user.email = email
             new_user.active = active
-            new_user.extern_name = safe_str(extern_name) \
+            new_user.extern_name = safe_unicode(extern_name) \
                 if extern_name else None
-            new_user.extern_type = safe_str(extern_type) \
+            new_user.extern_type = safe_unicode(extern_type) \
                 if extern_type else None
             new_user.name = firstname
             new_user.lastname = lastname