kallithea Changeset - cf128ced8c85

Changeset - cf128ced8c85

Parent rev.

Child rev.

[Not reviewed]

beta

0 4 0

Liad Shani - 14 years ago 2011-10-26 21:59:22
liadff@gmail.com

Improved container-based auth implementation and added support for a reverse-proxy setup (using the X-Forwarded-User header)

4 files changed with 29 insertions and 14 deletions:

rhodecode/config/deployment.ini_tmpl

rhodecode/lib/auth.py

rhodecode/lib/base.py

rhodecode/lib/middleware/simplehg.py

0 comments (0 inline, 0 general)

rhodecode/config/deployment.ini_tmpl

➞

Show inline comments

@@ @@ -54,6 +54,7 @@ force_https = false @@
 commit_parse_limit = 50
 use_gravatar = true
 container_auth_enabled = false
 proxypass_auth_enabled = false
 ####################################
 ###        CELERY CONFIG        ####

rhodecode/lib/auth.py

➞

Show inline comments

@@ @@ -223,6 +223,21 @@ def authenticate(username, password): @@
                 pass
     return False
 def get_container_username(environ, cfg=config):
     from paste.httpheaders import REMOTE_USER
     from paste.deploy.converters import asbool
     username = REMOTE_USER(environ)
     if not username and asbool(cfg.get('proxypass_auth_enabled', False)):
         username = environ.get('HTTP_X_FORWARDED_USER')
     if username:
         #Removing realm and domain from username
         username = username.partition('@')[0]
         username = username.rpartition('\\')[2]
         log.debug('Received username %s from container', username)
     return username
 class  AuthUser(object):
     """
@@ @@ -238,8 +253,8 @@ class AuthUser(object): @@
         self.user_id = user_id
         self.api_key = None
         self.username = 'None' if username is None else username
         self.username = username
         self.name = ''
         self.lastname = ''
         self.email = ''
@@ @@ -263,10 +278,7 @@ class AuthUser(object): @@
             log.debug('Auth User lookup by USER ID %s', self.user_id)
             user_model.fill_data(self, user_id=self.user_id)
             is_user_loaded = True
         elif self.username != 'None':
             #Removing realm from username
             self.username = self.username.partition('@')[0]
         elif self.username:
             log.debug('Auth User lookup by USER NAME %s', self.username)
             dbuser = User.get_by_username(self.username)
             if dbuser is not None and dbuser.active:
@@ @@ -274,6 +286,8 @@ class AuthUser(object): @@
                     setattr(self, k, v)
                 self.set_authenticated()
                 is_user_loaded = True
                 log.debug('User %s is now logged in', self.username)
                 dbuser.update_lastlogin()
         if not is_user_loaded:
             if self.anonymous_user.active is True:
@@ @@ -284,6 +298,9 @@ class AuthUser(object): @@
             else:
                 self.is_authenticated = False
         if not self.username:
             self.username = 'None'
         log.debug('Auth User is now %s', self)
         user_model.fill_perms(self)

rhodecode/lib/base.py

➞

Show inline comments

@@ @@ -8,12 +8,10 @@ from pylons import config, tmpl_context @@
 from pylons.controllers import WSGIController
 from pylons.controllers.util import redirect
 from pylons.templating import render_mako as render
 from paste.deploy.converters import asbool
 from paste.httpheaders import REMOTE_USER
 from rhodecode import __version__
 from rhodecode.lib.auth import AuthUser
+from rhodecode.lib.auth import AuthUser, get_container_username
 from rhodecode.lib.utils import get_repo_slug
 from rhodecode.model import meta
 from rhodecode.model.scm import ScmModel
@@ @@ -47,7 +45,7 @@ class BaseController(WSGIController): @@
             api_key = request.GET.get('api_key')
             user_id = getattr(session.get('rhodecode_user'), 'user_id', None)
             if asbool(config.get('container_auth_enabled', False)):
-                username = REMOTE_USER(environ)
+                username = get_container_username(environ)
             else:
                 username = None

rhodecode/lib/middleware/simplehg.py

➞

Show inline comments

@@ @@ -35,7 +35,7 @@ from paste.auth.basic import AuthBasicAu @@
 from paste.httpheaders import REMOTE_USER, AUTH_TYPE
 from rhodecode.lib import safe_str
 from rhodecode.lib.auth import authfunc, HasPermissionAnyMiddleware
+from rhodecode.lib.auth import authfunc, HasPermissionAnyMiddleware, get_container_username
 from rhodecode.lib.utils import make_ui, invalidate_cache, \
     is_valid_repo, ui_sections
 from rhodecode.model.db import User
@@ @@ -114,7 +114,7 @@ class SimpleHg(object): @@
                 # NEED TO AUTHENTICATE AND ASK FOR AUTH USER PERMISSIONS
                 #==============================================================
-                if not REMOTE_USER(environ):
+                if not get_container_username(environ, self.config):
                     self.authenticate.realm = \
                         safe_str(self.config['rhodecode_realm'])
                     result = self.authenticate(environ)
@@ @@ -130,8 +130,7 @@ class SimpleHg(object): @@
                 #==============================================================
                 if action in ['pull', 'push']:
                     #Removing realm from username
                     username = REMOTE_USER(environ).partition('@')[0]
                     username = get_container_username(environ, self.config)
                     try:
                         user = self.__get_user(username)
                         if user is None:

0 comments (0 inline, 0 general)