Changeset - f43dc1913984
Parent rev.
Child rev.
[Not reviewed]
default
0 4 0
Mads Kiilerich - 10 years ago 2015-07-20 15:08:08
madski@unity3d.com
auth: various minor cleanup
4 files changed with 22 insertions and 20 deletions:
kallithea/controllers/admin/repo_groups.py
1
kallithea/controllers/admin/repos.py
4
2
kallithea/lib/auth.py
16
17
kallithea/model/db.py
2
0 comments (0 inline, 0 general)
kallithea/controllers/admin/repo_groups.py
➞
Show inline comments
 
@@ -55,13 +55,12 @@ from sqlalchemy.sql.expression import fu
 

			




	
	
	
		
 

			




	
	
	
		
 
log = logging.getLogger(__name__)

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
class RepoGroupsController(BaseController):

			




	
	
	
		
 
    """REST Controller styled on the Atom Publishing Protocol"""

			




	
	
	
		
 

			




	
	
	
		
 
    @LoginRequired()

			




	
	
	
		
 
    def __before__(self):

			




	
	
	
		
 
        super(RepoGroupsController, self).__before__()

			




	
	
	
		
 

			




	
	
	
		
 
    def __load_defaults(self, allow_empty_group=False, exclude_group_ids=[]):

			




        

    


    
    

    

        

                

                    kallithea/controllers/admin/repos.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -34,13 +34,13 @@ from pylons import request, tmpl_context

			




	
	
	
		
 
from pylons.controllers.util import redirect

			




	
	
	
		
 
from pylons.i18n.translation import _

			




	
	
	
		
 
from sqlalchemy.sql.expression import func

			




	
	
	
		
 

			




	
	
	
		
 
from kallithea.lib import helpers as h

			




	
	
	
		
 
from kallithea.lib.auth import LoginRequired, HasPermissionAllDecorator, \

			




	
	
	
		
 
    HasRepoPermissionAllDecorator, NotAnonymous,HasPermissionAny, \

			




	
	
	
		
 
    HasRepoPermissionAllDecorator, NotAnonymous, HasPermissionAny, \

			




	
	
	
		
 
    HasRepoGroupPermissionAny, HasRepoPermissionAnyDecorator

			




	
	
	
		
 
from kallithea.lib.base import BaseRepoController, render

			




	
	
	
		
 
from kallithea.lib.utils import action_logger, repo_name_slug, jsonify

			




	
	
	
		
 
from kallithea.lib.vcs import RepositoryError

			




	
	
	
		
 
from kallithea.model.meta import Session

			




	
	
	
		
 
from kallithea.model.db import User, Repository, UserFollowing, RepoGroup,\

			




	
	
		
 
