kallithea Changeset - 8eebcf50fdd5

Changeset - 8eebcf50fdd5

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Mads Kiilerich - 10 years ago 2016-01-05 16:30:12
madski@unity3d.com

auth: get username as str when container auth gets username from user object

Avoid stray unicode username.

1 file changed with 2 insertions and 2 deletions:

kallithea/lib/auth_modules/auth_container.py

0 comments (0 inline, 0 general)

kallithea/lib/auth_modules/auth_container.py

➞

Show inline comments

@@ @@ -18,25 +18,25 @@ kallithea.lib.auth_modules.auth_containe @@
 Kallithea container based authentication plugin
 This file was forked by the Kallithea project in July 2014.
 Original author and date, and relevant copyright and licensing information is below:
 :created_on: Created on Nov 17, 2012
 :author: marcink
 :copyright: (c) 2013 RhodeCode GmbH, and others.
 :license: GPLv3, see LICENSE.md for more details.
 """
 import logging
 from kallithea.lib import auth_modules
 from kallithea.lib.utils2 import str2bool, safe_unicode
+from kallithea.lib.utils2 import str2bool, safe_unicode, safe_str
 from kallithea.lib.compat import hybrid_property
 from kallithea.model.db import User, Setting
 log = logging.getLogger(__name__)
 class KallitheaAuthPlugin(auth_modules.KallitheaExternalAuthPlugin):
     def __init__(self):
         pass
     @hybrid_property
     def name(self):
@@ @@ -173,25 +173,25 @@ class KallitheaAuthPlugin(auth_modules.K @@
         environ = kwargs.get('environ')
         if not environ:
             log.debug('Empty environ data skipping...')
             return None
         if not userobj:
             userobj = self.get_user('', environ=environ, settings=settings)
         # we don't care passed username/password for container auth plugins.
         # only way to log in is using environ
         username = None
         if userobj:
             username = getattr(userobj, 'username')
+            username = safe_str(getattr(userobj, 'username'))
         if not username:
             # we don't have any objects in DB, user doesn't exist, extract
             # username from environ based on the settings
             username = self._get_username(environ, settings)
         # if cannot fetch username, it's a no-go for this plugin to proceed
         if not username:
             return None
         # old attrs fetched from Kallithea database
         admin = getattr(userobj, 'admin', False)

0 comments (0 inline, 0 general)