Changeset - 221d6a002601
Parent rev.
Child rev.
[Not reviewed]
default
0 4 0
Mads Kiilerich - 10 years ago 2015-06-09 22:53:24
madski@unity3d.com
repos: cleanup of stuff related to clone_uri
4 files changed with 7 insertions and 26 deletions:
kallithea/model/validators.py
3
3
kallithea/templates/admin/repos/repo_add_base.html
1
20
kallithea/templates/admin/repos/repo_edit_settings.html
1
1
kallithea/tests/functional/test_admin_repos.py
2
2
0 comments (0 inline, 0 general)
kallithea/model/validators.py
➞
Show inline comments
 
@@ -450,51 +450,51 @@ def ValidCloneUri():
 
                MercurialRepository._check_url(url, ui)
 
            elif url.startswith('svn+http'):
 
                from hgsubversion.svnrepo import svnremoterepo
 
                svnremoterepo(ui, url).svn.uuid
 
            elif url.startswith('git+http'):
 
                raise NotImplementedError()
 
            else:
 
                raise Exception('clone from URI %s not allowed' % (url,))
 

			




	
	
	
		
 
        elif repo_type == 'git':

			




	
	
	
		
 
            from kallithea.lib.vcs.backends.git.repository import GitRepository

			




	
	
	
		
 
            if url.startswith('http'):

			




	
	
	
		
 
                # initially check if it's at least the proper URL

			




	
	
	
		
 
                # or does it pass basic auth

			




	
	
	
		
 
                GitRepository._check_url(url)

			




	
	
	
		
 
            elif url.startswith('svn+http'):

			




	
	
	
		
 
                raise NotImplementedError()

			




	
	
	
		
 
            elif url.startswith('hg+http'):

			




	
	
	
		
 
                raise NotImplementedError()

			




	
	
	
		
 
            else:

			




	
	
	
		
 
                raise Exception('clone from URI %s not allowed' % (url))

			




	
	
	
		
 

			




	
	
	
		
 
    class _validator(formencode.validators.FancyValidator):

			




	
	
	
		
 
        messages = {

			




	
	
	
		
 
            'clone_uri': _(u'invalid clone URL'),

			




	
	
	
		
 
            'invalid_clone_uri': _(u'Invalid clone URL, provide a '

			




	
	
	
		
 
                                    'valid clone http(s)/svn+http(s)/ssh URL')

			




	
	
	
		
 
            'clone_uri': _(u'Invalid repository URL'),

			




	
	
	
		
 
            'invalid_clone_uri': _(u'Invalid repository URL. It must be a '

			




	
	
	
		
 
                                    'valid http, https, ssh, svn+http or svn+https URL'),

			




	
	
	
		
 
        }

			




	
	
	
		
 

			




	
	
	
		
 
        def validate_python(self, value, state):

			




	
	
	
		
 
            repo_type = value.get('repo_type')

			




	
	
	
		
 
            url = value.get('clone_uri')

			




	
	
	
		
 

			




	
	
	
		
 
            if not url:

			




	
	
	
		
 
                pass

			




	
	
	
		
 
            else:

			




	
	
	
		
 
                try:

			




	
	
	
		
 
                    url_handler(repo_type, url, make_ui('db', clear_session=False))

			




	
	
	
		
 
                except Exception:

			




	
	
	
		
 
                    log.exception('URL validation failed')

			




	
	
	
		
 
                    msg = M(self, 'clone_uri')

			




	
	
	
		
 
                    raise formencode.Invalid(msg, value, state,

			




	
	
	
		
 
                        error_dict=dict(clone_uri=msg)

			




	
	
	
		
 
                    )

			




	
	
	
		
 
    return _validator

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
def ValidForkType(old_data={}):

			




	
	
	
		
 
    class _validator(formencode.validators.FancyValidator):

			




	
	
	
		
 
        messages = {

			




	
	
	
		
 
            'invalid_fork_type': _(u'Fork has to be the same type as parent')

			




        

    


    
    

    

        

                

                    kallithea/templates/admin/repos/repo_add_base.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
	
		
 
## -*- coding: utf-8 -*-

			




	
	
	
		
 

			




	
	
	
		
 
${h.form(url('repos'))}

			




	
	
	
		
 
<div class="form">

			




	
	
	
		
 
    <!-- fields -->

			




	
	
	
		
 
    <div class="fields">

			




	
	
	
		
 
        <div class="field">

			




	
	
	
		
 
            <div class="label">

			




	
	
	
		
 
                <label for="repo_name">${_('Name')}:</label>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
            <div class="input">

			




	
	
	
		
 
                ${h.text('repo_name',class_="small")}

			




	
	
	
		
 
                <div style="margin: 6px 0px 0px 0px">

			




	
	
	
		
 
                    <a id="remote_clone_toggle" href="#">

			




	
	
	
		
 
                        <i class="icon-download-cloud"></i>

			




	
	
	
		
 
                        ${_('Import existing repository ?')}

			




	
	
	
		
 
                    </a>

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
                %if not c.authuser.is_admin:

			




	
	
	
		
 
                    ${h.hidden('user_created',True)}

			




	
	
	
		
 
                %endif

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
         </div>

			




	
	
	
		
 
        <div id="remote_clone" class="field" style="display: none">

			




	
	
	
		
 
        <div id="remote_clone" class="field">

			




	
	
	
		
 
            <div class="label">

			




	
	
	
		
 
                <label for="clone_uri">${_('Clone from')}:</label>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
            <div class="input">

			




	
	
	
		
 
                ${h.text('clone_uri',class_="small")}

			




	
	
	
		
 
                <span class="help-block">

			




	
	
	
		
 
                    ${_('Optional URL from which repository should be cloned.')}

			




	
	
	
		
 
                </span>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
        <div class="field">

			




	
	
	
		
 
            <div class="label label-textarea">

			




	
	
	
		
 
                <label for="repo_description">${_('Description')}:</label>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
            <div class="textarea-repo editor">

			




	
	
	
		
 
                ${h.textarea('repo_description')}

			




	
	
	
		
 
                <span class="help-block">${_('Keep it short and to the point. Use a README file for longer descriptions.')}</span>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
        <div class="field">

			




	
	
	
		
 
             <div class="label">

			




	
	
	
		
 
                 <label for="repo_group">${_('Repository group')}:</label>

			




	
	
	
		
 
             </div>

			




	
	
	
		
 
             <div class="input">

			




	
	
		
 
@@ -81,53 +72,43 @@ ${h.form(url('repos'))}

			




	
	
	
		
 
            <div class="label label-checkbox">

			




	
	
	
		
 
                <label for="repo_private">${_('Private repository')}:</label>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
            <div class="checkboxes">

			




	
	
	
		
 
                ${h.checkbox('repo_private',value="True")}

			




	
	
	
		
 
                <span class="help-block">${_('Private repositories are only visible to people explicitly added as collaborators.')}</span>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
        <div class="buttons">

			




	
	
	
		
 
          ${h.submit('add',_('Add'),class_="btn")}

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
</div>

			




	
	
	
		
 
<script>

			




	
	
	
		
 
    $(document).ready(function(){

			




	
	
	
		
 
        var setCopyPermsOption = function(group_val){

			




	
	
	
		
 
            if(group_val != "-1"){

			




	
	
	
		
 
                $('#copy_perms').show();

			




	
	
	
		
 
            }

			




	
	
	
		
 
            else{

			




	
	
	
		
 
                $('#copy_perms').hide();

			




	
	
	
		
 
            }

			




	
	
	
		
 
        }

			




	
	
	
		
 

			




	
	
	
		
 
        $('#remote_clone_toggle').on('click', function(e){

			




	
	
	
		
 
            $('#remote_clone').show();

			




	
	
	
		
 
            e.preventDefault();

			




	
	
	
		
 
        });

			




	
	
	
		
 
        if($('#remote_clone input').hasClass('error')){

			




	
	
	
		
 
            $('#remote_clone').show();

			




	
	
	
		
 
        }

			




	
	
	
		
 
        if($('#remote_clone input').val()){

			




	
	
	
		
 
            $('#remote_clone').show();

			




	
	
	
		
 
        }

			




	
	
	
		
 
        $("#repo_group").select2({

			




	
	
	
		
 
            'dropdownAutoWidth': true

			




	
	
	
		
 
        });

			




	
	
	
		
 

			




	
	
	
		
 
        setCopyPermsOption($('#repo_group').val());

			




	
	
	
		
 
        $("#repo_group").on("change", function(e) {

			




	
	
	
		
 
            setCopyPermsOption(e.val);

			




	
	
	
		
 
        });

			




	
	
	
		
 

			




	
	
	
		
 
        $("#repo_type").select2({

			




	
	
	
		
 
            'minimumResultsForSearch': -1

			




	
	
	
		
 
        });

			




	
	
	
		
 
        $("#repo_landing_rev").select2({

			




	
	
	
		
 
            'minimumResultsForSearch': -1

			




	
	
	
		
 
        });

			




	
	
	
		
 
        $('#repo_name').focus();

			




	
	
	
		
 
    });

			




	
	
	
		
 
</script>

			




	
	
	
		
 
${h.end_form()}

			




        

    


    
    

    

        

                

                    kallithea/templates/admin/repos/repo_edit_settings.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -6,49 +6,49 @@ ${h.form(url('repo', repo_name=c.repo_in

			




	
	
	
		
 
                <div class="label">

			




	
	
	
		
 
                    <label for="repo_name">${_('Name')}:</label>

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
                <div class="input">

			




	
	
	
		
 
                    ${h.text('repo_name',class_="medium")}

			




	
	
	
		
 
                    <span class="help-block">${_('Permanent Repository ID')}: `_${c.repo_info.repo_id}` <span><a id="show_more_clone_id" href="#">${_('What is that?')}</a></span></span>

			




	
	
	
		
 
                    <span id="clone_id" class="help-block" style="display: none">

			




	
	
	
		
 
                        ${_('URL by id')}: `${c.repo_info.clone_url(with_id=True)}` </br>

			




	
	
	
		
 
                        ${_('''In case this repository is renamed or moved into another group the repository URL changes.

			




	
	
	
		
 
                               Using the above permanent URL guarantees that this repository always will be accessible on that URL.

			




	
	
	
		
 
                               This is useful for CI systems, or any other cases that you need to hardcode the URL into a 3rd party service.''')}</span>

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
            <div class="field">

			




	
	
	
		
 
                <div class="label">

			




	
	
	
		
 
                    <label for="clone_uri">${_('Clone URL')}:</label>

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
                <div class="input">

			




	
	
	
		
 
                  %if c.repo_info.clone_uri:

			




	
	
	
		
 
                    <div id="clone_uri_hidden" style="font-size: 14px">

			




	
	
	
		
 
                        <span id="clone_uri_hidden_value">${c.repo_info.clone_uri_hidden}</span>

			




	
	
	
		
 
                        <span style="cursor: pointer; padding: 0px 0px 5px 0px" id="edit_clone_uri"><i class="icon-edit"></i>${_('Edit')}</span>

			




	
	
	
		
 
                    </div>

			




	
	
	
		
 
                    <div id="alter_clone_uri" style="display: none">

			




	
	
	
		
 
                        ${h.text('clone_uri',class_="medium",  placeholder=_('new value'))}

			




	
	
	
		
 
                        ${h.text('clone_uri',class_="medium", placeholder=_('New URL'))}

			




	
	
	
		
 
                    </div>

			




	
	
	
		
 
                  %else:

			




	
	
	
		
 
                    ## not set yet, display form to set it

			




	
	
	
		
 
                    ${h.text('clone_uri',class_="medium")}

			




	
	
	
		
 
                    ${h.hidden('clone_uri_change', 'NEW')}

			




	
	
	
		
 
                  %endif

			




	
	
	
		
 
                  <span id="alter_clone_uri_help_block" class="help-block">

			




	
	
	
		
 
                      ${_('URL used for doing remote pulls.')}

			




	
	
	
		
 
                  </span>

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
            <div class="field">

			




	
	
	
		
 
                <div class="label">

			




	
	
	
		
 
                    <label for="repo_group">${_('Repository group')}:</label>

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
                <div class="input">

			




	
	
	
		
 
                    ${h.select('repo_group','',c.repo_groups,class_="medium")}

			




	
	
	
		
 
                    <span class="help-block">${_('Optionally select a group to put this repository into.')}</span>

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
            <div class="field">

			




	
	
	
		
 
                <div class="label">

			




	
	
	
		
 
                    <label for="repo_landing_rev">${_('Landing revision')}:</label>

			




	
	
	
		
 
                </div>

			




        

    


    
    

    

        

                

                    kallithea/tests/functional/test_admin_repos.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -327,63 +327,63 @@ class _BaseTest(object):

			




	
	
	
		
 
        inherited_perms = UserRepoToPerm.query()\

			




	
	
	
		
 
            .filter(UserRepoToPerm.repository_id == new_repo_id).all()

			




	
	
	
		
 
        self.assertEqual(len(inherited_perms), 2)

			




	
	
	
		
 

			




	
	
	
		
 
        self.assertTrue(TEST_USER_REGULAR_LOGIN in [x.user.username

			




	
	
	
		
 
                                                    for x in inherited_perms])

			




	
	
	
		
 
        self.assertTrue('repository.write' in [x.permission.permission_name

			




	
	
	
		
 
                                               for x in inherited_perms])

			




	
	
	
		
 

			




	
	
	
		
 
        RepoModel().delete(repo_name_full)

			




	
	
	
		
 
        RepoGroupModel().delete(group_name)

			




	
	
	
		
 
        Session().commit()

			




	
	
	
		
 

			




	
	
	
		
 
    def test_create_remote_repo_wrong_clone_uri(self):

			




	
	
	
		
 
        self.log_user()

			




	
	
	
		
 
        repo_name = self.NEW_REPO

			




	
	
	
		
 
        description = 'description for newly created repo'

			




	
	
	
		
 
        response = self.app.post(url('repos'),

			




	
	
	
		
 
                        fixture._get_repo_create_params(repo_private=False,

			




	
	
	
		
 
                                                repo_name=repo_name,

			




	
	
	
		
 
                                                repo_type=self.REPO_TYPE,

			




	
	
	
		
 
                                                repo_description=description,

			




	
	
	
		
 
                                                clone_uri='http://127.0.0.1/repo',

			




	
	
	
		
 
                                                _authentication_token=self.authentication_token()))

			




	
	
	
		
 
        response.mustcontain('invalid clone URL')

			




	
	
	
		
 
        response.mustcontain('Invalid repository URL')

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
    def test_create_remote_repo_wrong_clone_uri_hg_svn(self):

			




	
	
	
		
 
        self.log_user()

			




	
	
	
		
 
        repo_name = self.NEW_REPO

			




	
	
	
		
 
        description = 'description for newly created repo'

			




	
	
	
		
 
        response = self.app.post(url('repos'),

			




	
	
	
		
 
                        fixture._get_repo_create_params(repo_private=False,

			




	
	
	
		
 
                                                repo_name=repo_name,

			




	
	
	
		
 
                                                repo_type=self.REPO_TYPE,

			




	
	
	
		
 
                                                repo_description=description,

			




	
	
	
		
 
                                                clone_uri='svn+http://127.0.0.1/repo',

			




	
	
	
		
 
                                                _authentication_token=self.authentication_token()))

			




	
	
	
		
 
        response.mustcontain('invalid clone URL')

			




	
	
	
		
 
        response.mustcontain('Invalid repository URL')

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
    def test_delete(self):

			




	
	
	
		
 
        self.log_user()

			




	
	
	
		
 
        repo_name = 'vcs_test_new_to_delete_%s' % self.REPO_TYPE

			




	
	
	
		
 
        description = 'description for newly created repo'

			




	
	
	
		
 
        response = self.app.post(url('repos'),

			




	
	
	
		
 
                        fixture._get_repo_create_params(repo_private=False,

			




	
	
	
		
 
                                                repo_type=self.REPO_TYPE,

			




	
	
	
		
 
                                                repo_name=repo_name,

			




	
	
	
		
 
                                                repo_description=description,

			




	
	
	
		
 
                                                _authentication_token=self.authentication_token()))

			




	
	
	
		
 
        ## run the check page that triggers the flash message

			




	
	
	
		
 
        response = self.app.get(url('repo_check_home', repo_name=repo_name))

			




	
	
	
		
 
        self.checkSessionFlash(response,

			




	
	
	
		
 
                               'Created repository <a href="/%s">%s</a>'

			




	
	
	
		
 
                               % (repo_name, repo_name))

			




	
	
	
		
 
        # test if the repo was created in the database

			




	
	
	
		
 
        new_repo = Session().query(Repository)\

			




	
	
	
		
 
            .filter(Repository.repo_name == repo_name).one()

			




	
	
	
		
 

			




	
	
	
		
 
        self.assertEqual(new_repo.repo_name, repo_name)

			




	
	
	
		
 
        self.assertEqual(new_repo.description, description)

			




	
	
	
		
 

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        
    
    
        This site is powered by
            Kallithea 0.7.0,
        which is
        © 2010–2025 by various authors & licensed under GPLv3.