engineering/unrhodecode
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

dbmigrate: fixed migration problems

Browse source
This commit is contained in:
RhodeCode Admin 2023-08-29 15:29:48 +02:00
parent 7409eccb7e
commit c7bab12d1b
40 changed files with 86 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

2
rhodecode/lib/dbmigrate/schema/db_1_7_0.py
View file

@ -447,7 +447,7 @@ class UserGroup(Base, BaseModel):
users_group_repo_to_perm = relationship('UserGroupRepoToPerm', cascade='all')
users_group_repo_group_to_perm = relationship('UserGroupRepoGroupToPerm', cascade='all')
user_user_group_to_perm = relationship('UserUserGroupToPerm', cascade='all')
user_group_user_group_to_perm = relationship('UserGroupUserGroupToPerm ', primaryjoin="UserGroupUserGroupToPerm.target_user_group_id==UserGroup.users_group_id", cascade='all')
user_group_user_group_to_perm = relationship('UserGroupUserGroupToPerm', primaryjoin="UserGroupUserGroupToPerm.target_user_group_id==UserGroup.users_group_id", cascade='all')
user = relationship('User')

2
rhodecode/lib/dbmigrate/schema/db_1_8_0.py
View file

@ -449,7 +449,7 @@ class UserGroup(Base, BaseModel):
users_group_repo_to_perm = relationship('UserGroupRepoToPerm', cascade='all')
users_group_repo_group_to_perm = relationship('UserGroupRepoGroupToPerm', cascade='all')
user_user_group_to_perm = relationship('UserUserGroupToPerm', cascade='all')
user_group_user_group_to_perm = relationship('UserGroupUserGroupToPerm ', primaryjoin="UserGroupUserGroupToPerm.target_user_group_id==UserGroup.users_group_id", cascade='all')
user_group_user_group_to_perm = relationship('UserGroupUserGroupToPerm', primaryjoin="UserGroupUserGroupToPerm.target_user_group_id==UserGroup.users_group_id", cascade='all')
user = relationship('User')

2
rhodecode/lib/dbmigrate/schema/db_2_0_0.py
View file

@ -472,7 +472,7 @@ class UserGroup(Base, BaseModel):
users_group_repo_to_perm = relationship('UserGroupRepoToPerm', cascade='all')
users_group_repo_group_to_perm = relationship('UserGroupRepoGroupToPerm', cascade='all')
user_user_group_to_perm = relationship('UserUserGroupToPerm', cascade='all')
user_group_user_group_to_perm = relationship('UserGroupUserGroupToPerm ', primaryjoin="UserGroupUserGroupToPerm.target_user_group_id==UserGroup.users_group_id", cascade='all')
user_group_user_group_to_perm = relationship('UserGroupUserGroupToPerm', primaryjoin="UserGroupUserGroupToPerm.target_user_group_id==UserGroup.users_group_id", cascade='all')
user = relationship('User')

2
rhodecode/lib/dbmigrate/schema/db_2_0_1.py
View file

@ -471,7 +471,7 @@ class UserGroup(Base, BaseModel):
users_group_repo_to_perm = relationship('UserGroupRepoToPerm', cascade='all')
users_group_repo_group_to_perm = relationship('UserGroupRepoGroupToPerm', cascade='all')
user_user_group_to_perm = relationship('UserUserGroupToPerm', cascade='all')
user_group_user_group_to_perm = relationship('UserGroupUserGroupToPerm ', primaryjoin="UserGroupUserGroupToPerm.target_user_group_id==UserGroup.users_group_id", cascade='all')
user_group_user_group_to_perm = relationship('UserGroupUserGroupToPerm', primaryjoin="UserGroupUserGroupToPerm.target_user_group_id==UserGroup.users_group_id", cascade='all')
user = relationship('User')

2
rhodecode/lib/dbmigrate/schema/db_2_0_2.py
View file

@ -471,7 +471,7 @@ class UserGroup(Base, BaseModel):
users_group_repo_to_perm = relationship('UserGroupRepoToPerm', cascade='all')
users_group_repo_group_to_perm = relationship('UserGroupRepoGroupToPerm', cascade='all')
user_user_group_to_perm = relationship('UserUserGroupToPerm', cascade='all')
user_group_user_group_to_perm = relationship('UserGroupUserGroupToPerm ', primaryjoin="UserGroupUserGroupToPerm.target_user_group_id==UserGroup.users_group_id", cascade='all')
user_group_user_group_to_perm = relationship('UserGroupUserGroupToPerm', primaryjoin="UserGroupUserGroupToPerm.target_user_group_id==UserGroup.users_group_id", cascade='all')
user = relationship('User')

2
rhodecode/lib/dbmigrate/schema/db_2_1_0.py
View file

