Mercurial > kallithea
changeset 8360:2045d30919e6
db: clarify that DEFAULT_USER just is DEFAULT_USER_NAME
| author | Mads Kiilerich <mads@kiilerich.com> |
|---|---|
| date | Sat, 11 Apr 2020 18:53:10 +0200 |
| parents | 23a70b7b91bf |
| children | 0456028c4ffe |
| files | kallithea/lib/db_manage.py kallithea/model/db.py kallithea/model/permission.py kallithea/model/validators.py kallithea/tests/api/api_base.py kallithea/tests/functional/test_admin_repos.py kallithea/tests/models/test_permissions.py |
| diffstat | 7 files changed, 22 insertions(+), 23 deletions(-) [+] |
line wrap: on
line diff
--- a/kallithea/lib/db_manage.py Wed Apr 22 16:09:16 2020 +0200 +++ b/kallithea/lib/db_manage.py Sat Apr 11 18:53:10 2020 +0200 @@ -389,7 +389,7 @@ def create_default_user(self): log.info('creating default user') # create default user for handling default permissions. - user = UserModel().create_or_update(username=User.DEFAULT_USER, + user = UserModel().create_or_update(username=User.DEFAULT_USER_NAME, password=str(uuid.uuid1())[:20], email='anonymous@kallithea-scm.org', firstname='Anonymous', @@ -416,4 +416,4 @@ permissions that are missing, and not alter already defined ones """ log.info('creating default user permissions') - PermissionModel().create_default_permissions(user=User.DEFAULT_USER) + PermissionModel().create_default_permissions(user=User.DEFAULT_USER_NAME)
--- a/kallithea/model/db.py Wed Apr 22 16:09:16 2020 +0200 +++ b/kallithea/model/db.py Sat Apr 11 18:53:10 2020 +0200 @@ -398,7 +398,7 @@ _table_args_default_dict, ) - DEFAULT_USER = 'default' + DEFAULT_USER_NAME = 'default' DEFAULT_GRAVATAR_URL = 'https://secure.gravatar.com/avatar/{md5email}?d=identicon&s={size}' # The name of the default auth type in extern_type, 'internal' lives in auth_internal.py DEFAULT_AUTH_TYPE = 'internal' @@ -504,7 +504,7 @@ @hybrid_property def is_default_user(self): - return self.username == User.DEFAULT_USER + return self.username == User.DEFAULT_USER_NAME @hybrid_property def user_data(self): @@ -627,7 +627,7 @@ @classmethod def get_default_user(cls): - user = User.get_by_username(User.DEFAULT_USER) + user = User.get_by_username(User.DEFAULT_USER_NAME) if user is None: raise Exception('Missing default account!') return user
--- a/kallithea/model/permission.py Wed Apr 22 16:09:16 2020 +0200 +++ b/kallithea/model/permission.py Sat Apr 11 18:53:10 2020 +0200 @@ -75,7 +75,6 @@ perms = UserToPerm.query().filter(UserToPerm.user == user).all() defined_perms_groups = set(_get_group(x.permission.permission_name) for x in perms) log.debug('GOT ALREADY DEFINED:%s', perms) - DEFAULT_PERMS = Permission.DEFAULT_USER_PERMISSIONS if force: for perm in perms: @@ -84,7 +83,7 @@ defined_perms_groups = [] # For every default permission that needs to be created, we check if # its group is already defined. If it's not, we create default permission. - for perm_name in DEFAULT_PERMS: + for perm_name in Permission.DEFAULT_USER_PERMISSIONS: gr = _get_group(perm_name) if gr not in defined_perms_groups: log.debug('GR:%s not found, creating permission %s',
--- a/kallithea/model/validators.py Wed Apr 22 16:09:16 2020 +0200 +++ b/kallithea/model/validators.py Sat Apr 11 18:53:10 2020 +0200 @@ -563,16 +563,16 @@ for k, v in value.items(): if k.startswith('u_perm_') or k.startswith('g_perm_'): - member = k[7:] + member_name = k[7:] t = {'u': 'user', 'g': 'users_group' }[k[0]] - if member == User.DEFAULT_USER: + if member_name == User.DEFAULT_USER_NAME: if str2bool(value.get('repo_private')): # set none for default when updating to # private repo protects against form manipulation v = EMPTY_PERM - perms_update.add((member, v, t)) + perms_update.add((member_name, v, t)) value['perms_updates'] = list(perms_update) value['perms_new'] = list(perms_new)
--- a/kallithea/tests/api/api_base.py Wed Apr 22 16:09:16 2020 +0200 +++ b/kallithea/tests/api/api_base.py Sat Apr 11 18:53:10 2020 +0200 @@ -671,7 +671,7 @@ def test_api_get_repo_by_non_admin_no_permission_to_repo(self): RepoModel().grant_user_permission(repo=self.REPO, - user=User.DEFAULT_USER, + user=User.DEFAULT_USER_NAME, perm='repository.none') try: RepoModel().grant_user_permission(repo=self.REPO, @@ -686,7 +686,7 @@ self._compare_error(id_, expected, given=response.body) finally: RepoModel().grant_user_permission(repo=self.REPO, - user=User.DEFAULT_USER, + user=User.DEFAULT_USER_NAME, perm='repository.read') def test_api_get_repo_that_doesn_not_exist(self): @@ -1328,7 +1328,7 @@ def test_api_fork_repo_non_admin_no_permission_to_fork(self): RepoModel().grant_user_permission(repo=self.REPO, - user=User.DEFAULT_USER, + user=User.DEFAULT_USER_NAME, perm='repository.none') try: fork_name = 'api-repo-fork' @@ -1341,7 +1341,7 @@ self._compare_error(id_, expected, given=response.body) finally: RepoModel().grant_user_permission(repo=self.REPO, - user=User.DEFAULT_USER, + user=User.DEFAULT_USER_NAME, perm='repository.read') fixture.destroy_repo(fork_name)
--- a/kallithea/tests/functional/test_admin_repos.py Wed Apr 22 16:09:16 2020 +0200 +++ b/kallithea/tests/functional/test_admin_repos.py Sat Apr 11 18:53:10 2020 +0200 @@ -166,10 +166,10 @@ # revoke user_model = UserModel() # disable fork and create on default user - user_model.revoke_perm(User.DEFAULT_USER, 'hg.create.repository') - user_model.grant_perm(User.DEFAULT_USER, 'hg.create.none') - user_model.revoke_perm(User.DEFAULT_USER, 'hg.fork.repository') - user_model.grant_perm(User.DEFAULT_USER, 'hg.fork.none') + user_model.revoke_perm(User.DEFAULT_USER_NAME, 'hg.create.repository') + user_model.grant_perm(User.DEFAULT_USER_NAME, 'hg.create.none') + user_model.revoke_perm(User.DEFAULT_USER_NAME, 'hg.fork.repository') + user_model.grant_perm(User.DEFAULT_USER_NAME, 'hg.fork.none') # disable on regular user user_model.revoke_perm(base.TEST_USER_REGULAR_LOGIN, 'hg.create.repository') @@ -563,10 +563,10 @@ # revoke user_model = UserModel() # disable fork and create on default user - user_model.revoke_perm(User.DEFAULT_USER, 'hg.create.repository') - user_model.grant_perm(User.DEFAULT_USER, 'hg.create.none') - user_model.revoke_perm(User.DEFAULT_USER, 'hg.fork.repository') - user_model.grant_perm(User.DEFAULT_USER, 'hg.fork.none') + user_model.revoke_perm(User.DEFAULT_USER_NAME, 'hg.create.repository') + user_model.grant_perm(User.DEFAULT_USER_NAME, 'hg.create.none') + user_model.revoke_perm(User.DEFAULT_USER_NAME, 'hg.fork.repository') + user_model.grant_perm(User.DEFAULT_USER_NAME, 'hg.fork.none') # disable on regular user user_model.revoke_perm(base.TEST_USER_REGULAR_LOGIN, 'hg.create.repository')
--- a/kallithea/tests/models/test_permissions.py Wed Apr 22 16:09:16 2020 +0200 +++ b/kallithea/tests/models/test_permissions.py Sat Apr 11 18:53:10 2020 +0200 @@ -19,7 +19,7 @@ @classmethod def setup_class(cls): # recreate default user to get a clean start - PermissionModel().create_default_permissions(user=User.DEFAULT_USER, + PermissionModel().create_default_permissions(user=User.DEFAULT_USER_NAME, force=True) Session().commit()