Changeset - cbc2b1913cdf
[Not reviewed]
beta
0 3 0
Liad Shani - 14 years ago 2011-10-29 17:03:33
liadff@gmail.com
Added basic automatic user creation for container auth
3 files changed with 55 insertions and 5 deletions:
0 comments (0 inline, 0 general)
rhodecode/lib/auth.py
Show inline comments
 
@@ -223,9 +223,31 @@ def authenticate(username, password):
 
                pass
 
    return False
 

	
 
def login_container_auth(username):
 
    user = User.get_by_username(username)
 
    if user is None:
 
        user_model = UserModel()
 
        user_attrs = {
 
                 'name': username,
 
                 'lastname': None,
 
                 'email': None,
 
                }
 
        if not user_model.create_for_container_auth(username, user_attrs):
 
            return None
 
        user = User.get_by_username(username)
 
        log.info('User %s was created by container authentication', username)
 

	
 
    if not user.active:
 
        return None
 

	
 
    user.update_lastlogin()
 
    log.debug('User %s is now logged in by container authentication', user.username)
 
    return user
 

	
 
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)):
 
@@ -278,14 +300,12 @@ class  AuthUser(object):
 
            is_user_loaded = user_model.fill_data(self, user_id=self.user_id)
 
        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:
 
            dbuser = login_container_auth(self.username)
 
            if dbuser is not None:
 
                for k, v in dbuser.get_dict().items():
 
                    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:
rhodecode/lib/helpers.py
Show inline comments
 
@@ -455,7 +455,8 @@ HasRepoPermissionAny, HasRepoPermissionA
 

	
 
def gravatar_url(email_address, size=30):
 
    if not str2bool(config['app_conf'].get('use_gravatar')) or \
 
        email_address == 'anonymous@rhodecode.org':
 
            not email_address or \
 
            email_address == 'anonymous@rhodecode.org':
 
        return url("/images/user%s.png" % size)
 

	
 
    ssl_enabled = 'https' == request.environ.get('wsgi.url_scheme')
rhodecode/model/user.py
Show inline comments
 
@@ -92,6 +92,35 @@ class UserModel(BaseModel):
 
            self.sa.rollback()
 
            raise
 

	
 
    def create_for_container_auth(self, username, attrs):
 
        """
 
        Creates the given user if it's not already in the database
 
        
 
        :param username:
 
        :param attrs:
 
        """
 
        if self.get_by_username(username, case_insensitive=True) is None:
 
            try:
 
                new_user = User()
 
                new_user.username = username
 
                new_user.password = None
 
                new_user.api_key = generate_api_key(username)
 
                new_user.email = attrs['email']
 
                new_user.active = True
 
                new_user.name = attrs['name']
 
                new_user.lastname = attrs['lastname']
 

	
 
                self.sa.add(new_user)
 
                self.sa.commit()
 
                return True
 
            except (DatabaseError,):
 
                log.error(traceback.format_exc())
 
                self.sa.rollback()
 
                raise
 
        log.debug('User %s already exists. Skipping creation of account for container auth.',
 
                  username)
 
        return False
 

	
 
    def create_ldap(self, username, password, user_dn, attrs):
 
        """
 
        Checks if user is in database, if not creates this user marked
0 comments (0 inline, 0 general)