repo-schema: added a custom schema for repo settings.

- deform ready
- using new uri validators
- added proper widgets to handle deform

rhodecode/apps/repository/views/repo_settings.py

@@ -1,178 +1,179 b''
 # -*- coding: utf-8 -*-
 
 # Copyright (C) 2011-2017 RhodeCode GmbH
 #
 # 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/
 
 import logging
 
 import deform
 from pyramid.httpexceptions import HTTPFound
 from pyramid.view import view_config
 
 from rhodecode.apps._base import RepoAppView
 from rhodecode.forms import RcForm
 from rhodecode.lib import helpers as h
 from rhodecode.lib import audit_logger
 from rhodecode.lib.auth import (
     LoginRequired, HasRepoPermissionAnyDecorator,
     HasRepoPermissionAllDecorator, CSRFRequired)
 from rhodecode.model.db import RepositoryField, RepoGroup
 from rhodecode.model.meta import Session
 from rhodecode.model.repo import RepoModel
 from rhodecode.model.scm import RepoGroupList, ScmModel
 from rhodecode.model.validation_schema.schemas import repo_schema
 
 log = logging.getLogger(__name__)
 
 
 class RepoSettingsView(RepoAppView):
 
     def load_default_context(self):
         c = self._get_local_tmpl_context()
 
         # TODO(marcink): remove repo_info and use c.rhodecode_db_repo instead
         c.repo_info = self.db_repo
 
         acl_groups = RepoGroupList(
             RepoGroup.query().all(),
             perm_set=['group.write', 'group.admin'])
         c.repo_groups = RepoGroup.groups_choices(groups=acl_groups)
         c.repo_groups_choices = map(lambda k: k[0], c.repo_groups)
 
         # in case someone no longer have a group.write access to a repository
         # pre fill the list with this entry, we don't care if this is the same
         # but it will allow saving repo data properly.
         repo_group = self.db_repo.group
         if repo_group and repo_group.group_id not in c.repo_groups_choices:
             c.repo_groups_choices.append(repo_group.group_id)
             c.repo_groups.append(RepoGroup._generate_choice(repo_group))
 
         if c.repository_requirements_missing or self.rhodecode_vcs_repo is None:
             # we might be in missing requirement state, so we load things
             # without touching scm_instance()
             c.landing_revs_choices, c.landing_revs = \
                 ScmModel().get_repo_landing_revs()
         else:
             c.landing_revs_choices, c.landing_revs = \
                 ScmModel().get_repo_landing_revs(self.db_repo)
 
         c.personal_repo_group = c.auth_user.personal_repo_group
         c.repo_fields = RepositoryField.query()\
             .filter(RepositoryField.repository == self.db_repo).all()
 
         self._register_global_c(c)
         return c
 
     def _get_schema(self, c, old_values=None):
         return repo_schema.RepoSettingsSchema().bind(
+            repo_type=self.db_repo.repo_type,
             repo_type_options=[self.db_repo.repo_type],
             repo_ref_options=c.landing_revs_choices,
             repo_ref_items=c.landing_revs,
             repo_repo_group_options=c.repo_groups_choices,
             repo_repo_group_items=c.repo_groups,
             # user caller
             user=self._rhodecode_user,
             old_values=old_values
         )
 
     @LoginRequired()
     @HasRepoPermissionAnyDecorator('repository.admin')
     @view_config(
         route_name='edit_repo', request_method='GET',
         renderer='rhodecode:templates/admin/repos/repo_edit.mako')
     def edit_settings(self):
         c = self.load_default_context()
         c.active = 'settings'
 
         defaults = RepoModel()._get_defaults(self.db_repo_name)
         defaults['repo_owner'] = defaults['user']
         defaults['repo_landing_commit_ref'] = defaults['repo_landing_rev']
 
         schema = self._get_schema(c)
         c.form = RcForm(schema, appstruct=defaults)
         return self._get_template_context(c)
 
     @LoginRequired()
     @HasRepoPermissionAllDecorator('repository.admin')
     @CSRFRequired()
     @view_config(
         route_name='edit_repo', request_method='POST',
         renderer='rhodecode:templates/admin/repos/repo_edit.mako')
     def edit_settings_update(self):
         _ = self.request.translate
         c = self.load_default_context()
         c.active = 'settings'
         old_repo_name = self.db_repo_name
 
         old_values = self.db_repo.get_api_data()
         schema = self._get_schema(c, old_values=old_values)
 
         c.form = RcForm(schema)
         pstruct = self.request.POST.items()
         pstruct.append(('repo_type', self.db_repo.repo_type))
         try:
             schema_data = c.form.validate(pstruct)
         except deform.ValidationFailure as err_form:
             return self._get_template_context(c)
 
         # data is now VALID, proceed with updates
         # save validated data back into the updates dict
         validated_updates = dict(
             repo_name=schema_data['repo_group']['repo_name_without_group'],
             repo_group=schema_data['repo_group']['repo_group_id'],
 
             user=schema_data['repo_owner'],
             repo_description=schema_data['repo_description'],
             repo_private=schema_data['repo_private'],
             clone_uri=schema_data['repo_clone_uri'],
             repo_landing_rev=schema_data['repo_landing_commit_ref'],
             repo_enable_statistics=schema_data['repo_enable_statistics'],
             repo_enable_locking=schema_data['repo_enable_locking'],
             repo_enable_downloads=schema_data['repo_enable_downloads'],
         )
         # detect if CLONE URI changed, if we get OLD means we keep old values
         if schema_data['repo_clone_uri_change'] == 'OLD':
             validated_updates['clone_uri'] = self.db_repo.clone_uri
 
         # use the new full name for redirect
         new_repo_name = schema_data['repo_group']['repo_name_with_group']
 
         # save extra fields into our validated data
         for key, value in pstruct:
             if key.startswith(RepositoryField.PREFIX):
                 validated_updates[key] = value
 
         try:
             RepoModel().update(self.db_repo, **validated_updates)
             ScmModel().mark_for_invalidation(new_repo_name)
 
             audit_logger.store(
                 'repo.edit', action_data={'old_data': old_values},
                 user=self._rhodecode_user, repo=self.db_repo)
 
             Session().commit()
 
             h.flash(_('Repository {} updated successfully').format(
                 old_repo_name), category='success')
         except Exception:
             log.exception("Exception during update of repository")
             h.flash(_('Error occurred during update of repository {}').format(
                 old_repo_name), category='error')
 
         raise HTTPFound(
             self.request.route_path('edit_repo', repo_name=new_repo_name))

