kallithea Changeset - 40f04021fa61

Changeset - 40f04021fa61

Parent rev.

Child rev.

[Not reviewed]

beta

0 2 0

Marcin Kuzminski - 14 years ago 2012-02-07 06:23:31
marcin@python-works.com

Added group permission autofix for older version of rhodecode which didn't have default permissions for repos groups

2 files changed with 37 insertions and 3 deletions:

rhodecode/lib/db_manage.py

rhodecode/lib/utils.py

0 comments (0 inline, 0 general)

rhodecode/lib/db_manage.py

➞

Show inline comments

@@ @@ -34,15 +34,17 @@ from rhodecode import __dbversion__ @@
 from rhodecode.model import meta
 from rhodecode.model.user import UserModel
 from rhodecode.lib.utils import ask_ok
 from rhodecode.model import init_model
 from rhodecode.model.db import User, Permission, RhodeCodeUi, \
     RhodeCodeSetting, UserToPerm, DbMigrateVersion
     RhodeCodeSetting, UserToPerm, DbMigrateVersion, RepoGroup,\
     UserRepoGroupToPerm
 from sqlalchemy.engine import create_engine
 from rhodecode.model.repos_group import ReposGroupModel
 log = logging.getLogger(__name__)
 class DbManage(object):
     def __init__(self, log_sql, dbconf, root, tests=False):
@@ @@ -167,13 +169,13 @@ class DbManage(object): @@
                 self.klass.fix_settings()
                 print ('Adding ldap defaults')
                 self.klass.create_ldap_options(skip_existing=True)
             def step_4(self):
                 print ('TODO:')
-                raise NotImplementedError()
+                self.klass.fixup_groups()
         upgrade_steps = [0] + range(curr_version + 1, __dbversion__ + 1)
         # CALL THE PROPER ORDER OF STEPS TO PERFORM FULL UPGRADE
         for step in upgrade_steps:
             print ('performing upgrade step %s' % step)
@@ @@ -345,12 +347,27 @@ class DbManage(object): @@
             if skip_existing and RhodeCodeSetting.get_by_name(k) != None:
                 log.debug('Skipping option %s' % k)
                 continue
             setting = RhodeCodeSetting(k, v)
             self.sa.add(setting)
     def fixup_groups(self):
         def_usr = User.get_by_username('default')
         for g in RepoGroup.query().all():
             g.group_name = g.get_new_name(g.name)
             self.sa.add(g)
             # get default perm
             default = UserRepoGroupToPerm.query()\
                 .filter(UserRepoGroupToPerm.group == g)\
                 .filter(UserRepoGroupToPerm.user == def_usr)\
                 .scalar()
             if default is None:
                 log.debug('missing default permission for group %s adding' % g)
                 ReposGroupModel()._create_default_perms(g)
     def config_prompt(self, test_repo_path='', retries=3):
         if retries == 3:
             log.info('Setting up repositories config')
         if not self.tests and not test_repo_path:
             path = raw_input(

rhodecode/lib/utils.py

➞

Show inline comments

@@ @@ -47,13 +47,13 @@ from vcs.utils.helpers import get_scm @@
 from vcs.exceptions import VCSError
 from rhodecode.lib.caching_query import FromCache
 from rhodecode.model import meta
 from rhodecode.model.db import Repository, User, RhodeCodeUi, \
     UserLog, RepoGroup, RhodeCodeSetting
+    UserLog, RepoGroup, RhodeCodeSetting, UserRepoGroupToPerm
 from rhodecode.model.meta import Session
 from rhodecode.model.repos_group import ReposGroupModel
 log = logging.getLogger(__name__)
@@ @@ -412,12 +412,29 @@ def repo2db_mapper(initial_repo_list, re @@
     rm = RepoModel()
     user = sa.query(User).filter(User.admin == True).first()
     if user is None:
         raise Exception('Missing administrative account !')
     added = []
     # fixup groups paths to new format on the fly. Helps with migration from
     # old rhodecode versions also set permissions if they are not present !
     # TODO: remove this in future, before release
     def_usr = User.get_by_username('default')
     for g in RepoGroup.query().all():
         g.group_name = g.get_new_name(g.name)
         sa.add(g)
         # get default perm
         default = UserRepoGroupToPerm.query()\
             .filter(UserRepoGroupToPerm.group == g)\
             .filter(UserRepoGroupToPerm.user == def_usr)\
             .scalar()
         if default is None:
             log.debug('missing default permission for group %s adding' % g)
             ReposGroupModel()._create_default_perms(g)
     for name, repo in initial_repo_list.items():
         group = map_groups(name.split(Repository.url_sep()))
         if not rm.get_by_repo_name(name, cache=False):
             log.info('repository %s not found creating default' % name)
             added.append(name)
             form_data = {

0 comments (0 inline, 0 general)