@ -505,7 +505,7 @@ class UserGroup(Base, BaseModel):
users_group_repo_to_perm = relationship('UserGroupRepoToPerm', cascade='all')
users_group_repo_group_to_perm = relationship('UserGroupRepoGroupToPerm', cascade='all')
user_user_group_to_perm = relationship('UserUserGroupToPerm', cascade='all')
user_group_user_group_to_perm = relationship('UserGroupUserGroupToPerm ', primaryjoin="UserGroupUserGroupToPerm.target_user_group_id==UserGroup.users_group_id", cascade='all')
user_group_user_group_to_perm = relationship('UserGroupUserGroupToPerm', primaryjoin="UserGroupUserGroupToPerm.target_user_group_id==UserGroup.users_group_id", cascade='all')
user = relationship('User')

2
rhodecode/lib/dbmigrate/schema/db_2_2_0.py
View file

@ -516,7 +516,7 @@ class UserGroup(Base, BaseModel):
users_group_repo_to_perm = relationship('UserGroupRepoToPerm', cascade='all')
users_group_repo_group_to_perm = relationship('UserGroupRepoGroupToPerm', cascade='all')
user_user_group_to_perm = relationship('UserUserGroupToPerm', cascade='all')
user_group_user_group_to_perm = relationship('UserGroupUserGroupToPerm ', primaryjoin="UserGroupUserGroupToPerm.target_user_group_id==UserGroup.users_group_id", cascade='all')
user_group_user_group_to_perm = relationship('UserGroupUserGroupToPerm', primaryjoin="UserGroupUserGroupToPerm.target_user_group_id==UserGroup.users_group_id", cascade='all')
user = relationship('User')

2
rhodecode/lib/dbmigrate/schema/db_2_2_3.py
View file

@ -517,7 +517,7 @@ class UserGroup(Base, BaseModel):
users_group_repo_to_perm = relationship('UserGroupRepoToPerm', cascade='all')
users_group_repo_group_to_perm = relationship('UserGroupRepoGroupToPerm', cascade='all')
user_user_group_to_perm = relationship('UserUserGroupToPerm', cascade='all')
user_group_user_group_to_perm = relationship('UserGroupUserGroupToPerm ', primaryjoin="UserGroupUserGroupToPerm.target_user_group_id==UserGroup.users_group_id", cascade='all')
user_group_user_group_to_perm = relationship('UserGroupUserGroupToPerm', primaryjoin="UserGroupUserGroupToPerm.target_user_group_id==UserGroup.users_group_id", cascade='all')
user = relationship('User')

2
rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py
View file

@ -523,7 +523,7 @@ class UserGroup(Base, BaseModel):
users_group_repo_to_perm = relationship('UserGroupRepoToPerm', cascade='all')
users_group_repo_group_to_perm = relationship('UserGroupRepoGroupToPerm', cascade='all')
user_user_group_to_perm = relationship('UserUserGroupToPerm', cascade='all')
user_group_user_group_to_perm = relationship('UserGroupUserGroupToPerm ', primaryjoin="UserGroupUserGroupToPerm.target_user_group_id==UserGroup.users_group_id", cascade='all')
user_group_user_group_to_perm = relationship('UserGroupUserGroupToPerm', primaryjoin="UserGroupUserGroupToPerm.target_user_group_id==UserGroup.users_group_id", cascade='all')
user = relationship('User')

2
rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py
View file

@ -523,7 +523,7 @@ class UserGroup(Base, BaseModel):
users_group_repo_to_perm = relationship('UserGroupRepoToPerm', cascade='all')
users_group_repo_group_to_perm = relationship('UserGroupRepoGroupToPerm', cascade='all')
user_user_group_to_perm = relationship('UserUserGroupToPerm', cascade='all')
user_group_user_group_to_perm = relationship('UserGroupUserGroupToPerm ', primaryjoin="UserGroupUserGroupToPerm.target_user_group_id==UserGroup.users_group_id", cascade='all')
user_group_user_group_to_perm = relationship('UserGroupUserGroupToPerm', primaryjoin="UserGroupUserGroupToPerm.target_user_group_id==UserGroup.users_group_id", cascade='all')
user = relationship('User')

2
rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py
View file

@ -544,7 +544,7 @@ class UserGroup(Base, BaseModel):
users_group_repo_to_perm = relationship('UserGroupRepoToPerm', cascade='all')
users_group_repo_group_to_perm = relationship('UserGroupRepoGroupToPerm', cascade='all')
user_user_group_to_perm = relationship('UserUserGroupToPerm', cascade='all')
user_group_user_group_to_perm = relationship('UserGroupUserGroupToPerm ', primaryjoin="UserGroupUserGroupToPerm.target_user_group_id==UserGroup.users_group_id", cascade='all')
user_group_user_group_to_perm = relationship('UserGroupUserGroupToPerm', primaryjoin="UserGroupUserGroupToPerm.target_user_group_id==UserGroup.users_group_id", cascade='all')
user = relationship('User')

2
rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py
View file