rhodecode/model/validation_schema/schemas/repo_schema.py

@@ -1,360 +1,414 b''
 # -*- coding: utf-8 -*-
 
 # Copyright (C) 2016-2017 RhodeCode GmbH
 #
 # 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/
 
 import colander
 import deform.widget
 
 from rhodecode.translation import _
 from rhodecode.model.validation_schema.utils import convert_to_optgroup
 from rhodecode.model.validation_schema import validators, preparers, types
 
 DEFAULT_LANDING_REF = 'rev:tip'
 
 
 def get_group_and_repo(repo_name):
     from rhodecode.model.repo_group import RepoGroupModel
     return RepoGroupModel()._get_group_name_and_parent(
         repo_name, get_object=True)
 
 
 def get_repo_group(repo_group_id):
     from rhodecode.model.repo_group import RepoGroup
     return RepoGroup.get(repo_group_id), RepoGroup.CHOICES_SEPARATOR
 
 
 @colander.deferred
 def deferred_repo_type_validator(node, kw):
     options = kw.get('repo_type_options', [])
     return colander.OneOf([x for x in options])
 
 
 @colander.deferred
 def deferred_repo_owner_validator(node, kw):
 
     def repo_owner_validator(node, value):
         from rhodecode.model.db import User
         existing = User.get_by_username(value)
         if not existing:
             msg = _(u'Repo owner with id `{}` does not exists').format(value)
             raise colander.Invalid(node, msg)
 
     return repo_owner_validator
 
 
 @colander.deferred
 def deferred_landing_ref_validator(node, kw):
     options = kw.get(
         'repo_ref_options', [DEFAULT_LANDING_REF])
     return colander.OneOf([x for x in options])
 
 
 @colander.deferred
