##// END OF EJS Templates
git: use force fetch and update for target ref. This solves a case...
git: use force fetch and update for target ref. This solves a case when in PRs a target is force updated and is out of sync. Before we used a pull which --ff-only fails obviosly because two are out of sync. This change uses new logic that resets the target branch according to the source target branch allowing smooth merge simulation.

File last commit:

r2781:ea7aa7e6 default
r2784:e8c62649 default
Show More
validators.py
152 lines | 5.2 KiB | text/x-python | PythonLexer
repo-schema: added a custom schema for repo settings....
r1719 # -*- coding: utf-8 -*-
release: update copyright year to 2018
r2487 # Copyright (C) 2011-2018 RhodeCode GmbH
repo-schema: added a custom schema for repo settings....
r1719 #
# 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/
gists: use colander schema to validate input data....
r523 import os
dan
reviewers: add repo review rule models and expose default...
r821 import re
repo-schema: added a custom schema for repo settings....
r1719 import logging
gists: use colander schema to validate input data....
r523
import ipaddress
import colander
from rhodecode.translation import _
dependencies: bumped pyramid-debugtoolbar to 4.3.1
r1907 from rhodecode.lib.utils2 import glob2re, safe_unicode
validators: added json validator.
r2400 from rhodecode.lib.ext_json import json
gists: use colander schema to validate input data....
r523
repo-schema: added a custom schema for repo settings....
r1719 log = logging.getLogger(__name__)
gists: use colander schema to validate input data....
r523
def ip_addr_validator(node, value):
try:
# this raises an ValueError if address is not IpV4 or IpV6
dependencies: bumped pyramid-debugtoolbar to 4.3.1
r1907 ipaddress.ip_network(safe_unicode(value), strict=False)
gists: use colander schema to validate input data....
r523 except ValueError:
msg = _(u'Please enter a valid IPv4 or IpV6 address')
raise colander.Invalid(node, msg)
dan
reviewers: add repo review rule models and expose default...
r821
validation-schema: added StringBoolean type and IPAddr validator.
r1149 class IpAddrValidator(object):
def __init__(self, strict=True):
self.strict = strict
def __call__(self, node, value):
try:
# this raises an ValueError if address is not IpV4 or IpV6
dependencies: bumped pyramid-debugtoolbar to 4.3.1
r1907 ipaddress.ip_network(safe_unicode(value), strict=self.strict)
validation-schema: added StringBoolean type and IPAddr validator.
r1149 except ValueError:
msg = _(u'Please enter a valid IPv4 or IpV6 address')
raise colander.Invalid(node, msg)
dan
reviewers: add repo review rule models and expose default...
r821 def glob_validator(node, value):
try:
re.compile('^' + glob2re(value) + '$')
except Exception:
msg = _(u'Invalid glob pattern')
raise colander.Invalid(node, msg)
repo-schemas: refactor repository schemas and use it in API update/create functions....
r1153
def valid_name_validator(node, value):
from rhodecode.model.validation_schema import types
if value is types.RootLocation:
return
msg = _('Name must start with a letter or number. Got `{}`').format(value)
if not re.match(r'^[a-zA-z0-9]{1,}', value):
raise colander.Invalid(node, msg)
repo-schema: added a custom schema for repo settings....
r1719
class InvalidCloneUrl(Exception):
allowed_prefixes = ()
def url_validator(url, repo_type, config):
from rhodecode.lib.vcs.backends.hg import MercurialRepository
from rhodecode.lib.vcs.backends.git import GitRepository
from rhodecode.lib.vcs.backends.svn import SubversionRepository
if repo_type == 'hg':
allowed_prefixes = ('http', 'svn+http', 'git+http')
if 'http' in url[:4]:
# initially check if it's at least the proper URL
# or does it pass basic auth
validators: fix problems with new mercurial url validation.
r2781 return MercurialRepository.check_url(url, config)
repo-schema: added a custom schema for repo settings....
r1719 elif 'svn+http' in url[:8]: # svn->hg import
SubversionRepository.check_url(url, config)
elif 'git+http' in url[:8]: # git->hg import
raise NotImplementedError()
else:
exc = InvalidCloneUrl('Clone from URI %s not allowed. '
'Allowed url must start with one of %s'
% (url, ','.join(allowed_prefixes)))
exc.allowed_prefixes = allowed_prefixes
raise exc
elif repo_type == 'git':
allowed_prefixes = ('http', 'svn+http', 'hg+http')
if 'http' in url[:4]:
# initially check if it's at least the proper URL
# or does it pass basic auth
validators: fix problems with new mercurial url validation.
r2781 return GitRepository.check_url(url, config)
repo-schema: added a custom schema for repo settings....
r1719 elif 'svn+http' in url[:8]: # svn->git import
raise NotImplementedError()
elif 'hg+http' in url[:8]: # hg->git import
raise NotImplementedError()
else:
exc = InvalidCloneUrl('Clone from URI %s not allowed. '
'Allowed url must start with one of %s'
% (url, ','.join(allowed_prefixes)))
exc.allowed_prefixes = allowed_prefixes
raise exc
api: security, fix problem when absolute paths are specified with API call, that would allow...
r2663 elif repo_type == 'svn':
# no validation for SVN yet
return
validators: fix problems with new mercurial url validation.
r2781 raise InvalidCloneUrl('Invalid repo type specified: `{}`'.format(repo_type))
repo-schema: added a custom schema for repo settings....
r1719
class CloneUriValidator(object):
def __init__(self, repo_type):
self.repo_type = repo_type
def __call__(self, node, value):
api: security, fix problem when absolute paths are specified with API call, that would allow...
r2663
repo-schema: added a custom schema for repo settings....
r1719 from rhodecode.lib.utils import make_db_config
try:
config = make_db_config(clear_session=False)
url_validator(value, self.repo_type, config)
except InvalidCloneUrl as e:
log.warning(e)
api: security, fix problem when absolute paths are specified with API call, that would allow...
r2663 raise colander.Invalid(node, e.message)
repo-schema: added a custom schema for repo settings....
r1719 except Exception:
log.exception('Url validation failed')
msg = _(u'invalid clone url for {repo_type} repository').format(
repo_type=self.repo_type)
raise colander.Invalid(node, msg)
validators: added json validator.
r2400
def json_validator(node, value):
try:
json.loads(value)
except (Exception,):
msg = _(u'Please enter a valid json object')
raise colander.Invalid(node, msg)