kallithea Changeset - 091e99b29fd4

Changeset - 091e99b29fd4

Parent rev.

Child rev.

[Not reviewed]

beta

0 4 0

Marcin Kuzminski - 13 years ago 2012-09-04 01:45:57
marcin@python-works.com

auto-healing of permissions for default user after upgrading from some old versions.

4 files changed with 44 insertions and 7 deletions:

docs/changelog.rst

rhodecode/lib/db_manage.py

rhodecode/model/db.py

rhodecode/model/permission.py

0 comments (0 inline, 0 general)

docs/changelog.rst

➞

Show inline comments

@@ @@ -5,7 +5,7 @@ Changelog @@
 =========
-.4.1 (**2012-XX-XX**)
+.4.1 (**2012-09-04**)
 ----------------------
 :status: in-progress
@@ @@ -16,11 +16,17 @@ news @@
 - always put a comment about code-review status change even if user send
   empty data
 - modified_on column saves repository update and it's going to be used
   later for light version of main page ref #500
 fixes
 +++++
 - fixed migrations of permissions that can lead to inconsistency issue
 - fixed migrations of permissions that can lead to inconsistency.
   Some users sent feedback that after upgrading from older versions issues with updating
   default permissions occured. RhodeCode detects that now and resets default user
   permission to initial state if there is a need for that. Also forces users to set
   the default value for new forking permission.
 .4.0 (**2012-09-03**)

rhodecode/lib/db_manage.py

➞

Show inline comments

@@ @@ -255,7 +255,14 @@ class DbManage(object): @@
                 Session().add(reg_perm)
             def step_7(self):
                 pass
                 perm_fixes = self.klass.reset_permissions(User.DEFAULT_USER)
                 Session().commit()
                 if perm_fixes:
                     notify('There was an inconsistent state of permissions '
                            'detected for default user. Permissions are now '
                            'reset to the default value for default user. '
                            'Please validate and check default permissions '
                            'in admin panel')
         upgrade_steps = [0] + range(curr_version + 1, __dbversion__ + 1)
@@ @@ -478,6 +485,28 @@ class DbManage(object): @@
                 log.debug('missing default permission for group %s adding' % g)
                 ReposGroupModel()._create_default_perms(g)
     def reset_permissions(self, username):
         """
         Resets permissions to default state, usefull when old systems had
         bad permissions, we must clean them up
         :param username:
         :type username:
         """
         default_user = User.get_by_username(username)
         if not default_user:
             return
         u2p = UserToPerm.query()\
             .filter(UserToPerm.user == default_user).all()
         fixed = False
         if len(u2p) != len(User.DEFAULT_PERMISSIONS):
             for p in u2p:
                 Session().delete(p)
             fixed = True
             self.populate_default_permissions()
         return fixed
     def config_prompt(self, test_repo_path='', retries=3, defaults={}):
         _path = defaults.get('repos_location')
         if retries == 3:
@@ @@ -605,8 +634,7 @@ class DbManage(object): @@
         default_user = User.get_by_username('default')
         for def_perm in ['hg.register.manual_activate', 'hg.create.repository',
                          'hg.fork.repository', 'repository.read']:
         for def_perm in User.DEFAULT_PERMISSIONS:
             perm = self.sa.query(Permission)\
              .filter(Permission.permission_name == def_perm)\

rhodecode/model/db.py

➞

Show inline comments

@@ @@ -289,7 +289,10 @@ class User(Base, BaseModel): @@
          'mysql_charset': 'utf8'}
+    )
     DEFAULT_USER = 'default'
     DEFAULT_PERMISSIONS = [
         'hg.register.manual_activate', 'hg.create.repository',
         'hg.fork.repository', 'repository.read'
+    ]
     user_id = Column("user_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     username = Column("username", String(255, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)
     password = Column("password", String(255, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)

rhodecode/model/permission.py

➞

Show inline comments

@@ @@ -77,7 +77,7 @@ class PermissionModel(BaseModel): @@
                                 form_result['perm_user_name']).scalar()
         u2p = self.sa.query(UserToPerm).filter(UserToPerm.user ==
                                                perm_user).all()
-        if len(u2p) != 4:
+        if len(u2p) != len(User.DEFAULT_PERMISSIONS):
             raise Exception('Defined: %s should be 4  permissions for default'
                             ' user. This should not happen please verify'
                             ' your database' % len(u2p))

0 comments (0 inline, 0 general)