+def deferred_clone_uri_validator(node, kw):
+    repo_type = kw.get('repo_type')
+    validator = validators.CloneUriValidator(repo_type)
+    return validator
+
+
[e-mail]
 def deferred_landing_ref_widget(node, kw):
     items = kw.get(
         'repo_ref_items', [(DEFAULT_LANDING_REF, DEFAULT_LANDING_REF)])
     items = convert_to_optgroup(items)
     return deform.widget.Select2Widget(values=items)
 
 
 @colander.deferred
 def deferred_fork_of_validator(node, kw):
     old_values = kw.get('old_values') or {}
 
     def fork_of_validator(node, value):
         from rhodecode.model.db import Repository, RepoGroup
         existing = Repository.get_by_repo_name(value)
         if not existing:
             msg = _(u'Fork with id `{}` does not exists').format(value)
             raise colander.Invalid(node, msg)
         elif old_values['repo_name'] == existing.repo_name:
             msg = _(u'Cannot set fork of '
                     u'parameter of this repository to itself').format(value)
             raise colander.Invalid(node, msg)
 
     return fork_of_validator
 
 
 @colander.deferred
 def deferred_can_write_to_group_validator(node, kw):
     request_user = kw.get('user')
     old_values = kw.get('old_values') or {}
 
     def can_write_to_group_validator(node, value):
         """
         Checks if given repo path is writable by user. This includes checks if
         user is allowed to create repositories under root path or under
         repo group paths
         """
 
         from rhodecode.lib.auth import (
             HasPermissionAny, HasRepoGroupPermissionAny)
         from rhodecode.model.repo_group import RepoGroupModel
 
         messages = {
             'invalid_repo_group':
                 _(u"Repository group `{}` does not exist"),
             # permissions denied we expose as not existing, to prevent
             # resource discovery
             'permission_denied':
                 _(u"Repository group `{}` does not exist"),
             'permission_denied_root':
                 _(u"You do not have the permission to store "
                   u"repositories in the root location.")
         }
 
         value = value['repo_group_name']
 
         is_root_location = value is types.RootLocation
         # NOT initialized validators, we must call them
         can_create_repos_at_root = HasPermissionAny(
             'hg.admin', 'hg.create.repository')
 
         # if values is root location, we simply need to check if we can write
         # to root location !
         if is_root_location:
             if can_create_repos_at_root(user=request_user):
                 # we can create repo group inside tool-level. No more checks
                 # are required
                 return
             else:
                 # "fake" node name as repo_name, otherwise we oddly report
                 # the error as if it was coming form repo_group
                 # however repo_group is empty when using root location.
                 node.name = 'repo_name'
                 raise colander.Invalid(node, messages['permission_denied_root'])
 
         # parent group not exists ? throw an error
         repo_group = RepoGroupModel().get_by_group_name(value)
         if value and not repo_group:
             raise colander.Invalid(
                 node, messages['invalid_repo_group'].format(value))
 
         gr_name = repo_group.group_name
 
         # create repositories with write permission on group is set to true
         create_on_write = HasPermissionAny(
             'hg.create.write_on_repogroup.true')(user=request_user)
 
         group_admin = HasRepoGroupPermissionAny('group.admin')(
             gr_name, 'can write into group validator', user=request_user)
         group_write = HasRepoGroupPermissionAny('group.write')(
             gr_name, 'can write into group validator', user=request_user)
 
         forbidden = not (group_admin or (group_write and create_on_write))
 
         # TODO: handling of old values, and detecting no-change in path
         # to skip permission checks in such cases. This only needs to be
         # implemented if we use this schema in forms as well
 
         # gid = (old_data['repo_group'].get('group_id')
         #        if (old_data and 'repo_group' in old_data) else None)
         # value_changed = gid != safe_int(value)
         # new = not old_data
 
         # do check if we changed the value, there's a case that someone got
         # revoked write permissions to a repository, he still created, we
         # don't need to check permission if he didn't change the value of
         # groups in form box
         # if value_changed or new:
         #     # parent group need to be existing
         # TODO: ENDS HERE
 
         if repo_group and forbidden:
             msg = messages['permission_denied'].format(value)
             raise colander.Invalid(node, msg)
 
     return can_write_to_group_validator
 
 
 @colander.deferred
 def deferred_unique_name_validator(node, kw):
     request_user = kw.get('user')
     old_values = kw.get('old_values') or {}
 
     def unique_name_validator(node, value):
         from rhodecode.model.db import Repository, RepoGroup
         name_changed = value != old_values.get('repo_name')
 
         existing = Repository.get_by_repo_name(value)
         if name_changed and existing:
             msg = _(u'Repository with name `{}` already exists').format(value)
             raise colander.Invalid(node, msg)
 
         existing_group = RepoGroup.get_by_group_name(value)
         if name_changed and existing_group:
             msg = _(u'Repository group with name `{}` already exists').format(
                 value)
             raise colander.Invalid(node, msg)
     return unique_name_validator
 
 
 @colander.deferred
 def deferred_repo_name_validator(node, kw):
     def no_git_suffix_validator(node, value):
         if value.endswith('.git'):
             msg = _('Repository name cannot end with .git')
             raise colander.Invalid(node, msg)
     return colander.All(
         no_git_suffix_validator, validators.valid_name_validator)
 
 
 @colander.deferred
 def deferred_repo_group_validator(node, kw):
     options = kw.get(
         'repo_repo_group_options')
     return colander.OneOf([x for x in options])
 
 
 @colander.deferred
 def deferred_repo_group_widget(node, kw):
     items = kw.get('repo_repo_group_items')
     return deform.widget.Select2Widget(values=items)
 
 
 class GroupType(colander.Mapping):
     def _validate(self, node, value):
         try:
             return dict(repo_group_name=value)
         except Exception as e:
             raise colander.Invalid(
                 node, '"${val}" is not a mapping type: ${err}'.format(
                     val=value, err=e))
 
     def deserialize(self, node, cstruct):
         if cstruct is colander.null:
             return cstruct
 
         appstruct = super(GroupType, self).deserialize(node, cstruct)
         validated_name = appstruct['repo_group_name']
 
         # inject group based on once deserialized data
         (repo_name_without_group,
          parent_group_name,
          parent_group) = get_group_and_repo(validated_name)
 
         appstruct['repo_name_with_group'] = validated_name
         appstruct['repo_name_without_group'] = repo_name_without_group
         appstruct['repo_group_name'] = parent_group_name or types.RootLocation
 
         if parent_group:
             appstruct['repo_group_id'] = parent_group.group_id
 
         return appstruct
 
 
 class GroupSchema(colander.SchemaNode):
     schema_type = GroupType
     validator = deferred_can_write_to_group_validator
     missing = colander.null
 
 
 class RepoGroup(GroupSchema):
     repo_group_name = colander.SchemaNode(
         types.GroupNameType())
     repo_group_id = colander.SchemaNode(
         colander.String(), missing=None)
     repo_name_without_group = colander.SchemaNode(
         colander.String(), missing=None)
 
 
 class RepoGroupAccessSchema(colander.MappingSchema):
     repo_group = RepoGroup()
 
 
 class RepoNameUniqueSchema(colander.MappingSchema):
     unique_repo_name = colander.SchemaNode(
         colander.String(),
         validator=deferred_unique_name_validator)
 
 
 class RepoSchema(colander.MappingSchema):
 
     repo_name = colander.SchemaNode(
         types.RepoNameType(),
         validator=deferred_repo_name_validator)
 
     repo_type = colander.SchemaNode(
         colander.String(),
         validator=deferred_repo_type_validator)
 
     repo_owner = colander.SchemaNode(
         colander.String(),
         validator=deferred_repo_owner_validator,
         widget=deform.widget.TextInputWidget())
 
     repo_description = colander.SchemaNode(
         colander.String(), missing='',
         widget=deform.widget.TextAreaWidget())
 
     repo_landing_commit_ref = colander.SchemaNode(
         colander.String(),
         validator=deferred_landing_ref_validator,
         preparers=[preparers.strip_preparer],
         missing=DEFAULT_LANDING_REF,
         widget=deferred_landing_ref_widget)
 
     repo_clone_uri = colander.SchemaNode(
         colander.String(),
         validator=colander.All(colander.Length(min=1)),
         preparers=[preparers.strip_preparer],
         missing='')
 
     repo_fork_of = colander.SchemaNode(
         colander.String(),
         validator=deferred_fork_of_validator,
         missing=None)
 
     repo_private = colander.SchemaNode(
         types.StringBooleanType(),
         missing=False, widget=deform.widget.CheckboxWidget())
     repo_copy_permissions = colander.SchemaNode(
         types.StringBooleanType(),
         missing=False, widget=deform.widget.CheckboxWidget())
     repo_enable_statistics = colander.SchemaNode(
         types.StringBooleanType(),
         missing=False, widget=deform.widget.CheckboxWidget())
     repo_enable_downloads = colander.SchemaNode(
         types.StringBooleanType(),
         missing=False, widget=deform.widget.CheckboxWidget())
     repo_enable_locking = colander.SchemaNode(
         types.StringBooleanType(),
         missing=False, widget=deform.widget.CheckboxWidget())
 
     def deserialize(self, cstruct):
         """
         Custom deserialize that allows to chain validation, and verify
         permissions, and as last step uniqueness
         """
 
         # first pass, to validate given data
         appstruct = super(RepoSchema, self).deserialize(cstruct)
         validated_name = appstruct['repo_name']
 
         # second pass to validate permissions to repo_group
         second = RepoGroupAccessSchema().bind(**self.bindings)
         appstruct_second = second.deserialize({'repo_group': validated_name})
         # save result
         appstruct['repo_group'] = appstruct_second['repo_group']
 
         # thirds to validate uniqueness
         third = RepoNameUniqueSchema().bind(**self.bindings)
         third.deserialize({'unique_repo_name': validated_name})
 
         return appstruct
