##// END OF EJS Templates
fix(caching): fixed problems with Cache query for users....
fix(caching): fixed problems with Cache query for users. The old way of querying caused the user get query to be always cached, and returning old results even in 2fa forms. The new limited query doesn't cache the user object resolving issues

File last commit:

r5095:aa627a5f default
r5365:ae8a165b default
Show More
types.py
194 lines | 5.8 KiB | text/x-python | PythonLexer
copyrights: updated for 2023
r5088 # Copyright (C) 2016-2023 RhodeCode GmbH
gists: use colander schema to validate input data....
r523 #
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License, version 3
# (only), as published by the Free Software Foundation.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
# This program is dual-licensed. If you wish to learn more about the
# RhodeCode Enterprise Edition, including its added features, Support services,
# and proprietary license terms, please see https://rhodecode.com/licenses/
repo-schemas: refactor repository schemas and use it in API update/create functions....
r1153 import re
gists: use colander schema to validate input data....
r523 import colander
dan
py3: remove usage of basestring
r3425
repo-schemas: refactor repository schemas and use it in API update/create functions....
r1153 from rhodecode.model.validation_schema import preparers
from rhodecode.model.db import User, UserGroup
class _RootLocation(object):
pass
RootLocation = _RootLocation()
def _normalize(seperator, path):
if not path:
return ''
elif path is colander.null:
return colander.null
parts = path.split(seperator)
gists: use colander schema to validate input data....
r523
repo-schemas: refactor repository schemas and use it in API update/create functions....
r1153 def bad_parts(value):
if not value:
return False
if re.match(r'^[.]+$', value):
return False
return True
def slugify(value):
value = preparers.slugify_preparer(value)
value = re.sub(r'[.]{2,}', '.', value)
return value
clean_parts = [slugify(item) for item in parts if item]
path = filter(bad_parts, clean_parts)
return seperator.join(path)
class RepoNameType(colander.String):
SEPARATOR = '/'
def deserialize(self, node, cstruct):
modernize: updates for python3
r5095 result = super().deserialize(node, cstruct)
repo-schemas: refactor repository schemas and use it in API update/create functions....
r1153 if cstruct is colander.null:
return colander.null
return self._normalize(result)
def _normalize(self, path):
return _normalize(self.SEPARATOR, path)
dan
schemas: add user/usergroup schema type
r740
gists: use colander schema to validate input data....
r523
class GroupNameType(colander.String):
SEPARATOR = '/'
def deserialize(self, node, cstruct):
repo-schemas: refactor repository schemas and use it in API update/create functions....
r1153 if cstruct is RootLocation:
return cstruct
gists: use colander schema to validate input data....
r523
modernize: updates for python3
r5095 result = super().deserialize(node, cstruct)
repo-schemas: refactor repository schemas and use it in API update/create functions....
r1153 if cstruct is colander.null:
return colander.null
return self._normalize(result)
def _normalize(self, path):
return _normalize(self.SEPARATOR, path)
dan
schemas: add user/usergroup schema type
r740
validation-schema: added StringBoolean type and IPAddr validator.
r1149 class StringBooleanType(colander.String):
true_values = ['true', 't', 'yes', 'y', 'on', '1']
false_values = ['false', 'f', 'no', 'n', 'off', '0']
def serialize(self, node, appstruct):
if appstruct is colander.null:
return colander.null
if not isinstance(appstruct, bool):
raise colander.Invalid(node, '%r is not a boolean' % appstruct)
return appstruct and 'true' or 'false'
def deserialize(self, node, cstruct):
if cstruct is colander.null:
return colander.null
if isinstance(cstruct, bool):
return cstruct
py3: remove use of pyramid.compat
r4908 if not isinstance(cstruct, str):
validation-schema: added StringBoolean type and IPAddr validator.
r1149 raise colander.Invalid(node, '%r is not a string' % cstruct)
value = cstruct.lower()
if value in self.true_values:
return True
elif value in self.false_values:
return False
else:
raise colander.Invalid(
modernize: updates for python3
r5095 node, f'{value} value cannot be translated to bool')
validation-schema: added StringBoolean type and IPAddr validator.
r1149
dan
schemas: add user/usergroup schema type
r740 class UserOrUserGroupType(colander.SchemaType):
""" colander Schema type for valid rhodecode user and/or usergroup """
scopes = ('user', 'usergroup')
def __init__(self):
self.users = 'user' in self.scopes
self.usergroups = 'usergroup' in self.scopes
def serialize(self, node, appstruct):
if appstruct is colander.null:
return colander.null
if self.users:
if isinstance(appstruct, User):
if self.usergroups:
return 'user:%s' % appstruct.username
return appstruct.username
if self.usergroups:
if isinstance(appstruct, UserGroup):
if self.users:
return 'usergroup:%s' % appstruct.users_group_name
return appstruct.users_group_name
raise colander.Invalid(
modernize: updates for python3
r5095 node, '{} is not a valid {}'.format(appstruct, ' or '.join(self.scopes)))
dan
schemas: add user/usergroup schema type
r740
def deserialize(self, node, cstruct):
if cstruct is colander.null:
return colander.null
user, usergroup = None, None
if self.users:
if cstruct.startswith('user:'):
user = User.get_by_username(cstruct.split(':')[1])
else:
user = User.get_by_username(cstruct)
if self.usergroups:
if cstruct.startswith('usergroup:'):
usergroup = UserGroup.get_by_group_name(cstruct.split(':')[1])
else:
usergroup = UserGroup.get_by_group_name(cstruct)
if self.users and self.usergroups:
if user and usergroup:
raise colander.Invalid(node, (
'%s is both a user and usergroup, specify which '
'one was wanted by prepending user: or usergroup: to the '
'name') % cstruct)
if self.users and user:
return user
if self.usergroups and usergroup:
return usergroup
raise colander.Invalid(
modernize: updates for python3
r5095 node, '{} is not a valid {}'.format(cstruct, ' or '.join(self.scopes)))
dan
schemas: add user/usergroup schema type
r740
class UserType(UserOrUserGroupType):
scopes = ('user',)
class UserGroupType(UserOrUserGroupType):
scopes = ('usergroup',)
comments: add comments type into comments.
r1324
class StrOrIntType(colander.String):
def deserialize(self, node, cstruct):
py3: remove use of pyramid.compat
r4908 if isinstance(cstruct, str):
modernize: updates for python3
r5095 return super().deserialize(node, cstruct)
comments: add comments type into comments.
r1324 else:
return colander.Integer().deserialize(node, cstruct)