@ -554,7 +554,7 @@ class UserGroup(Base, BaseModel):
users_group_repo_to_perm = relationship('UserGroupRepoToPerm', cascade='all')
users_group_repo_group_to_perm = relationship('UserGroupRepoGroupToPerm', cascade='all')
user_user_group_to_perm = relationship('UserUserGroupToPerm', cascade='all')
user_group_user_group_to_perm = relationship('UserGroupUserGroupToPerm ', primaryjoin="UserGroupUserGroupToPerm.target_user_group_id==UserGroup.users_group_id", cascade='all')
user_group_user_group_to_perm = relationship('UserGroupUserGroupToPerm', primaryjoin="UserGroupUserGroupToPerm.target_user_group_id==UserGroup.users_group_id", cascade='all')
user = relationship('User')

2
rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py
View file

@ -595,7 +595,7 @@ class UserGroup(Base, BaseModel):
users_group_repo_to_perm = relationship('UserGroupRepoToPerm', cascade='all')
users_group_repo_group_to_perm = relationship('UserGroupRepoGroupToPerm', cascade='all')
user_user_group_to_perm = relationship('UserUserGroupToPerm', cascade='all')
user_group_user_group_to_perm = relationship('UserGroupUserGroupToPerm ', primaryjoin="UserGroupUserGroupToPerm.target_user_group_id==UserGroup.users_group_id", cascade='all')
user_group_user_group_to_perm = relationship('UserGroupUserGroupToPerm', primaryjoin="UserGroupUserGroupToPerm.target_user_group_id==UserGroup.users_group_id", cascade='all')
user = relationship('User')

2
rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py
View file

@ -595,7 +595,7 @@ class UserGroup(Base, BaseModel):
users_group_repo_to_perm = relationship('UserGroupRepoToPerm', cascade='all')
users_group_repo_group_to_perm = relationship('UserGroupRepoGroupToPerm', cascade='all')
user_user_group_to_perm = relationship('UserUserGroupToPerm', cascade='all')
user_group_user_group_to_perm = relationship('UserGroupUserGroupToPerm ', primaryjoin="UserGroupUserGroupToPerm.target_user_group_id==UserGroup.users_group_id", cascade='all')
user_group_user_group_to_perm = relationship('UserGroupUserGroupToPerm', primaryjoin="UserGroupUserGroupToPerm.target_user_group_id==UserGroup.users_group_id", cascade='all')
user = relationship('User')

2
rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py
View file

@ -596,7 +596,7 @@ class UserGroup(Base, BaseModel):
users_group_repo_to_perm = relationship('UserGroupRepoToPerm', cascade='all')
users_group_repo_group_to_perm = relationship('UserGroupRepoGroupToPerm', cascade='all')
user_user_group_to_perm = relationship('UserUserGroupToPerm', cascade='all')
user_group_user_group_to_perm = relationship('UserGroupUserGroupToPerm ', primaryjoin="UserGroupUserGroupToPerm.target_user_group_id==UserGroup.users_group_id", cascade='all')
user_group_user_group_to_perm = relationship('UserGroupUserGroupToPerm', primaryjoin="UserGroupUserGroupToPerm.target_user_group_id==UserGroup.users_group_id", cascade='all')
user = relationship('User')

2
rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py
View file

@ -596,7 +596,7 @@ class UserGroup(Base, BaseModel):
users_group_repo_to_perm = relationship('UserGroupRepoToPerm', cascade='all')
users_group_repo_group_to_perm = relationship('UserGroupRepoGroupToPerm', cascade='all')
user_user_group_to_perm = relationship('UserUserGroupToPerm', cascade='all')
user_group_user_group_to_perm = relationship('UserGroupUserGroupToPerm ', primaryjoin="UserGroupUserGroupToPerm.target_user_group_id==UserGroup.users_group_id", cascade='all')
user_group_user_group_to_perm = relationship('UserGroupUserGroupToPerm', primaryjoin="UserGroupUserGroupToPerm.target_user_group_id==UserGroup.users_group_id", cascade='all')
user = relationship('User')

2
rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py
View file

@ -602,7 +602,7 @@ class UserGroup(Base, BaseModel):
users_group_repo_to_perm = relationship('UserGroupRepoToPerm', cascade='all')
users_group_repo_group_to_perm = relationship('UserGroupRepoGroupToPerm', cascade='all')
user_user_group_to_perm = relationship('UserUserGroupToPerm', cascade='all')
user_group_user_group_to_perm = relationship('UserGroupUserGroupToPerm ', primaryjoin="UserGroupUserGroupToPerm.target_user_group_id==UserGroup.users_group_id", cascade='all')
user_group_user_group_to_perm = relationship('UserGroupUserGroupToPerm', primaryjoin="UserGroupUserGroupToPerm.target_user_group_id==UserGroup.users_group_id", cascade='all')
user = relationship('User')

2
rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py
View file