+
+
+class RepoSettingsSchema(RepoSchema):
+    repo_group = colander.SchemaNode(
+        colander.Integer(),
+        validator=deferred_repo_group_validator,
+        widget=deferred_repo_group_widget,
+        missing='')
+
+    repo_clone_uri_change = colander.SchemaNode(
+        colander.String(),
+        missing='NEW')
+
+    repo_clone_uri = colander.SchemaNode(
+        colander.String(),
+        preparers=[preparers.strip_preparer],
+        validator=deferred_clone_uri_validator,
+        missing='')
+
+    def deserialize(self, cstruct):
+        """
+        Custom deserialize that allows to chain validation, and verify
+        permissions, and as last step uniqueness
+        """
+
+        # first pass, to validate given data
+        appstruct = super(RepoSchema, self).deserialize(cstruct)
+        validated_name = appstruct['repo_name']
+        # because of repoSchema adds repo-group as an ID, we inject it as
+        # full name here because validators require it, it's unwrapped later
+        # so it's safe to use and final name is going to be without group anyway
+
+        group, separator = get_repo_group(appstruct['repo_group'])
+        if group:
+            validated_name = separator.join([group.group_name, validated_name])
+
+        # second pass to validate permissions to repo_group
+        second = RepoGroupAccessSchema().bind(**self.bindings)
+        appstruct_second = second.deserialize({'repo_group': validated_name})
+        # save result
+        appstruct['repo_group'] = appstruct_second['repo_group']
+
+        # thirds to validate uniqueness
+        third = RepoNameUniqueSchema().bind(**self.bindings)
+        third.deserialize({'unique_repo_name': validated_name})
+
+        return appstruct

