kallithea Changeset - d83f41634d06

Changeset - d83f41634d06

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Mads Kiilerich - 6 years ago 2019-07-16 12:30:15
mads@kiilerich.com

clone_url: introduce {system_user} and {hostname} variables that will be used for SSH clone URL

2 files changed with 12 insertions and 1 deletions:

kallithea/lib/utils2.py

kallithea/templates/admin/settings/settings_visual.html

0 comments (0 inline, 0 general)

kallithea/lib/utils2.py

➞

Show inline comments

@@ @@ -27,24 +27,25 @@ Original author and date, and relevant c @@
 :license: GPLv3, see LICENSE.md for more details.
 """
 import os
 import re
 import sys
 import time
 import uuid
 import datetime
 import urllib
 import binascii
 import pwd
 import webob
 import urlobject
 from webhelpers.text import collapse, remove_formatting, strip_tags
 from tg.i18n import ugettext as _, ungettext
 from kallithea.lib.vcs.utils.lazy import LazyProperty
 from kallithea.lib.compat import json
 def str2bool(_str):
     """
@@ @@ -405,31 +406,37 @@ def credentials_filter(uri): @@
     uri = uri_filter(uri)
     # check if we have port
     if len(uri) > 2 and uri[2]:
         uri[2] = ':' + uri[2]
     return ''.join(uri)
 def get_clone_url(clone_uri_tmpl, prefix_url, repo_name, repo_id, username=None):
     parsed_url = urlobject.URLObject(prefix_url)
     prefix = safe_unicode(urllib.unquote(parsed_url.path.rstrip('/')))
     try:
         system_user = pwd.getpwuid(os.getuid()).pw_name
     except Exception: # TODO: support all systems - especially Windows
         system_user = 'kallithea' # hardcoded default value ...
     args = {
         'scheme': parsed_url.scheme,
         'user': safe_unicode(urllib.quote(safe_str(username or ''))),
         'netloc': parsed_url.netloc + prefix,  # like "hostname:port/prefix" (with optional ":port" and "/prefix")
         'prefix': prefix, # undocumented, empty or starting with /
         'repo': repo_name,
         'repoid': str(repo_id),
         'system_user': safe_unicode(system_user),
         'hostname': parsed_url.hostname,
+    }
     url = re.sub('{([^{}]+)}', lambda m: args.get(m.group(1), m.group(0)), clone_uri_tmpl)
     # remove leading @ sign if it's present. Case of empty user
     url_obj = urlobject.URLObject(url)
     if not url_obj.username:
         url_obj = url_obj.with_username(None)
     return safe_unicode(url_obj)
 def get_changeset_safe(repo, rev):

kallithea/templates/admin/settings/settings_visual.html

➞

Show inline comments

@@ @@ -37,25 +37,29 @@ ${h.form(url('admin_settings_visual'), m @@
             </div>
             <div class="form-group">
                 <label class="control-label">${_('Clone URL')}:</label>
                 <div>
                     ${h.text('clone_uri_tmpl', size=80, class_='form-control')}
                     <span class="help-block">${_('''Schema of clone URL construction eg. '{scheme}://{user}@{netloc}/{repo}'.
                                                     The following variables are available:
                                                     {scheme} 'http' or 'https' sent from running Kallithea server,
                                                     {user}   current user username,
                                                     {netloc} network location/server host of running Kallithea server,
                                                     {repo}   full repository name,
                                                     {repoid} ID of repository, can be used to construct clone-by-id''')}</span>
                                                     {repoid} ID of repository, can be used to construct clone-by-id,
                                                     {system_user}  name of the Kallithea system user,
                                                     {hostname}  server hostname
                                                     ''')}
                     </span>
                 </div>
             </div>
             <div class="form-group">
                 <label class="control-label" for="dashboard_items">${_('Repository page size')}:</label>
                 <div>
                     ${h.text('dashboard_items',size=5,class_='form-control')}
                     <span class="help-block">${_('Number of items displayed in the repository pages before pagination is shown.')}</span>
                 </div>
             </div>
             <div class="form-group">

0 comments (0 inline, 0 general)