@ -719,7 +719,7 @@ class UserGroup(Base, BaseModel):
users_group_repo_to_perm = relationship('UserGroupRepoToPerm', cascade='all')
users_group_repo_group_to_perm = relationship('UserGroupRepoGroupToPerm', cascade='all')
user_user_group_to_perm = relationship('UserUserGroupToPerm', cascade='all')
user_group_user_group_to_perm = relationship('UserGroupUserGroupToPerm ', primaryjoin="UserGroupUserGroupToPerm.target_user_group_id==UserGroup.users_group_id", cascade='all')
user_group_user_group_to_perm = relationship('UserGroupUserGroupToPerm', primaryjoin="UserGroupUserGroupToPerm.target_user_group_id==UserGroup.users_group_id", cascade='all')
user = relationship('User')

45
rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py
View file

@ -41,6 +41,7 @@ from beaker.cache import cache_region, region_invalidate
from webob.exc import HTTPNotFound
from zope.cachedescriptors.property import Lazy as LazyProperty
from rhodecode.lib import enc_utils
from rhodecode.translation import _
from rhodecode.lib.vcs import get_backend
@ -69,7 +70,7 @@ _hash_key = lambda k: md5_safe(k)
# this is propagated from .ini file beaker.session.secret
# and initialized at environment.py
ENCRYPTION_KEY = None
ENCRYPTION_KEY: bytes = b''
# used to sort permissions by types, '#' used here is not allowed to be in
# usernames, and it's very early in sorted string.printable table.
@ -106,30 +107,38 @@ class EncryptedValue(TypeDecorator):
impl = String
def process_bind_param(self, value, dialect):
"""
Setter for storing value
"""
import rhodecode
if not value:
return value
if value.startswith('enc$aes$'):
# protect against double encrypting if someone manually starts doing
raise ValueError('value needs to be in unencrypted format, ie. '
'not starting with enc$aes$')
return 'enc$aes$%s' % AESCipher(ENCRYPTION_KEY).encrypt(value)
# protect against double encrypting if values is already encrypted
if value.startswith('enc$aes$') \
or value.startswith('enc$aes_hmac$') \
or value.startswith('enc2$'):
raise ValueError('value needs to be in unencrypted format, '
'ie. not starting with enc$ or enc2$')
algo = rhodecode.CONFIG.get('rhodecode.encrypted_values.algorithm') or 'aes'
bytes_val = enc_utils.encrypt_value(value, enc_key=ENCRYPTION_KEY, algo=algo)
return safe_str(bytes_val)
def process_result_value(self, value, dialect):
"""
Getter for retrieving value
"""
import rhodecode
if not value:
return value
parts = value.split('$', 3)
if not len(parts) == 3:
# probably not encrypted values
return value
else:
if parts[0] != 'enc':
# parts ok but without our header ?
return value
enc_strict_mode = rhodecode.ConfigGet().get_bool('rhodecode.encrypted_values.strict', missing=True)
# at that stage we know it's our encryption
decrypted_data = AESCipher(ENCRYPTION_KEY).decrypt(parts[2])
return decrypted_data
bytes_val = enc_utils.decrypt_value(value, enc_key=ENCRYPTION_KEY, strict_mode=enc_strict_mode)
return safe_str(bytes_val)
class BaseModel(object):
@ -742,7 +751,7 @@ class UserGroup(Base, BaseModel):
users_group_repo_to_perm = relationship('UserGroupRepoToPerm', cascade='all')
users_group_repo_group_to_perm = relationship('UserGroupRepoGroupToPerm', cascade='all')
user_user_group_to_perm = relationship('UserUserGroupToPerm', cascade='all')
user_group_user_group_to_perm = relationship('UserGroupUserGroupToPerm ', primaryjoin="UserGroupUserGroupToPerm.target_user_group_id==UserGroup.users_group_id", cascade='all')
user_group_user_group_to_perm = relationship('UserGroupUserGroupToPerm', primaryjoin="UserGroupUserGroupToPerm.target_user_group_id==UserGroup.users_group_id", cascade='all')
user = relationship('User')

2
rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py
View file

@ -1303,7 +1303,7 @@ class UserGroup(Base, BaseModel):
users_group_repo_to_perm = relationship('UserGroupRepoToPerm', cascade='all')
users_group_repo_group_to_perm = relationship('UserGroupRepoGroupToPerm', cascade='all')
user_user_group_to_perm = relationship('UserUserGroupToPerm', cascade='all')
user_group_user_group_to_perm = relationship('UserGroupUserGroupToPerm ', primaryjoin="UserGroupUserGroupToPerm.target_user_group_id==UserGroup.users_group_id", cascade='all')
user_group_user_group_to_perm = relationship('UserGroupUserGroupToPerm', primaryjoin="UserGroupUserGroupToPerm.target_user_group_id==UserGroup.users_group_id", cascade='all')
user_group_review_rules = relationship('RepoReviewRuleUserGroup', cascade='all')
user = relationship('User', primaryjoin="User.user_id==UserGroup.user_id")

2
rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py
View file