rhodecode/model/validation_schema/validators.py

@@ -1,48 +1,140 b''
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2011-2017 RhodeCode GmbH
+#
+# 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/
+
 import os
 import re
+import logging
+
 
 import ipaddress
 import colander
 
 from rhodecode.translation import _
 from rhodecode.lib.utils2 import glob2re
 
+log = logging.getLogger(__name__)
+
 
 def ip_addr_validator(node, value):
     try:
         # this raises an ValueError if address is not IpV4 or IpV6
         ipaddress.ip_network(value, strict=False)
     except ValueError:
         msg = _(u'Please enter a valid IPv4 or IpV6 address')
         raise colander.Invalid(node, msg)
 
 
 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
             ipaddress.ip_network(value, strict=self.strict)
         except ValueError:
             msg = _(u'Please enter a valid IPv4 or IpV6 address')
             raise colander.Invalid(node, msg)
 
 
 def glob_validator(node, value):
     try:
         re.compile('^' + glob2re(value) + '$')
     except Exception:
         msg = _(u'Invalid glob pattern')
         raise colander.Invalid(node, msg)
 
 
 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)
+
+
+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
+
+            MercurialRepository.check_url(url, config)
+        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
+            GitRepository.check_url(url, config)
+        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
+
+
+class CloneUriValidator(object):
+    def __init__(self, repo_type):
+        self.repo_type = repo_type
+
+    def __call__(self, node, value):
+        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)
+            msg = _(u'Invalid clone url, provide a valid clone '
+                    u'url starting with one of {allowed_prefixes}').format(
+                allowed_prefixes=e.allowed_prefixes)
+            raise colander.Invalid(node, msg)
+        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)