@@ -134,24 +134,25 @@ class ReposController(BaseRepoController

			




	
	
	
		
 
        # url('repos')

			




	
	
	
		
 

			




	
	
	
		
 
        self.__load_defaults()

			




	
	
	
		
 
        form_result = {}

			




	
	
	
		
 
        task_id = None

			




	
	
	
		
 
        try:

			




	
	
	
		
 
            # CanWriteToGroup validators checks permissions of this POST

			




	
	
	
		
 
            # CanWriteGroup validators checks permissions of this POST

			




	
	
	
		
 
            form_result = RepoForm(repo_groups=c.repo_groups_choices,

			




	
	
	
		
 
                                   landing_revs=c.landing_revs_choices)()\

			




	
	
	
		
 
                            .to_python(dict(request.POST))

			




	
	
	
		
 

			




	
	
	
		
 
            # create is done sometimes async on celery, db transaction

			




	
	
	
		
 
            # management is handled there.

			




	
	
	
		
 
            task = RepoModel().create(form_result, self.authuser.user_id)

			




	
	
	
		
 
            from celery.result import BaseAsyncResult

			




	
	
	
		
 
            if isinstance(task, BaseAsyncResult):

			




	
	
	
		
 
                task_id = task.task_id

			




	
	
	
		
 
        except formencode.Invalid, errors:

			




	
	
	
		
 
            log.info(errors)

			




	
	
	
		
 
            return htmlfill.render(

			




	
	
	
		
 
                render('admin/repos/repo_add.html'),

			




	
	
	
		
 
                defaults=errors.value,

			




	
	
	
		
 
                errors=errors.error_dict or {},

			




	
	
	
		
 
                prefix_error=False,

			




	
	
	
		
 
                force_defaults=False,

			




	
	
		
 
@@ -287,12 +288,13 @@ class ReposController(BaseRepoController

			




	
	
	
		
 
                    category='success')

			




	
	
	
		
 
            changed_name = repo.repo_name

			




	
	
	
		
 
            action_logger(self.authuser, 'admin_updated_repo',

			




	
	
	
		
 
                              changed_name, self.ip_addr, self.sa)

			




	
	
	
		
 
            Session().commit()

			




	
	
	
		
 
        except formencode.Invalid, errors:

			




	
	
	
		
 
            log.info(errors)

			




	
	
	
		
 
            defaults = self.__load_data(repo_name)

			




	
	
	
		
 
            defaults.update(errors.value)

			




	
	
	
		
 
            c.users_array = repo_model.get_users_js()

			




	
	
	
		
 
            return htmlfill.render(

			




	
	
	
		
 
                render('admin/repos/repo_edit.html'),

			




	
	
	
		
 
                defaults=defaults,

			




        

    


    
    

    

        

                

                    kallithea/lib/auth.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -175,14 +175,14 @@ def _cached_perms_data(user_id, user_is_

			




	
	
	
		
 
    default_repo_perms = Permission.get_default_perms(default_user_id)

			




	
	
	
		
 
    default_repo_groups_perms = Permission.get_default_group_perms(default_user_id)

			




	
	
	
		
 
    default_user_group_perms = Permission.get_default_user_group_perms(default_user_id)

			




	
	
	
		
 

			




	
	
	
		
 
    if user_is_admin:

			




	
	
	
		
 
        #==================================================================

			




	
	
	
		
 
        # admin user have all default rights for repositories

			




	
	
	
		
 
        # and groups set to admin

			




	
	
	
		
 
        # admin users have all rights;

			




	
	
	
		
 
        # based on default permissions, just set everything to admin

			




	
	
	
		
 
        #==================================================================

			




	
	
	
		
 
        permissions[GLOBAL].add('hg.admin')

			




	
	
	
		
 
        permissions[GLOBAL].add('hg.create.write_on_repogroup.true')

			




	
	
	
		
 

			




	
	
	
		
 
        # repositories

			




	
	
	
		
 
        for perm in default_repo_perms:

			




	
	
		
 
@@ -203,29 +203,28 @@ def _cached_perms_data(user_id, user_is_

			




	
	
	
		
 
            permissions[UK][u_k] = p

			




	
	
	
		
 
        return permissions

			




	
	
	
		
 

			




	
	
	
		
 
    #==================================================================

			




	
	
	
		
 
    # SET DEFAULTS GLOBAL, REPOS, REPOSITORY GROUPS

			




	
	
	
		
 
    #==================================================================

			




	
	
	
		
 
    uid = user_id

			




	
	
	
		
 

			




	
	
	
		
 
    # default global permissions taken from the default user

			




	
	
	
		
 
    default_global_perms = UserToPerm.query()\

			




	
	
	
		
 
        .filter(UserToPerm.user_id == default_user_id)\

			




	
	
	
		
 
        .options(joinedload(UserToPerm.permission))

			




	
	
	
		
 

			




	
	
	
		
 
    for perm in default_global_perms:

			




	
	
	
		
 
        permissions[GLOBAL].add(perm.permission.permission_name)

			




	
	
	
		
 

			




	
	
	
		
 
    # defaults for repositories, taken from default user

			




	
	
	
		
 
    for perm in default_repo_perms:

			




	
	
	
		
 
        r_k = perm.UserRepoToPerm.repository.repo_name

			




	
	
	
		
 
        if perm.Repository.private and not (perm.Repository.user_id == uid):

			




	
	
	
		
 
        if perm.Repository.private and not (perm.Repository.user_id == user_id):

			




	
	
	
		
 
            # disable defaults for private repos,

			




	
	
	
		
 
            p = 'repository.none'

			




	
	
	
		
 
        elif perm.Repository.user_id == uid:

			




	
	
	
		
 
        elif perm.Repository.user_id == user_id:

			




	
	
	
		
 
            # set admin if owner

			




	
	
	
		
 
            p = 'repository.admin'

			




	
	
	
		
 
        else:

			




	
	
	
		
 
            p = perm.Permission.permission_name

			




	
	
	
		
 

			




	
	
	
		
 
        permissions[RK][r_k] = p

			




	
	
		
 
@@ -257,13 +256,13 @@ def _cached_perms_data(user_id, user_is_

			




	
	
	
		
 
    # USER GROUPS comes first

			




	
	
	
		
 
    # user group global permissions

			




	
	
	
		
 
    user_perms_from_users_groups = Session().query(UserGroupToPerm)\

			




	
	
	
		
 
        .options(joinedload(UserGroupToPerm.permission))\

			




	
	
	
		
 
        .join((UserGroupMember, UserGroupToPerm.users_group_id ==

			




	
	
	
		
 
               UserGroupMember.users_group_id))\

			




	
	
	
		
 
        .filter(UserGroupMember.user_id == uid)\

			




	
	
	
		
 
        .filter(UserGroupMember.user_id == user_id)\

			




	
	
	
		
 
        .join((UserGroup, UserGroupMember.users_group_id ==

			




	
	
	
		
 
               UserGroup.users_group_id))\

			




	
	
	
		
 
        .filter(UserGroup.users_group_active == True)\

			




	
	
	
		
 
        .order_by(UserGroupToPerm.users_group_id)\

			




	
	
	
		
 
        .all()

			




	
	
	
		
 
    # need to group here by groups since user can be in more than

			




	
	
		
 
@@ -283,13 +282,13 @@ def _cached_perms_data(user_id, user_is_

			




	
	
	
		
 
        for perm in perms:

			




	
	
	
		
 
            permissions[GLOBAL].add(perm.permission.permission_name)

			




	
	
	
		
 

			




	
	
	
		
 
    # user specific global permissions

			




	
	
	
		
 
    user_perms = Session().query(UserToPerm)\

			




	
	
	
		
 
            .options(joinedload(UserToPerm.permission))\

			




	
	
	
		
 
            .filter(UserToPerm.user_id == uid).all()

			




	
	
	
		
 
            .filter(UserToPerm.user_id == user_id).all()

			




	
	
	
		
 

			




	
	
	
		
 
    if not user_inherit_default_permissions:

			




	
	
	
		
 
        # NEED TO IGNORE all configurable permissions and

			




	
	
	
		
 
        # replace them with explicitly set

			




	
	
	
		
 
        permissions[GLOBAL] = permissions[GLOBAL]\

			




	
	
	
		
 
                                        .difference(_configurable)

			




	
	
		
 
@@ -316,38 +315,38 @@ def _cached_perms_data(user_id, user_is_

			




	
	
	
		
 
               Permission.permission_id))\

			




	
	
	
		
 
        .join((UserGroup, UserGroupRepoToPerm.users_group_id ==

			




	
	
	
		
 
               UserGroup.users_group_id))\

			




	
	
	
		
 
        .filter(UserGroup.users_group_active == True)\

			




	
	
	
		
 
        .join((UserGroupMember, UserGroupRepoToPerm.users_group_id ==

			




	
	
	
		
 
               UserGroupMember.users_group_id))\

			




	
	
	
		
 
        .filter(UserGroupMember.user_id == uid)\

			




	
	
	
		
 
        .filter(UserGroupMember.user_id == user_id)\

			




	
	
	
		
 
        .all()

			




	
	
	
		
 

			




	
	
	
		
 
    multiple_counter = collections.defaultdict(int)

			




	
	
	
		
 
    for perm in user_repo_perms_from_users_groups:

			




	
	
	
		
 
        r_k = perm.UserGroupRepoToPerm.repository.repo_name

			




	
	
	
		
 
        multiple_counter[r_k] += 1

			




	
	
	
		
 
        p = perm.Permission.permission_name

			




	
	
	
		
 
        cur_perm = permissions[RK][r_k]

			




	
	
	
		
 

			




	
	
	
		
 
        if perm.Repository.user_id == uid:

			




	
	
	
		
 
        if perm.Repository.user_id == user_id:

			




	
	
	
		
 
            # set admin if owner

			




	
	
	
		
 
            p = 'repository.admin'

			




	
	
	
		
 
        else:

			




	
	
	
		
 
            if multiple_counter[r_k] > 1:

			




	
	
	
		
 
                p = _choose_perm(p, cur_perm)

			




	
	
	
		
 
        permissions[RK][r_k] = p

			




	
	
	
		
 

			




	
	
	
		
 
    # user explicit permissions for repositories, overrides any specified

			




	
	
	
		
 
    # by the group permission

			




	
	
	
		
 
    user_repo_perms = Permission.get_default_perms(uid)

			




	
	
	
		
 
    user_repo_perms = Permission.get_default_perms(user_id)

			




	
	
	
		
 
    for perm in user_repo_perms:

			




	
	
	
		
 
        r_k = perm.UserRepoToPerm.repository.repo_name

			




	
	
	
		
 
        cur_perm = permissions[RK][r_k]

			




	
	
	
		
 
        # set admin if owner

			




	
	
	
		
 
        if perm.Repository.user_id == uid:

			




	
	
	
		
 
        if perm.Repository.user_id == user_id:

			




	
	
	
		
 
            p = 'repository.admin'

			




	
	
	
		
 
        else:

			




	
	
	
		
 
            p = perm.Permission.permission_name

			




	
	
	
		
 
            if not explicit:

			




	
	
	
		
 
                p = _choose_perm(p, cur_perm)

			




	
	
	
		
 
        permissions[RK][r_k] = p

			




	
	
		
 
@@ -368,13 +367,13 @@ def _cached_perms_data(user_id, user_is_

			




	
	
	
		
 
            == Permission.permission_id))\

			




	
	
	
		
 
     .join((UserGroup, UserGroupRepoGroupToPerm.users_group_id ==

			




	
	
	
		
 
            UserGroup.users_group_id))\

			




	
	
	
		
 
     .filter(UserGroup.users_group_active == True)\

			




	
	
	
		
 
     .join((UserGroupMember, UserGroupRepoGroupToPerm.users_group_id

			




	
	
	
		
 
            == UserGroupMember.users_group_id))\

			




	
	
	
		
 
     .filter(UserGroupMember.user_id == uid)\

			




	
	
	
		
 
     .filter(UserGroupMember.user_id == user_id)\

			




	
	
	
		
 
     .all()

			




	
	
	
		
 

			




	
	
	
		
 
    multiple_counter = collections.defaultdict(int)

			




	
	
	
		
 
    for perm in user_repo_group_perms_from_users_groups:

			




	
	
	
		
 
        g_k = perm.UserGroupRepoGroupToPerm.group.group_name

			




	
	
	
		
 
        multiple_counter[g_k] += 1

			




	
	
		
 
@@ -382,13 +381,13 @@ def _cached_perms_data(user_id, user_is_

			




	
	
	
		
 
        cur_perm = permissions[GK][g_k]

			




	
	
	
		
 
        if multiple_counter[g_k] > 1:

			




	
	
	
		
 
            p = _choose_perm(p, cur_perm)

			




	
	
	
		
 
        permissions[GK][g_k] = p

			




	
	
	
		
 

			




	
	
	
		
 
    # user explicit permissions for repository groups

			




	
	
	
		
 
    user_repo_groups_perms = Permission.get_default_group_perms(uid)

			




	
	
	
		
 
    user_repo_groups_perms = Permission.get_default_group_perms(user_id)

			




	
	
	
		
 
    for perm in user_repo_groups_perms:

			




	
	
	
		
 
        rg_k = perm.UserRepoGroupToPerm.group.group_name

			




	
	
	
		
 
        p = perm.Permission.permission_name

			




	
	
	
		
 
        cur_perm = permissions[GK][rg_k]

			




	
	
	
		
 
        if not explicit:

			




	
	
	
		
 
            p = _choose_perm(p, cur_perm)

			




	
	
		
 
@@ -403,13 +402,13 @@ def _cached_perms_data(user_id, user_is_

			




	
	
	
		
 
     .join((UserGroup, UserGroupUserGroupToPerm.target_user_group_id

			




	
	
	
		
 
            == UserGroup.users_group_id))\

			




	
	
	
		
 
     .join((Permission, UserGroupUserGroupToPerm.permission_id

			




	
	
	
		
 
            == Permission.permission_id))\

			




	
	
	
		
 
     .join((UserGroupMember, UserGroupUserGroupToPerm.user_group_id

			




	
	
	
		
 
            == UserGroupMember.users_group_id))\

			




	
	
	
		
 
     .filter(UserGroupMember.user_id == uid)\

			




	
	
	
		
 
     .filter(UserGroupMember.user_id == user_id)\

			




	
	
	
		
 
     .join((UserGroup, UserGroupMember.users_group_id ==

			




	
	
	
		
 
            UserGroup.users_group_id), aliased=True, from_joinpoint=True)\

			




	
	
	
		
 
     .filter(UserGroup.users_group_active == True)\

			




	
	
	
		
 
     .all()

			




	
	
	
		
 

			




	
	
	
		
 
    multiple_counter = collections.defaultdict(int)

			




	
	
		
 
@@ -420,13 +419,13 @@ def _cached_perms_data(user_id, user_is_

			




	
	
	
		
 
        cur_perm = permissions[UK][g_k]

			




	
	
	
		
 
        if multiple_counter[g_k] > 1:

			




	
	
	
		
 
            p = _choose_perm(p, cur_perm)

			




	
	
	
		
 
        permissions[UK][g_k] = p

			




	
	
	
		
 

			




	
	
	
		
 
    #user explicit permission for user groups

			




	
	
	
		
 
    user_user_groups_perms = Permission.get_default_user_group_perms(uid)

			




	
	
	
		
 
    user_user_groups_perms = Permission.get_default_user_group_perms(user_id)

			




	
	
	
		
 
    for perm in user_user_groups_perms:

			




	
	
	
		
 
        u_k = perm.UserUserGroupToPerm.user_group.users_group_name

			




	
	
	
		
 
        p = perm.Permission.permission_name

			




	
	
	
		
 
        cur_perm = permissions[UK][u_k]

			




	
	
	
		
 
        if not explicit:

			




	
	
	
		
 
            p = _choose_perm(p, cur_perm)

			




	
	
		
 
@@ -477,15 +476,15 @@ class AuthUser(object):

			




	
	
	
		
 
    """

			




	
	
	
		
 

			




	
	
	
		
 
    def __init__(self, user_id=None, api_key=None, username=None,

			




	
	
	
		
 
            is_external_auth=False):

			




	
	
	
		
 

			




	
	
	
		
 
        self.user_id = user_id

			




	
	
	
		
 
        self._api_key = api_key

			




	
	
	
		
 
        self._api_key = api_key # API key passed as parameter

			




	
	
	
		
 

			




	
	
	
		
 
        self.api_key = None

			




	
	
	
		
 
        self.api_key = None # API key set by user_model.fill_data

			




	
	
	
		
 
        self.username = username

			




	
	
	
		
 
        self.name = ''

			




	
	
	
		
 
        self.lastname = ''

			




	
	
	
		
 
        self.email = ''

			




	
	
	
		
 
        self.is_authenticated = False

			




	
	
	
		
 
        self.admin = False

			




        

    


    
    

    

        

                

                    kallithea/model/db.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -1739,20 +1739,22 @@ class Permission(Base, BaseModel):

			




	
	
	
		
 
        'group.admin': 4,

			




	
	
	
		
 

			




	
	
	
		
 
        'usergroup.none': 0,

			




	
	
	
		
 
        'usergroup.read': 1,

			




	
	
	
		
 
        'usergroup.write': 3,

			




	
	
	
		
 
        'usergroup.admin': 4,

			




	
	
	
		
 

			




	
	
	
		
 
        'hg.repogroup.create.false': 0,

			




	
	
	
		
 
        'hg.repogroup.create.true': 1,

			




	
	
	
		
 

			




	
	
	
		
 
        'hg.usergroup.create.false': 0,

			




	
	
	
		
 
        'hg.usergroup.create.true': 1,

			




	
	
	
		
 

			




	
	
	
		
 
        'hg.fork.none': 0,

			




	
	
	
		
 
        'hg.fork.repository': 1,

			




	
	
	
		
 

			




	
	
	
		
 
        'hg.create.none': 0,

			




	
	
	
		
 
        'hg.create.repository': 1

			




	
	
	
		
 
    }

			




	
	
	
		
 

			




	
	
	
		
 
    permission_id = Column(Integer(), nullable=False, unique=True, primary_key=True)

			




	
	
	
		
 
    permission_name = Column(String(255, convert_unicode=False), nullable=True, unique=None, default=None)

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        
    
    
        This site is powered by
            Kallithea 0.7.0,
        which is
        © 2010–2025 by various authors & licensed under GPLv3.