@ -1307,7 +1307,7 @@ class UserGroup(Base, BaseModel):
users_group_repo_to_perm = relationship('UserGroupRepoToPerm', cascade='all')
users_group_repo_group_to_perm = relationship('UserGroupRepoGroupToPerm', cascade='all')
user_user_group_to_perm = relationship('UserUserGroupToPerm', cascade='all')
user_group_user_group_to_perm = relationship('UserGroupUserGroupToPerm ', primaryjoin="UserGroupUserGroupToPerm.target_user_group_id==UserGroup.users_group_id", cascade='all')
user_group_user_group_to_perm = relationship('UserGroupUserGroupToPerm', primaryjoin="UserGroupUserGroupToPerm.target_user_group_id==UserGroup.users_group_id", cascade='all')
user_group_review_rules = relationship('RepoReviewRuleUserGroup', cascade='all')
user = relationship('User', primaryjoin="User.user_id==UserGroup.user_id")

2
rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py
View file

@ -1314,7 +1314,7 @@ class UserGroup(Base, BaseModel):
users_group_repo_to_perm = relationship('UserGroupRepoToPerm', cascade='all')
users_group_repo_group_to_perm = relationship('UserGroupRepoGroupToPerm', cascade='all')
user_user_group_to_perm = relationship('UserUserGroupToPerm', cascade='all')
user_group_user_group_to_perm = relationship('UserGroupUserGroupToPerm ', primaryjoin="UserGroupUserGroupToPerm.target_user_group_id==UserGroup.users_group_id", cascade='all')
user_group_user_group_to_perm = relationship('UserGroupUserGroupToPerm', primaryjoin="UserGroupUserGroupToPerm.target_user_group_id==UserGroup.users_group_id", cascade='all')
user_group_review_rules = relationship('RepoReviewRuleUserGroup', cascade='all')
user = relationship('User', primaryjoin="User.user_id==UserGroup.user_id")

2
rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py
View file

@ -1316,7 +1316,7 @@ class UserGroup(Base, BaseModel):
users_group_repo_to_perm = relationship('UserGroupRepoToPerm', cascade='all')
users_group_repo_group_to_perm = relationship('UserGroupRepoGroupToPerm', cascade='all')
user_user_group_to_perm = relationship('UserUserGroupToPerm', cascade='all')
user_group_user_group_to_perm = relationship('UserGroupUserGroupToPerm ', primaryjoin="UserGroupUserGroupToPerm.target_user_group_id==UserGroup.users_group_id", cascade='all')
user_group_user_group_to_perm = relationship('UserGroupUserGroupToPerm', primaryjoin="UserGroupUserGroupToPerm.target_user_group_id==UserGroup.users_group_id", cascade='all')
user_group_review_rules = relationship('RepoReviewRuleUserGroup', cascade='all')
user = relationship('User', primaryjoin="User.user_id==UserGroup.user_id")

2
rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py
View file

@ -1316,7 +1316,7 @@ class UserGroup(Base, BaseModel):
users_group_repo_to_perm = relationship('UserGroupRepoToPerm', cascade='all')
users_group_repo_group_to_perm = relationship('UserGroupRepoGroupToPerm', cascade='all')
user_user_group_to_perm = relationship('UserUserGroupToPerm', cascade='all')
user_group_user_group_to_perm = relationship('UserGroupUserGroupToPerm ', primaryjoin="UserGroupUserGroupToPerm.target_user_group_id==UserGroup.users_group_id", cascade='all')
user_group_user_group_to_perm = relationship('UserGroupUserGroupToPerm', primaryjoin="UserGroupUserGroupToPerm.target_user_group_id==UserGroup.users_group_id", cascade='all')
user_group_review_rules = relationship('RepoReviewRuleUserGroup', cascade='all')
user = relationship('User', primaryjoin="User.user_id==UserGroup.user_id")

2
rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py
View file

@ -1333,7 +1333,7 @@ class UserGroup(Base, BaseModel):
users_group_repo_to_perm = relationship('UserGroupRepoToPerm', cascade='all')
users_group_repo_group_to_perm = relationship('UserGroupRepoGroupToPerm', cascade='all')
user_user_group_to_perm = relationship('UserUserGroupToPerm', cascade='all')
user_group_user_group_to_perm = relationship('UserGroupUserGroupToPerm ', primaryjoin="UserGroupUserGroupToPerm.target_user_group_id==UserGroup.users_group_id", cascade='all')
user_group_user_group_to_perm = relationship('UserGroupUserGroupToPerm', primaryjoin="UserGroupUserGroupToPerm.target_user_group_id==UserGroup.users_group_id", cascade='all')
user_group_review_rules = relationship('RepoReviewRuleUserGroup', cascade='all')
user = relationship('User', primaryjoin="User.user_id==UserGroup.user_id")

2
rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py
View file