rhodecode/templates/admin/repos/repo_edit_settings.mako

@@ -1,249 +1,260 b''
 ## -*- coding: utf-8 -*-
 <%namespace name="base" file="/base/base.mako"/>
 
 <div class="panel panel-default">
     <div class="panel-heading">
         <h3 class="panel-title">${_('Settings for Repository: %s') % c.rhodecode_db_repo.repo_name}</h3>
     </div>
     <div class="panel-body">
     ${h.secure_form(h.route_path('edit_repo', repo_name=c.rhodecode_db_repo.repo_name), method='POST')}
     <div class="form">
         <!-- fields -->
         <div class="fields">
 
             <div class="field">
                 <div class="label">
                     <label for="repo_name">${_('Name')}:</label>
                 </div>
                 <div class="input">
                     ${c.form['repo_name'].render(css_class='medium', oid='repo_name')|n}
                     ${c.form.render_error(request, c.form['repo_name'])|n}
 
                     <p class="help-block">${_('Non-changeable id')}: `_${c.rhodecode_db_repo.repo_id}` <span><a href="#" onclick="$('#clone_id').toggle();return false">${_('what is that ?')}</a></span></p>
                     <p id="clone_id" style="display:none;">
                         ${_('URL by id')}: `${c.rhodecode_db_repo.clone_url(with_id=True)}` <br/>
                         ${_('''In case this repository is renamed or moved into another group the repository url changes.
                                Using above url guarantees that this repository will always be accessible under such url.
                                Useful for CI systems, or any other cases that you need to hardcode the url into 3rd party service.''')}</p>
                 </div>
            </div>
 
            <div class="field">
                 <div class="label">
                     <label for="repo_group">${_('Repository group')}:</label>
                 </div>
                 <div class="select">
                     ${c.form['repo_group'].render(css_class='medium', oid='repo_group')|n}
                     ${c.form.render_error(request, c.form['repo_group'])|n}
 
                     % if c.personal_repo_group:
                          <a class="btn" href="#" data-personal-group-name="${c.personal_repo_group.group_name}" data-personal-group-id="${c.personal_repo_group.group_id}" onclick="selectMyGroup(this); return false">
                              ${_('Select my personal group (`%(repo_group_name)s`)') % {'repo_group_name': c.personal_repo_group.group_name}}
                          </a>
                     % endif
                     <p class="help-block">${_('Optional select a group to put this repository into.')}</p>
                 </div>
            </div>
 
            % if c.rhodecode_db_repo.repo_type != 'svn':
            <div class="field">
                <div class="label">
                    <label for="clone_uri">${_('Remote uri')}:</label>
                </div>
                <div class="input">
                    %if c.rhodecode_db_repo.clone_uri:
-                    ## display
+                    ## display, if we don't have any errors
+                    % if not c.form['repo_clone_uri'].error:
                     <div id="clone_uri_hidden" class='text-as-placeholder'>
                         <span id="clone_uri_hidden_value">${c.rhodecode_db_repo.clone_uri_hidden}</span>
                         <span class="link" id="edit_clone_uri"><i class="icon-edit"></i>${_('edit')}</span>
                     </div>
