From 25f97a4b8854fdff668f31502df78d8f2ffe6249 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adolfo=20G=C3=B3mez?= Date: Mon, 2 Jun 2014 03:42:57 +0000 Subject: [PATCH] Adding "full" support to authenticators for unicode (a "must have been done before") --- server/src/uds/core/auths/auth.py | 4 ++-- server/src/uds/core/util/Cache.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/server/src/uds/core/auths/auth.py b/server/src/uds/core/auths/auth.py index af281e8e..36530301 100644 --- a/server/src/uds/core/auths/auth.py +++ b/server/src/uds/core/auths/auth.py @@ -49,7 +49,7 @@ from uds.models import User import logging -__updated__ = '2014-05-29' +__updated__ = '2014-06-02' logger = logging.getLogger(__name__) authLogger = logging.getLogger('authLog') @@ -273,7 +273,7 @@ def webLogin(request, response, user, password): user.updateLastAccess() request.session.clear() request.session[USER_KEY] = user.id - request.session[PASS_KEY] = CryptoManager.manager().xor(password.encode('utf-8'), cookie) + request.session[PASS_KEY] = CryptoManager.manager().xor(password, cookie) # Ensures that this user will have access througt REST api if logged in through web interface REST.Handler.storeSessionAuthdata(request.session, manager_id, user.name, get_language(), user.is_admin, user.staff_member) return True diff --git a/server/src/uds/core/util/Cache.py b/server/src/uds/core/util/Cache.py index b02c8f83..07880323 100644 --- a/server/src/uds/core/util/Cache.py +++ b/server/src/uds/core/util/Cache.py @@ -46,11 +46,11 @@ class Cache(object): CODEC = 'base64' # Can be zip, hez, bzip, base64, uuencoded def __init__(self, owner): - self._owner = owner + self._owner = owner.encode('utf-8') def __getKey(self, key): h = hashlib.md5() - h.update(self._owner + key) + h.update(self._owner + key.encode('utf-8')) return h.hexdigest() def get(self, skey, defValue=None):