@ -1386,7 +1386,7 @@ class UserGroup(Base, BaseModel):
users_group_repo_to_perm = relationship('UserGroupRepoToPerm', cascade='all')
users_group_repo_group_to_perm = relationship('UserGroupRepoGroupToPerm', cascade='all')
user_user_group_to_perm = relationship('UserUserGroupToPerm', cascade='all')
user_group_user_group_to_perm = relationship('UserGroupUserGroupToPerm ', primaryjoin="UserGroupUserGroupToPerm.target_user_group_id==UserGroup.users_group_id", cascade='all')
user_group_user_group_to_perm = relationship('UserGroupUserGroupToPerm', primaryjoin="UserGroupUserGroupToPerm.target_user_group_id==UserGroup.users_group_id", cascade='all')
user_group_review_rules = relationship('RepoReviewRuleUserGroup', cascade='all')
user = relationship('User', primaryjoin="User.user_id==UserGroup.user_id")

2
rhodecode/lib/dbmigrate/schema/db_4_19_0_2.py
View file

@ -1392,7 +1392,7 @@ class UserGroup(Base, BaseModel):
users_group_repo_to_perm = relationship('UserGroupRepoToPerm', cascade='all')
users_group_repo_group_to_perm = relationship('UserGroupRepoGroupToPerm', cascade='all')
user_user_group_to_perm = relationship('UserUserGroupToPerm', cascade='all')
user_group_user_group_to_perm = relationship('UserGroupUserGroupToPerm ', primaryjoin="UserGroupUserGroupToPerm.target_user_group_id==UserGroup.users_group_id", cascade='all')
user_group_user_group_to_perm = relationship('UserGroupUserGroupToPerm', primaryjoin="UserGroupUserGroupToPerm.target_user_group_id==UserGroup.users_group_id", cascade='all')
user_group_review_rules = relationship('RepoReviewRuleUserGroup', cascade='all')
user = relationship('User', primaryjoin="User.user_id==UserGroup.user_id")

2
rhodecode/lib/dbmigrate/schema/db_4_20_0_0.py
View file

@ -1415,7 +1415,7 @@ class UserGroup(Base, BaseModel):
users_group_repo_to_perm = relationship('UserGroupRepoToPerm', cascade='all')
users_group_repo_group_to_perm = relationship('UserGroupRepoGroupToPerm', cascade='all')
user_user_group_to_perm = relationship('UserUserGroupToPerm', cascade='all')
user_group_user_group_to_perm = relationship('UserGroupUserGroupToPerm ', primaryjoin="UserGroupUserGroupToPerm.target_user_group_id==UserGroup.users_group_id", cascade='all')
user_group_user_group_to_perm = relationship('UserGroupUserGroupToPerm', primaryjoin="UserGroupUserGroupToPerm.target_user_group_id==UserGroup.users_group_id", cascade='all')
user_group_review_rules = relationship('RepoReviewRuleUserGroup', cascade='all')
user = relationship('User', primaryjoin="User.user_id==UserGroup.user_id")

2
rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py
View file

@ -1035,7 +1035,7 @@ class UserGroup(Base, BaseModel):
users_group_repo_to_perm = relationship('UserGroupRepoToPerm', cascade='all')
users_group_repo_group_to_perm = relationship('UserGroupRepoGroupToPerm', cascade='all')
user_user_group_to_perm = relationship('UserUserGroupToPerm', cascade='all')
user_group_user_group_to_perm = relationship('UserGroupUserGroupToPerm ', primaryjoin="UserGroupUserGroupToPerm.target_user_group_id==UserGroup.users_group_id", cascade='all')
user_group_user_group_to_perm = relationship('UserGroupUserGroupToPerm', primaryjoin="UserGroupUserGroupToPerm.target_user_group_id==UserGroup.users_group_id", cascade='all')
user = relationship('User')

2
rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py
View file

@ -1036,7 +1036,7 @@ class UserGroup(Base, BaseModel):
users_group_repo_to_perm = relationship('UserGroupRepoToPerm', cascade='all')
users_group_repo_group_to_perm = relationship('UserGroupRepoGroupToPerm', cascade='all')
user_user_group_to_perm = relationship('UserUserGroupToPerm', cascade='all')
user_group_user_group_to_perm = relationship('UserGroupUserGroupToPerm ', primaryjoin="UserGroupUserGroupToPerm.target_user_group_id==UserGroup.users_group_id", cascade='all')
user_group_user_group_to_perm = relationship('UserGroupUserGroupToPerm', primaryjoin="UserGroupUserGroupToPerm.target_user_group_id==UserGroup.users_group_id", cascade='all')
user = relationship('User')

2
rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py
View file

@ -1035,7 +1035,7 @@ class UserGroup(Base, BaseModel):
users_group_repo_to_perm = relationship('UserGroupRepoToPerm', cascade='all')
users_group_repo_group_to_perm = relationship('UserGroupRepoGroupToPerm', cascade='all')
user_user_group_to_perm = relationship('UserUserGroupToPerm', cascade='all')
user_group_user_group_to_perm = relationship('UserGroupUserGroupToPerm ', primaryjoin="UserGroupUserGroupToPerm.target_user_group_id==UserGroup.users_group_id", cascade='all')
user_group_user_group_to_perm = relationship('UserGroupUserGroupToPerm', primaryjoin="UserGroupUserGroupToPerm.target_user_group_id==UserGroup.users_group_id", cascade='all')
user = relationship('User')