+                    % endif
+
                     ## alter field
-                    <div id="alter_clone_uri" style="display: none">
+                    <div id="alter_clone_uri" style="${'' if c.form['repo_clone_uri'].error else 'display: none'}">
                         ${c.form['repo_clone_uri'].render(css_class='medium', oid='clone_uri', placeholder=_('enter new value, or leave empty to remove'))|n}
                         ${c.form.render_error(request, c.form['repo_clone_uri'])|n}
+                        % if c.form['repo_clone_uri'].error:
+                            ## we got error from form subit, means we modify the url
+                            ${h.hidden('repo_clone_uri_change', 'MOD')}
+                        % else:
                         ${h.hidden('repo_clone_uri_change', 'OLD')}
+                        % endif
 
+                        % if not c.form['repo_clone_uri'].error:
                         <span class="link" id="cancel_edit_clone_uri">${_('cancel')}</span>
+                        % endif
+
                     </div>
                    %else:
                     ## not set yet, display form to set it
                     ${c.form['repo_clone_uri'].render(css_class='medium', oid='clone_uri')|n}
                     ${c.form.render_error(request, c.form['repo_clone_uri'])|n}
                     ${h.hidden('repo_clone_uri_change', 'NEW')}
                    %endif
                  <p id="alter_clone_uri_help_block" class="help-block">
                      <% pull_link = h.literal(h.link_to('remote sync', h.url('edit_repo_remote', repo_name=c.repo_name))) %>
                      ${_('http[s] url where from repository was imported, this field can used for doing {pull_link}.').format(pull_link=pull_link)|n} <br/>
                      ${_('This field is stored encrypted inside Database, a format of http://user:[e-mail]/repo_name can be used and will be hidden from display.')}
                  </p>
                </div>
             </div>
            % else:
            ${h.hidden('repo_clone_uri', '')}
            % endif
 
             <div class="field">
                 <div class="label">
                     <label for="repo_landing_commit_ref">${_('Landing commit')}:</label>
                 </div>
                 <div class="select">
                     ${c.form['repo_landing_commit_ref'].render(css_class='medium', oid='repo_landing_commit_ref')|n}
                     ${c.form.render_error(request, c.form['repo_landing_commit_ref'])|n}
                     <p class="help-block">${_('Default commit for files page, downloads, full text search index and readme')}</p>
                 </div>
             </div>
 
             <div class="field badged-field">
                 <div class="label">
                     <label for="repo_owner">${_('Owner')}:</label>
                 </div>
                 <div class="input">
                     <div class="badge-input-container">
                         <div class="user-badge">
                             ${base.gravatar_with_user(c.rhodecode_db_repo.user.email, show_disabled=not c.rhodecode_db_repo.user.active)}
                         </div>
                         <div class="badge-input-wrap">
                             ${c.form['repo_owner'].render(css_class='medium', oid='repo_owner')|n}
                         </div>
                     </div>
                     ${c.form.render_error(request, c.form['repo_owner'])|n}
                     <p class="help-block">${_('Change owner of this repository.')}</p>
                 </div>
             </div>
 
             <div class="field">
                 <div class="label label-textarea">
                     <label for="repo_description">${_('Description')}:</label>
                 </div>
                 <div class="textarea text-area editor">
                     ${c.form['repo_description'].render(css_class='medium', oid='repo_description')|n}
                     ${c.form.render_error(request, c.form['repo_description'])|n}
                     <p class="help-block">${_('Keep it short and to the point. Use a README file for longer descriptions.')}</p>
                 </div>
             </div>
 
             <div class="field">
                 <div class="label label-checkbox">
                     <label for="${c.form['repo_private'].oid}">${_('Private repository')}:</label>
                 </div>
                 <div class="checkboxes">
                     ${c.form['repo_private'].render(css_class='medium')|n}
                     ${c.form.render_error(request, c.form['repo_private'])|n}
                     <span class="help-block">${_('Private repositories are only visible to people explicitly added as collaborators.')}</span>
                 </div>
             </div>
             <div class="field">
                 <div class="label label-checkbox">
                     <label for="${c.form['repo_enable_statistics'].oid}">${_('Enable statistics')}:</label>
                 </div>
                 <div class="checkboxes">
                     ${c.form['repo_enable_statistics'].render(css_class='medium')|n}
                     ${c.form.render_error(request, c.form['repo_enable_statistics'])|n}
                     <span class="help-block">${_('Enable statistics window on summary page.')}</span>
                 </div>
             </div>
             <div class="field">
                 <div class="label label-checkbox">
                     <label for="${c.form['repo_enable_downloads'].oid}">${_('Enable downloads')}:</label>
                 </div>
                 <div class="checkboxes">
                     ${c.form['repo_enable_downloads'].render(css_class='medium')|n}
                     ${c.form.render_error(request, c.form['repo_enable_downloads'])|n}
                     <span class="help-block">${_('Enable download menu on summary page.')}</span>
                 </div>
             </div>
             <div class="field">
                 <div class="label label-checkbox">
                     <label for="${c.form['repo_enable_locking'].oid}">${_('Enable automatic locking')}:</label>
                 </div>
                 <div class="checkboxes">
                     ${c.form['repo_enable_locking'].render(css_class='medium')|n}
                     ${c.form.render_error(request, c.form['repo_enable_locking'])|n}
                     <span class="help-block">${_('Enable automatic locking on repository. Pulling from this repository creates a lock that can be released by pushing back by the same user')}</span>
                 </div>
             </div>
 
             %if c.visual.repository_fields:
               ## EXTRA FIELDS
               %for field in c.repo_fields:
                 <div class="field">
                     <div class="label">
                         <label for="${field.field_key_prefixed}">${field.field_label} (${field.field_key}):</label>
                     </div>
                     <div class="input input-medium">
                         ${h.text(field.field_key_prefixed, field.field_value, class_='medium')}
                         %if field.field_desc:
                           <span class="help-block">${field.field_desc}</span>
                         %endif
                     </div>
                  </div>
               %endfor
             %endif
             <div class="buttons">
               ${h.submit('save',_('Save'),class_="btn")}
               ${h.reset('reset',_('Reset'),class_="btn")}
             </div>
         </div>
     </div>
     ${h.end_form()}
   </div>
 </div>
 
 <script>
     $(document).ready(function(){
         var cloneUrl = function() {
           var alterButton = $('#alter_clone_uri');
           var editButton = $('#edit_clone_uri');
           var cancelEditButton = $('#cancel_edit_clone_uri');
           var hiddenUrl = $('#clone_uri_hidden');
           var hiddenUrlValue = $('#clone_uri_hidden_value');
           var input = $('#clone_uri');
           var helpBlock = $('#alter_clone_uri_help_block');
           var changedFlag = $('#repo_clone_uri_change');
           var originalText = helpBlock.html();
           var obfuscatedUrl = hiddenUrlValue.html();
 
           var edit = function(e) {
             alterButton.show();
             editButton.hide();
             hiddenUrl.hide();
 
             //add the old value next to input for verification
             helpBlock.html("(" + obfuscatedUrl + ")" + "<br\>" + originalText);
             changedFlag.val('MOD');
           };
 
           var cancelEdit = function(e) {
             alterButton.hide();
             editButton.show();
             hiddenUrl.show();
 
             helpBlock.html(originalText);
             changedFlag.val('OLD');
             input.val('');
           };
 
           var initEvents = function() {
             editButton.on('click', edit);
             cancelEditButton.on('click', cancelEdit);
           };
 
           var setInitialState = function() {
             if (input.hasClass('error')) {
               alterButton.show();
               editButton.hide();
               hiddenUrl.hide();
             }
           };
 
           setInitialState();
           initEvents();
         }();
 
         selectMyGroup = function(element) {
             $("#repo_group").val($(element).data('personalGroupId')).trigger("change");
         };
 
         UsersAutoComplete('repo_owner', '${c.rhodecode_user.user_id}');
     });
 </script>