Changeset - 43481c3d70ca
Parent rev.
Child rev.
[Not reviewed]
beta
0 4 0
Marcin Kuzminski - 14 years ago 2012-03-14 17:51:00
marcin@python-works.com
#399 added inheritance of permissions for users group on repos groups
4 files changed with 98 insertions and 15 deletions:
docs/changelog.rst
1
rhodecode/model/user.py
37
10
rhodecode/templates/admin/users/user_edit_my_account.html
4
4
rhodecode/tests/test_models.py
56
1
0 comments (0 inline, 0 general)
docs/changelog.rst
➞
Show inline comments
 
@@ -20,6 +20,7 @@ news
 
- created rcextensions module with additional mappings (ref #322) and
 
  post push/pull/create repo hooks callbacks
 
- implemented #377 Users view for his own permissions on account page
 
- #399 added inheritance of permissions for users group on repos groups
 

			




	
	
	
		
 
fixes

			




	
	
	
		
 
+++++

			




        

    


    
    

    

        

                

                    rhodecode/model/user.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -35,7 +35,8 @@ from rhodecode.lib.caching_query import 

			




	
	
	
		
 
from rhodecode.model import BaseModel

			




	
	
	
		
 
from rhodecode.model.db import User, UserRepoToPerm, Repository, Permission, \

			




	
	
	
		
 
    UserToPerm, UsersGroupRepoToPerm, UsersGroupToPerm, UsersGroupMember, \

			




	
	
	
		
 
    Notification, RepoGroup, UserRepoGroupToPerm, UsersGroup

			




	
	
	
		
 
    Notification, RepoGroup, UserRepoGroupToPerm, UsersGroup,\

			




	
	
	
		
 
    UsersGroupRepoGroupToPerm

			




	
	
	
		
 
from rhodecode.lib.exceptions import DefaultUserException, \

			




	
	
	
		
 
    UserOwnsReposException

			




	
	
	
		
 

			




	
	
		
 
@@ -410,7 +411,7 @@ class UserModel(BaseModel):

			




	
	
	
		
 
            for perm in default_global_perms:

			




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

			




	
	
	
		
 

			




	
	
	
		
 
            # default for repositories

			




	
	
	
		
 
            # 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):

			




	
	
		
 
@@ -424,17 +425,18 @@ class UserModel(BaseModel):

			




	
	
	
		
 

			




	
	
	
		
 
                user.permissions[RK][r_k] = p

			




	
	
	
		
 

			




	
	
	
		
 
            # default for repositories groups

			




	
	
	
		
 
            # defaults for repositories groups taken from default user permission

			




	
	
	
		
 
            # on given group

			




	
	
	
		
 
            for perm in default_repo_groups_perms:

			




	
	
	
		
 
                rg_k = perm.UserRepoGroupToPerm.group.group_name

			




	
	
	
		
 
                p = perm.Permission.permission_name

			




	
	
	
		
 
                user.permissions[GK][rg_k] = p

			




	
	
	
		
 

			




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

			




	
	
	
		
 
            # overwrite default with user permissions if any

			




	
	
	
		
 
            # overwrite defaults with user permissions if any found

			




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

			




	
	
	
		
 

			




	
	
	
		
 
            # user global

			




	
	
	
		
 
            # user global permissions

			




	
	
	
		
 
            user_perms = self.sa.query(UserToPerm)\

			




	
	
	
		
 
                    .options(joinedload(UserToPerm.permission))\

			




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

			




	
	
		
 
@@ -442,7 +444,7 @@ class UserModel(BaseModel):

			




	
	
	
		
 
            for perm in user_perms:

			




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

			




	
	
	
		
 

			




	
	
	
		
 
            # user repositories

			




	
	
	
		
 
            # user explicit permissions for repositories

			




	
	
	
		
 
            user_repo_perms = \

			




	
	
	
		
 
             self.sa.query(UserRepoToPerm, Permission, Repository)\

			




	
	
	
		
 
             .join((Repository, UserRepoToPerm.repository_id == Repository.repo_id))\

			




	
	
		
 
@@ -460,8 +462,8 @@ class UserModel(BaseModel):

			




	
	
	
		
 
                user.permissions[RK][r_k] = p

			




	
	
	
		
 

			




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

			




	
	
	
		
 
            # check if user is part of groups for this repository and fill in

			




	
	
	
		
 
            # (or replace with higher) permissions

			




	
	
	
		
 
            # check if user is part of user groups for this repository and

			




	
	
	
		
 
            # fill in (or replace with higher) permissions

			




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

			




	
	
	
		
 

			




	
	
	
		
 
            # users group global

			




	
	
		
 
@@ -474,7 +476,7 @@ class UserModel(BaseModel):

			




	
	
	
		
 
            for perm in user_perms_from_users_groups:

			




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

			




	
	
	
		
 

			




	
	
	
		
 
            # users group repositories

			




	
	
	
		
 
            # users group for repositories permissions

			




	
	
	
		
 
            user_repo_perms_from_users_groups = \

			




	
	
	
		
 
             self.sa.query(UsersGroupRepoToPerm, Permission, Repository,)\

			




	
	
	
		
 
             .join((Repository, UsersGroupRepoToPerm.repository_id == Repository.repo_id))\

			




	
	
		
 
@@ -496,7 +498,7 @@ class UserModel(BaseModel):

			




	
	
	
		
 
            # get access for this user for repos group and override defaults

			




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

			




	
	
	
		
 

			




	
	
	
		
 
            # user repositories groups

			




	
	
	
		
 
            # user explicit permissions for repository

			




	
	
	
		
 
            user_repo_groups_perms = \

			




	
	
	
		
 
             self.sa.query(UserRepoGroupToPerm, Permission, RepoGroup)\

			




	
	
	
		
 
             .join((RepoGroup, UserRepoGroupToPerm.group_id == RepoGroup.group_id))\

			




	
	
		
 
@@ -510,6 +512,31 @@ class UserModel(BaseModel):

			




	
	
	
		
 
                cur_perm = user.permissions[GK][rg_k]

			




	
	
	
		
 
                if PERM_WEIGHTS[p] > PERM_WEIGHTS[cur_perm]:

			




	
	
	
		
 
                    user.permissions[GK][rg_k] = p

			




	
	
	
		
 

			




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

			




	
	
	
		
 
            # check if user is part of user groups for this repo group and

			




	
	
	
		
 
            # fill in (or replace with higher) permissions

			




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

			




	
	
	
		
 

			




	
	
	
		
 
            # users group for repositories permissions

			




	
	
	
		
 
            user_repo_group_perms_from_users_groups = \

			




	
	
	
		
 
             self.sa.query(UsersGroupRepoGroupToPerm, Permission, RepoGroup)\

			




	
	
	
		
 
             .join((RepoGroup, UsersGroupRepoGroupToPerm.group_id == RepoGroup.group_id))\

			




	
	
	
		
 
             .join((Permission, UsersGroupRepoGroupToPerm.permission_id == Permission.permission_id))\

			




	
	
	
		
 
             .join((UsersGroupMember, UsersGroupRepoGroupToPerm.users_group_id == UsersGroupMember.users_group_id))\

			




	
	
	
		
 
             .filter(UsersGroupMember.user_id == uid)\

			




	
	
	
		
 
             .all()

			




	
	
	
		
 
            

			




	
	
	
		
 
            for perm in user_repo_group_perms_from_users_groups:

			




	
	
	
		
 
                g_k = perm.UsersGroupRepoGroupToPerm.group.group_name

			




	
	
	
		
 
                print perm, g_k

			




	
	
	
		
 
                p = perm.Permission.permission_name

			




	
	
	
		
 
                cur_perm = user.permissions[GK][g_k]

			




	
	
	
		
 
                # overwrite permission only if it's greater than permission

			




	
	
	
		
 
                # given from other sources

			




	
	
	
		
 
                if PERM_WEIGHTS[p] > PERM_WEIGHTS[cur_perm]:

			




	
	
	
		
 
                    user.permissions[GK][g_k] = p

			




	
	
	
		
 

			




	
	
	
		
 
        return user

			




	
	
	
		
 

			




	
	
	
		
 
    def has_perm(self, user, perm):

			




        

    


    
    

    

        

                

                    rhodecode/templates/admin/users/user_edit_my_account.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -138,12 +138,12 @@

			




	
	
	
		
 
	     <tbody>

			




	
	
	
		
 
         <%namespace name="dt" file="/_data_table/_dt_elements.html"/>

			




	
	
	
		
 
	     %if c.user_repos:

			




	
	
	
		
 
		     %for repo in c.user_repos:     

			




	
	
	
		
 
		     %for repo in c.user_repos:

			




	
	
	
		
 
		        <tr>

			




	
	
	
		
 
                    ##QUICK MENU

			




	
	
	
		
 
                    <td class="quick_repo_menu">

			




	
	
	
		
 
                      ${dt.quick_menu(repo['name'])}

			




	
	
	
		
 
                    </td>                

			




	
	
	
		
 
                    </td>

			




	
	
	
		
 
                    ##REPO NAME AND ICONS

			




	
	
	
		
 
                    <td class="reponame">

			




	
	
	
		
 
                      ${dt.repo_name(repo['name'],repo['dbrepo']['repo_type'],repo['dbrepo']['private'],repo['dbrepo_fork'].get('repo_name'))}

			




	
	
		
 
@@ -175,7 +175,7 @@

			




	
	
	
		
 
    <div id="perms" class="table" style="display:none">

			




	
	
	
		
 
           %for section in sorted(c.rhodecode_user.permissions.keys()):

			




	
	
	
		
 
            <div class="perms_section_head">${section.replace("_"," ").capitalize()}</div>

			




	
	
	
		
 
            

			




	
	
	
		
 

			




	
	
	
		
 
            <div id='tbl_list_wrap_${section}' class="yui-skin-sam">

			




	
	
	
		
 
            <table id="tbl_list_${section}">

			




	
	
	
		
 
              <thead>

			




	
	
		
 
@@ -216,7 +216,7 @@ var filter_activate = function(){

			




	
	
	
		
 
    var func = function(node){

			




	
	
	
		
 
        return node.parentNode.parentNode.parentNode.parentNode;

			




	
	
	
		
 
    }

			




	
	
	
		
 
    q_filter('q_filter',YUQ('#my tr td a.repo_name'),func);	

			




	
	
	
		
 
    q_filter('q_filter',YUQ('#my tr td a.repo_name'),func);

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
YUE.on('show_my','click',function(e){

			




        

    


    
    

    

        

                

                    rhodecode/tests/test_models.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -5,7 +5,7 @@ from rhodecode.tests import *

			




	
	
	
		
 
from rhodecode.model.repos_group import ReposGroupModel

			




	
	
	
		
 
from rhodecode.model.repo import RepoModel

			




	
	
	
		
 
from rhodecode.model.db import RepoGroup, User, Notification, UserNotification, \

			




	
	
	
		
 
    UsersGroup, UsersGroupMember, Permission

			




	
	
	
		
 
    UsersGroup, UsersGroupMember, Permission, UsersGroupRepoGroupToPerm

			




	
	
	
		
 
from sqlalchemy.exc import IntegrityError

			




	
	
	
		
 
from rhodecode.model.user import UserModel

			




	
	
	
		
 

			




	
	
		
 
@@ -608,6 +608,7 @@ class TestPermissions(unittest.TestCase)

			




	
	
	
		
 
                                                user=self.anon,

			




	
	
	
		
 
                                                perm='group.none')

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
        u1_auth = AuthUser(user_id=self.u1.user_id)

			




	
	
	
		
 
        self.assertEqual(u1_auth.permissions['repositories_groups'],

			




	
	
	
		
 
                 {u'group1': u'group.none', u'group2': u'group.none'})

			




	
	
		
 
@@ -658,3 +659,57 @@ class TestPermissions(unittest.TestCase)

			




	
	
	
		
 
        a1_auth = AuthUser(user_id=self.anon.user_id)

			




	
	
	
		
 
        self.assertEqual(a1_auth.permissions['repositories_groups'],

			




	
	
	
		
 
                 {u'group1': u'group.none', u'group2': u'group.none'})

			




	
	
	
		
 

			




	
	
	
		
 
    def test_repo_group_user_as_user_group_member(self):

			




	
	
	
		
 
        # create Group1

			




	
	
	
		
 
        self.g1 = _make_group('group1', skip_if_exists=True)

			




	
	
	
		
 
        Session.commit()

			




	
	
	
		
 
        a1_auth = AuthUser(user_id=self.anon.user_id)

			




	
	
	
		
 

			




	
	
	
		
 
        self.assertEqual(a1_auth.permissions['repositories_groups'],

			




	
	
	
		
 
                         {u'group1': u'group.read'})

			




	
	
	
		
 

			




	
	
	
		
 
        # set default permission to none

			




	
	
	
		
 
        ReposGroupModel().grant_user_permission(repos_group=self.g1,

			




	
	
	
		
 
                                                user=self.anon,

			




	
	
	
		
 
                                                perm='group.none')

			




	
	
	
		
 
        # make group

			




	
	
	
		
 
        self.ug1 = UsersGroupModel().create('G1')

			




	
	
	
		
 
        # add user to group

			




	
	
	
		
 
        UsersGroupModel().add_user_to_group(self.ug1, self.u1)

			




	
	
	
		
 
        Session.commit()

			




	
	
	
		
 

			




	
	
	
		
 
        # check if user is in the group

			




	
	
	
		
 
        membrs = [x.user_id for x in UsersGroupModel().get(self.ug1.users_group_id).members]

			




	
	
	
		
 
        self.assertEqual(membrs, [self.u1.user_id])

			




	
	
	
		
 
        # add some user to that group

			




	
	
	
		
 

			




	
	
	
		
 
        # check his permissions

			




	
	
	
		
 
        a1_auth = AuthUser(user_id=self.anon.user_id)

			




	
	
	
		
 
        self.assertEqual(a1_auth.permissions['repositories_groups'],

			




	
	
	
		
 
                         {u'group1': u'group.none'})

			




	
	
	
		
 

			




	
	
	
		
 
        u1_auth = AuthUser(user_id=self.u1.user_id)

			




	
	
	
		
 
        self.assertEqual(u1_auth.permissions['repositories_groups'],

			




	
	
	
		
 
                         {u'group1': u'group.none'})

			




	
	
	
		
 

			




	
	
	
		
 
        # grant ug1 read permissions for

			




	
	
	
		
 
        ReposGroupModel().grant_users_group_permission(repos_group=self.g1,

			




	
	
	
		
 
                                                       group_name=self.ug1,

			




	
	
	
		
 
                                                       perm='group.read')

			




	
	
	
		
 
        Session.commit()

			




	
	
	
		
 
        # check if the

			




	
	
	
		
 
        obj = Session.query(UsersGroupRepoGroupToPerm)\

			




	
	
	
		
 
            .filter(UsersGroupRepoGroupToPerm.group == self.g1)\

			




	
	
	
		
 
            .filter(UsersGroupRepoGroupToPerm.users_group == self.ug1)\

			




	
	
	
		
 
            .scalar()

			




	
	
	
		
 
        self.assertEqual(obj.permission.permission_name, 'group.read')

			




	
	
	
		
 

			




	
	
	
		
 
        a1_auth = AuthUser(user_id=self.anon.user_id)

			




	
	
	
		
 

			




	
	
	
		
 
        self.assertEqual(a1_auth.permissions['repositories_groups'],

			




	
	
	
		
 
                         {u'group1': u'group.none'})

			




	
	
	
		
 

			




	
	
	
		
 
        u1_auth = AuthUser(user_id=self.u1.user_id)

			




	
	
	
		
 
        self.assertEqual(u1_auth.permissions['repositories_groups'],

			




	
	
	
		
 
                         {u'group1': u'group.read'})

			




        

    



    


    



    



      

      





    
    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.