2
rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py
View file

@ -1037,7 +1037,7 @@ class UserGroup(Base, BaseModel):
users_group_repo_to_perm = relationship('UserGroupRepoToPerm', cascade='all')
users_group_repo_group_to_perm = relationship('UserGroupRepoGroupToPerm', cascade='all')
user_user_group_to_perm = relationship('UserUserGroupToPerm', cascade='all')
user_group_user_group_to_perm = relationship('UserGroupUserGroupToPerm ', primaryjoin="UserGroupUserGroupToPerm.target_user_group_id==UserGroup.users_group_id", cascade='all')
user_group_user_group_to_perm = relationship('UserGroupUserGroupToPerm', primaryjoin="UserGroupUserGroupToPerm.target_user_group_id==UserGroup.users_group_id", cascade='all')
user = relationship('User')

2
rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py
View file

@ -1037,7 +1037,7 @@ class UserGroup(Base, BaseModel):
users_group_repo_to_perm = relationship('UserGroupRepoToPerm', cascade='all')
users_group_repo_group_to_perm = relationship('UserGroupRepoGroupToPerm', cascade='all')
user_user_group_to_perm = relationship('UserUserGroupToPerm', cascade='all')
user_group_user_group_to_perm = relationship('UserGroupUserGroupToPerm ', primaryjoin="UserGroupUserGroupToPerm.target_user_group_id==UserGroup.users_group_id", cascade='all')
user_group_user_group_to_perm = relationship('UserGroupUserGroupToPerm', primaryjoin="UserGroupUserGroupToPerm.target_user_group_id==UserGroup.users_group_id", cascade='all')
user = relationship('User')

2
rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py
View file

@ -1080,7 +1080,7 @@ class UserGroup(Base, BaseModel):
users_group_repo_to_perm = relationship('UserGroupRepoToPerm', cascade='all')
users_group_repo_group_to_perm = relationship('UserGroupRepoGroupToPerm', cascade='all')
user_user_group_to_perm = relationship('UserUserGroupToPerm', cascade='all')
user_group_user_group_to_perm = relationship('UserGroupUserGroupToPerm ', primaryjoin="UserGroupUserGroupToPerm.target_user_group_id==UserGroup.users_group_id", cascade='all')
user_group_user_group_to_perm = relationship('UserGroupUserGroupToPerm', primaryjoin="UserGroupUserGroupToPerm.target_user_group_id==UserGroup.users_group_id", cascade='all')
user = relationship('User')

2
rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py
View file

@ -1081,7 +1081,7 @@ class UserGroup(Base, BaseModel):
users_group_repo_to_perm = relationship('UserGroupRepoToPerm', cascade='all')
users_group_repo_group_to_perm = relationship('UserGroupRepoGroupToPerm', cascade='all')
user_user_group_to_perm = relationship('UserUserGroupToPerm', cascade='all')
user_group_user_group_to_perm = relationship('UserGroupUserGroupToPerm ', primaryjoin="UserGroupUserGroupToPerm.target_user_group_id==UserGroup.users_group_id", cascade='all')
user_group_user_group_to_perm = relationship('UserGroupUserGroupToPerm', primaryjoin="UserGroupUserGroupToPerm.target_user_group_id==UserGroup.users_group_id", cascade='all')
user = relationship('User')

2
rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py
View file

@ -1242,7 +1242,7 @@ class UserGroup(Base, BaseModel):
users_group_repo_to_perm = relationship('UserGroupRepoToPerm', cascade='all')
users_group_repo_group_to_perm = relationship('UserGroupRepoGroupToPerm', cascade='all')
user_user_group_to_perm = relationship('UserUserGroupToPerm', cascade='all')
user_group_user_group_to_perm = relationship('UserGroupUserGroupToPerm ', primaryjoin="UserGroupUserGroupToPerm.target_user_group_id==UserGroup.users_group_id", cascade='all')
user_group_user_group_to_perm = relationship('UserGroupUserGroupToPerm', primaryjoin="UserGroupUserGroupToPerm.target_user_group_id==UserGroup.users_group_id", cascade='all')
user = relationship('User', primaryjoin="User.user_id==UserGroup.user_id")

16
rhodecode/lib/dbmigrate/versions/008_version_1_5_0.py
View file

@ -35,7 +35,7 @@ def upgrade(migrate_engine):
username.create(table=tbl)
_Session = meta.Session()
## after adding that column fix all usernames
# after adding that column fix all usernames
users_log = _Session.query(db_1_5_0.UserLog)\
.options(joinedload(db_1_5_0.UserLog.user))\
.options(joinedload(db_1_5_0.UserLog.repository)).all()
@ -45,7 +45,7 @@ def upgrade(migrate_engine):
_Session.add(entry)
_Session.commit()
#alter username to not null
# alter username to not null
tbl_name = db_1_5_0.UserLog.__tablename__
tbl = Table(tbl_name,
MetaData(bind=migrate_engine), autoload=True,
@ -74,19 +74,18 @@ def get_by_name(cls, key):
def fixups(models, _SESSION):
# ** create default permissions ** #
#=====================================
for p in models.Permission.PERMS:
if not get_by_key(models.Permission, p[0]):
new_perm = models.Permission()
new_perm.permission_name = p[0]
new_perm.permission_longname = p[0] #translation err with p[1]
new_perm.permission_longname = p[0] # translation err with p[1]
print('Creating new permission %s' % p[0])
_SESSION().add(new_perm)
_SESSION().commit()
# ** populate default permissions ** #
#=====================================
user = models.User.query().filter(models.User.username == 'default').scalar()
@ -100,9 +99,10 @@ def fixups(models, _SESSION):
return '.'.join(perm_name.split('.')[:1])
perms = models.UserToPerm.query().filter(models.UserToPerm.user == user).all()
defined_perms_groups = map(
_get_group, (x.permission.permission_name for x in perms))
log.debug('GOT ALREADY DEFINED:%s', perms)
defined_perms_groups = list(map(
_get_group, (x.permission.permission_name for x in perms)))
perms_show = [p.__dict__ for p in perms]
log.debug('GOT ALREADY DEFINED:%s', perms_show)
DEFAULT_PERMS = models.Permission.DEFAULT_USER_PERMISSIONS
# for every default permission that needs to be created, we check if

11
rhodecode/lib/dbmigrate/versions/012_version_1_7_0.py
View file

@ -70,14 +70,18 @@ def downgrade(migrate_engine):
meta.bind = migrate_engine
def get_by_key(cls, key):
return cls.query().filter(cls.permission_name == key).scalar()
def fixups(models, _SESSION):
# ** create default permissions ** #
#=====================================
for p in models.Permission.PERMS:
if not models.Permission.get_by_key(p[0]):
if not get_by_key(models.Permission, p[0]):
new_perm = models.Permission()
new_perm.permission_name = p[0]
new_perm.permission_longname = p[0] #translation err with p[1]
new_perm.permission_longname = p[0] # translation err with p[1]
_SESSION().add(new_perm)
_SESSION().commit()
@ -97,8 +101,7 @@ def fixups(models, _SESSION):
return '.'.join(perm_name.split('.')[:1])
perms = models.UserToPerm.query().filter(models.UserToPerm.user == user).all()
defined_perms_groups = map(_get_group,
(x.permission.permission_name for x in perms))
defined_perms_groups = list(map(_get_group, (x.permission.permission_name for x in perms)))
log.debug('GOT ALREADY DEFINED:%s', perms)
DEFAULT_PERMS = models.Permission.DEFAULT_USER_PERMISSIONS

7
rhodecode/lib/dbmigrate/versions/048_version_3_8_0.py
View file

@ -10,6 +10,7 @@ from sqlalchemy.engine import reflection
from sqlalchemy.sql import text
from rhodecode.lib.dbmigrate.versions import _reset_base
from rhodecode.lib.hash_utils import sha1_safe
from rhodecode.lib.utils2 import safe_str
from rhodecode.model import meta, init_model_encryption
@ -69,11 +70,9 @@ def downgrade(migrate_engine):
def _generate_repo_name_hashes(models, op, session):
repositories = models.Repository.get_all()
for repository in repositories:
hash_ = hashlib.sha1(safe_str(repository.repo_name)).hexdigest()
hash_ = sha1_safe(repository.repo_name)
params = {'hash': hash_, 'id': repository.repo_id}
query = text(
'UPDATE repositories SET repo_name_hash = :hash'
' WHERE repo_id = :id').bindparams(**params)
query = text('UPDATE repositories SET repo_name_hash = :hash WHERE repo_id = :id').bindparams(**params)
op.execute(query)
session().commit()

8
rhodecode/lib/encrypt.py
View file

@ -117,15 +117,19 @@ class AESCipher(object):
def validate_and_decrypt_data(enc_data, enc_key, enc_strict_mode=False, safe=True):
enc_data = safe_str(enc_data)
if '$' not in enc_data:
# probably not encrypted values
return enc_data
parts = enc_data.split('$', 3)
if len(parts) != 3:
raise ValueError(f'Encrypted Data has invalid format, expected {KEY_FORMAT}, got {parts}')
raise ValueError(f'Encrypted Data has invalid format, expected {KEY_FORMAT}, got {parts}, org value: {enc_data}')
enc_type = parts[1]
enc_data_part = parts[2]
if parts[0] != 'enc':
# parts ok but without our header ?
# parts ok but without our header?
return enc_data
# at that stage we know it's our encryption