Changeset - 141066b8a89a
Parent rev.
Child rev.
[Not reviewed]
default
0 6 0
Mads Kiilerich (mads) - 6 years ago 2020-01-25 20:06:36
mads@kiilerich.com
Grafted from: de3c11c9e9a7
tests: minor doctest updates for py3
6 files changed with 32 insertions and 32 deletions:
kallithea/lib/inifile.py
1
1
kallithea/lib/markup_renderer.py
15
15
kallithea/lib/ssh.py
8
8
kallithea/lib/vcs/backends/git/ssh.py
4
4
kallithea/lib/vcs/backends/hg/ssh.py
3
3
kallithea/lib/vcs/utils/helpers.py
1
1
0 comments (0 inline, 0 general)
kallithea/lib/inifile.py
➞
Show inline comments
 
@@ -51,49 +51,49 @@ def expand(template, mako_variable_value
 
    >>> template = '''
 
    ... [first-section]
 
    ...
 
    ... variable=${mako_variable}
 
    ... variable2  =\tvalue after tab
 
    ... ## This section had some whitespace and stuff
 
    ...
 
    ...
 
    ... # ${mako_function()}
 
    ... [second-section]
 
    ... %if conditional_options == 'option-a':
 
    ... # option a was chosen
 
    ... %elif conditional_options == 'option-b':
 
    ... some_variable = "never mind - option-b will not be used anyway ..."
 
    ... %endif
 
    ... '''
 
    >>> selected_mako_conditionals = []
 
    >>> mako_variable_values = {'mako_variable': 'VALUE', 'mako_function': (lambda: 'FUNCTION RESULT'),
 
    ...                         'conditional_options': 'option-a'}
 
    >>> settings = { # only partially used
 
    ...     '[first-section]': {'variable2': 'VAL2', 'first_extra': 'EXTRA'},
 
    ...     '[third-section]': {'third_extra': ' 3'},
 
    ...     '[fourth-section]': {'fourth_extra': '4', 'fourth': '"four"'},
 
    ... }
 
    >>> print expand(template, mako_variable_values, settings)
 
    >>> print(expand(template, mako_variable_values, settings))
 
    <BLANKLINE>
 
    [first-section]
 
    <BLANKLINE>
 
    variable=VALUE
 
    #variable2  =    value after tab
 
    variable2 = VAL2
 
    <BLANKLINE>
 
    first_extra = EXTRA
 
    <BLANKLINE>
 
    <BLANKLINE>
 
    # FUNCTION RESULT
 
    [second-section]
 
    # option a was chosen
 
    <BLANKLINE>
 
    [fourth-section]
 
    fourth = "four"
 
    fourth_extra = 4
 
    <BLANKLINE>
 
    [third-section]
 
    third_extra =  3
 
    <BLANKLINE>
 
    """
 
    mako_variables = dict(default_variables)
 
    mako_variables.update(mako_variable_values or {})
kallithea/lib/markup_renderer.py
➞
Show inline comments
 
@@ -98,114 +98,114 @@ class MarkupRenderer(object):
 
        def newline_callback(matchobj):
 
            if len(matchobj.group(1)) == 1:
 
                return matchobj.group(0).rstrip() + '  \n'
 
            else:
 
                return matchobj.group(0)
 
        pattern = re.compile(r'^[\w\<][^\n]*(\n+)', re.MULTILINE)
 
        text = re.sub(pattern, newline_callback, text)
 

			




	
	
	
		
 
        # Insert pre block extractions.

			




	
	
	
		
 
        def pre_insert_callback(matchobj):

			




	
	
	
		
 
            return '\n\n' + extractions[matchobj.group(1)]

			




	
	
	
		
 
        text = re.sub(r'{gfm-extraction-([0-9a-f]{32})\}',

			




	
	
	
		
 
                      pre_insert_callback, text)

			




	
	
	
		
 

			




	
	
	
		
 
        return text

			




	
	
	
		
 

			




	
	
	
		
 
    @classmethod

			




	
	
	
		
 
    def render(cls, source, filename=None):

			




	
	
	
		
 
        """

			




	
	
	
		
 
        Renders a given filename using detected renderer

			




	
	
	
		
 
        it detects renderers based on file extension or mimetype.

			




	
	
	
		
 
        At last it will just do a simple html replacing new lines with <br/>

			




	
	
	
		
 

			




	
	
	
		
 
        >>> MarkupRenderer.render('''<img id="a" style="margin-top:-1000px;color:red" src="http://example.com/test.jpg">''', '.md')

			




	
	
	
		
 
        u'<p><img id="a" src="http://example.com/test.jpg" style="color: red;"></p>'

			




	
	
	
		
 
        '<p><img id="a" src="http://example.com/test.jpg" style="color: red;"></p>'

			




	
	
	
		
 
        >>> MarkupRenderer.render('''<img class="c d" src="file://localhost/test.jpg">''', 'b.mkd')

			




	
	
	
		
 
        u'<p><img class="c d"></p>'

			




	
	
	
		
 
        '<p><img class="c d"></p>'

			




	
	
	
		
 
        >>> MarkupRenderer.render('''<a href="foo">foo</a>''', 'c.mkdn')

			




	
	
	
		
 
        u'<p><a href="foo">foo</a></p>'

			




	
	
	
		
 
        '<p><a href="foo">foo</a></p>'

			




	
	
	
		
 
        >>> MarkupRenderer.render('''<script>alert(1)</script>''', 'd.mdown')

			




	
	
	
		
 
        u'&lt;script&gt;alert(1)&lt;/script&gt;'

			




	
	
	
		
 
        '&lt;script&gt;alert(1)&lt;/script&gt;'

			




	
	
	
		
 
        >>> MarkupRenderer.render('''<div onclick="alert(2)">yo</div>''', 'markdown')

			




	
	
	
		
 
        u'<div>yo</div>'

			




	
	
	
		
 
        '<div>yo</div>'

			




	
	
	
		
 
        >>> MarkupRenderer.render('''<a href="javascript:alert(3)">yo</a>''', 'md')

			




	
	
	
		
 
        u'<p><a>yo</a></p>'

			




	
	
	
		
 
        '<p><a>yo</a></p>'

			




	
	
	
		
 
        """

			




	
	
	
		
 

			




	
	
	
		
 
        renderer = cls._detect_renderer(source, filename)

			




	
	
	
		
 
        readme_data = renderer(source)

			




	
	
	
		
 
        # Allow most HTML, while preventing XSS issues:

			




	
	
	
		
 
        # no <script> tags, no onclick attributes, no javascript

			




	
	
	
		
 
        # "protocol", and also limit styling to prevent defacing.

			




	
	
	
		
 
        return bleach.clean(readme_data,

			




	
	
	
		
 
            tags=['a', 'abbr', 'b', 'blockquote', 'br', 'code', 'dd',

			




	
	
	
		
 
                  'div', 'dl', 'dt', 'em', 'h1', 'h2', 'h3', 'h4', 'h5',

			




	
	
	
		
 
                  'h6', 'hr', 'i', 'img', 'li', 'ol', 'p', 'pre', 'span',

			




	
	
	
		
 
                  'strong', 'sub', 'sup', 'table', 'tbody', 'td', 'th',

			




	
	
	
		
 
                  'thead', 'tr', 'ul'],

			




	
	
	
		
 
            attributes=['class', 'id', 'style', 'label', 'title', 'alt', 'href', 'src'],

			




	
	
	
		
 
            styles=['color'],

			




	
	
	
		
 
            protocols=['http', 'https', 'mailto'],

			




	
	
	
		
 
            )

			




	
	
	
		
 

			




	
	
	
		
 
    @classmethod

			




	
	
	
		
 
    def plain(cls, source, universal_newline=True):

			




	
	
	
		
 
        source = safe_str(source)

			




	
	
	
		
 
        if universal_newline:

			




	
	
	
		
 
            newline = '\n'

			




	
	
	
		
 
            source = newline.join(source.splitlines())

			




	
	
	
		
 

			




	
	
	
		
 
        def url_func(match_obj):

			




	
	
	
		
 
            url_full = match_obj.group(0)

			




	
	
	
		
 
            return '<a href="%(url)s">%(url)s</a>' % ({'url': url_full})

			




	
	
	
		
 
        source = url_re.sub(url_func, source)

			




	
	
	
		
 
        return '<br />' + source.replace("\n", '<br />')

			




	
	
	
		
 

			




	
	
	
		
 
    @classmethod

			




	
	
	
		
 
    def markdown(cls, source, safe=True, flavored=False):

			




	
	
	
		
 
        """

			




	
	
	
		
 
        Convert Markdown (possibly GitHub Flavored) to INSECURE HTML, possibly

			




	
	
	
		
 
        with "safe" fall-back to plaintext. Output from this method should be sanitized before use.

			




	
	
	
		
 

			




	
	
	
		
 
        >>> MarkupRenderer.markdown('''<img id="a" style="margin-top:-1000px;color:red" src="http://example.com/test.jpg">''')

			




	
	
	
		
 
        u'<p><img id="a" style="margin-top:-1000px;color:red" src="http://example.com/test.jpg"></p>'

			




	
	
	
		
 
        '<p><img id="a" style="margin-top:-1000px;color:red" src="http://example.com/test.jpg"></p>'

			




	
	
	
		
 
        >>> MarkupRenderer.markdown('''<img class="c d" src="file://localhost/test.jpg">''')

			




	
	
	
		
 
        u'<p><img class="c d" src="file://localhost/test.jpg"></p>'

			




	
	
	
		
 
        '<p><img class="c d" src="file://localhost/test.jpg"></p>'

			




	
	
	
		
 
        >>> MarkupRenderer.markdown('''<a href="foo">foo</a>''')

			




	
	
	
		
 
        u'<p><a href="foo">foo</a></p>'

			




	
	
	
		
 
        '<p><a href="foo">foo</a></p>'

			




	
	
	
		
 
        >>> MarkupRenderer.markdown('''<script>alert(1)</script>''')

			




	
	
	
		
 
        u'<script>alert(1)</script>'

			




	
	
	
		
 
        '<script>alert(1)</script>'

			




	
	
	
		
 
        >>> MarkupRenderer.markdown('''<div onclick="alert(2)">yo</div>''')

			




	
	
	
		
 
        u'<div onclick="alert(2)">yo</div>'

			




	
	
	
		
 
        '<div onclick="alert(2)">yo</div>'

			




	
	
	
		
 
        >>> MarkupRenderer.markdown('''<a href="javascript:alert(3)">yo</a>''')

			




	
	
	
		
 
        u'<p><a href="javascript:alert(3)">yo</a></p>'

			




	
	
	
		
 
        '<p><a href="javascript:alert(3)">yo</a></p>'

			




	
	
	
		
 
        >>> MarkupRenderer.markdown('''## Foo''')

			




	
	
	
		
 
        u'<h2>Foo</h2>'

			




	
	
	
		
 
        >>> print MarkupRenderer.markdown('''

			




	
	
	
		
 
        '<h2>Foo</h2>'

			




	
	
	
		
 
        >>> print(MarkupRenderer.markdown('''

			




	
	
	
		
 
        ...     #!/bin/bash

			




	
	
	
		
 
        ...     echo "hello"

			




	
	
	
		
 
        ... ''')

			




	
	
	
		
 
        ... '''))

			




	
	
	
		
 
        <table class="code-highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre>1

			




	
	
	
		
 
        2</pre></div></td><td class="code"><div class="code-highlight"><pre><span></span><span class="ch">#!/bin/bash</span>

			




	
	
	
		
 
        <span class="nb">echo</span> <span class="s2">&quot;hello&quot;</span>

			




	
	
	
		
 
        </pre></div>

			




	
	
	
		
 
        </td></tr></table>

			




	
	
	
		
 
        """

			




	
	
	
		
 
        source = safe_str(source)

			




	
	
	
		
 
        try:

			




	
	
	
		
 
            if flavored:

			




	
	
	
		
 
                source = cls._flavored_markdown(source)

			




	
	
	
		
 
            return markdown_mod.markdown(

			




	
	
	
		
 
                source,

			




	
	
	
		
 
                extensions=['markdown.extensions.codehilite', 'markdown.extensions.extra'],

			




	
	
	
		
 
                extension_configs={'markdown.extensions.codehilite': {'css_class': 'code-highlight'}})

			




	
	
	
		
 
        except Exception:

			




	
	
	
		
 
            log.error(traceback.format_exc())

			




	
	
	
		
 
            if safe:

			




	
	
	
		
 
                log.debug('Falling back to render in plain mode')

			




	
	
	
		
 
                return cls.plain(source)

			




	
	
	
		
 
            else:

			




	
	
	
		
 
                raise

			




	
	
	
		
 

			




	
	
	
		
 
    @classmethod

			




	
	
	
		
 
    def rst(cls, source, safe=True):

			




        

    


    
    

    

        

                

                    kallithea/lib/ssh.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -23,74 +23,74 @@

			




	
	
	
		
 

			




	
	
	
		
 
import base64

			




	
	
	
		
 
import logging

			




	
	
	
		
 
import re

			




	
	
	
		
 

			




	
	
	
		
 
from tg.i18n import ugettext as _

			




	
	
	
		
 

			




	
	
	
		
 
from kallithea.lib.utils2 import ascii_bytes, ascii_str

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
log = logging.getLogger(__name__)

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
class SshKeyParseError(Exception):

			




	
	
	
		
 
    """Exception raised by parse_pub_key"""

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
def parse_pub_key(ssh_key):

			




	
	
	
		
 
    r"""Parse SSH public key string, raise SshKeyParseError or return decoded keytype, data and comment

			




	
	
	
		
 

			




	
	
	
		
 
    >>> getfixture('doctest_mock_ugettext')

			




	
	
	
		
 
    >>> parse_pub_key('')

			




	
	
	
		
 
    Traceback (most recent call last):

			




	
	
	
		
 
    ...

			




	
	
	
		
 
    SshKeyParseError: SSH key is missing

			




	
	
	
		
 
    kallithea.lib.ssh.SshKeyParseError: SSH key is missing

			




	
	
	
		
 
    >>> parse_pub_key('''AAAAB3NzaC1yc2EAAAALVGhpcyBpcyBmYWtlIQ''')

			




	
	
	
		
 
    Traceback (most recent call last):

			




	
	
	
		
 
    ...

			




	
	
	
		
 
    SshKeyParseError: Incorrect SSH key - it must have both a key type and a base64 part, like 'ssh-rsa ASRNeaZu4FA...xlJp='

			




	
	
	
		
 
    kallithea.lib.ssh.SshKeyParseError: Incorrect SSH key - it must have both a key type and a base64 part, like 'ssh-rsa ASRNeaZu4FA...xlJp='

			




	
	
	
		
 
    >>> parse_pub_key('''abc AAAAB3NzaC1yc2EAAAALVGhpcyBpcyBmYWtlIQ''')

			




	
	
	
		
 
    Traceback (most recent call last):

			




	
	
	
		
 
    ...

			




	
	
	
		
 
    SshKeyParseError: Incorrect SSH key - it must start with 'ssh-(rsa|dss|ed25519)'

			




	
	
	
		
 
    kallithea.lib.ssh.SshKeyParseError: Incorrect SSH key - it must start with 'ssh-(rsa|dss|ed25519)'

			




	
	
	
		
 
    >>> parse_pub_key('''ssh-rsa  AAAAB3NzaC1yc2EAAAALVGhpcyBpcyBmYWtlIQ''')

			




	
	
	
		
 
    Traceback (most recent call last):

			




	
	
	
		
 
    ...

			




	
	
	
		
 
    SshKeyParseError: Incorrect SSH key - failed to decode base64 part 'AAAAB3NzaC1yc2EAAAALVGhpcyBpcyBmYWtlIQ'

			




	
	
	
		
 
    kallithea.lib.ssh.SshKeyParseError: Incorrect SSH key - failed to decode base64 part 'AAAAB3NzaC1yc2EAAAALVGhpcyBpcyBmYWtlIQ'

			




	
	
	
		
 
    >>> parse_pub_key('''ssh-rsa  AAAAB2NzaC1yc2EAAAALVGhpcyBpcyBmYWtlIQ==''')

			




	
	
	
		
 
    Traceback (most recent call last):

			




	
	
	
		
 
    ...

			




	
	
	
		
 
    SshKeyParseError: Incorrect SSH key - base64 part is not 'ssh-rsa' as claimed but 'csh-rsa'

			




	
	
	
		
 
    kallithea.lib.ssh.SshKeyParseError: Incorrect SSH key - base64 part is not 'ssh-rsa' as claimed but 'csh-rsa'

			




	
	
	
		
 
    >>> parse_pub_key('''ssh-rsa  AAAAB3NzaC1yc2EAAAA'LVGhpcyBpcyBmYWtlIQ''')

			




	
	
	
		
 
    Traceback (most recent call last):

			




	
	
	
		
 
    ...

			




	
	
	
		
 
    SshKeyParseError: Incorrect SSH key - unexpected characters in base64 part "AAAAB3NzaC1yc2EAAAA'LVGhpcyBpcyBmYWtlIQ"

			




	
	
	
		
 
    kallithea.lib.ssh.SshKeyParseError: Incorrect SSH key - unexpected characters in base64 part "AAAAB3NzaC1yc2EAAAA'LVGhpcyBpcyBmYWtlIQ"

			




	
	
	
		
 
    >>> parse_pub_key(''' ssh-rsa  AAAAB3NzaC1yc2EAAAALVGhpcyBpcyBmYWtlIQ== and a comment

			




	
	
	
		
 
    ... ''')

			




	
	
	
		
 
    ('ssh-rsa', '\x00\x00\x00\x07ssh-rsa\x00\x00\x00\x0bThis is fake!', 'and a comment\n')

			




	
	
	
		
 
    ('ssh-rsa', b'\x00\x00\x00\x07ssh-rsa\x00\x00\x00\x0bThis is fake!', 'and a comment\n')

			




	
	
	
		
 
    >>> parse_pub_key('''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIP1NA2kBQIKe74afUXmIWD9ByDYQJqUwW44Y4gJOBRuo''')

			




	
	
	
		
 
    ('ssh-ed25519', '\x00\x00\x00\x0bssh-ed25519\x00\x00\x00 \xfdM\x03i\x01@\x82\x9e\xef\x86\x9fQy\x88X?A\xc86\x10&\xa50[\x8e\x18\xe2\x02N\x05\x1b\xa8', '')

			




	
	
	
		
 
    ('ssh-ed25519', b'\x00\x00\x00\x0bssh-ed25519\x00\x00\x00 \xfdM\x03i\x01@\x82\x9e\xef\x86\x9fQy\x88X?A\xc86\x10&\xa50[\x8e\x18\xe2\x02N\x05\x1b\xa8', '')

			




	
	
	
		
 
    """

			




	
	
	
		
 
    if not ssh_key:

			




	
	
	
		
 
        raise SshKeyParseError(_("SSH key is missing"))

			




	
	
	
		
 

			




	
	
	
		
 
    parts = ssh_key.split(None, 2)

			




	
	
	
		
 
    if len(parts) < 2:

			




	
	
	
		
 
        raise SshKeyParseError(_("Incorrect SSH key - it must have both a key type and a base64 part, like 'ssh-rsa ASRNeaZu4FA...xlJp='"))

			




	
	
	
		
 

			




	
	
	
		
 
    keytype, keyvalue, comment = (parts + [''])[:3]

			




	
	
	
		
 
    if keytype not in ('ssh-rsa', 'ssh-dss', 'ssh-ed25519'):

			




	
	
	
		
 
        raise SshKeyParseError(_("Incorrect SSH key - it must start with 'ssh-(rsa|dss|ed25519)'"))

			




	
	
	
		
 

			




	
	
	
		
 
    if re.search(r'[^a-zA-Z0-9+/=]', keyvalue):

			




	
	
	
		
 
        raise SshKeyParseError(_("Incorrect SSH key - unexpected characters in base64 part %r") % keyvalue)

			




	
	
	
		
 

			




	
	
	
		
 
    try:

			




	
	
	
		
 
        key_bytes = base64.b64decode(keyvalue)

			




	
	
	
		
 
    except base64.binascii.Error:

			




	
	
	
		
 
        raise SshKeyParseError(_("Incorrect SSH key - failed to decode base64 part %r") % keyvalue)

			




	
	
	
		
 

			




	
	
	
		
 
    if not key_bytes.startswith(b'\x00\x00\x00%c%s\x00' % (len(keytype), ascii_bytes(keytype))):

			




	
	
	
		
 
        raise SshKeyParseError(_("Incorrect SSH key - base64 part is not %r as claimed but %r") % (keytype, ascii_str(key_bytes[4:].split(b'\0', 1)[0])))

			




	
	
	
		
 

			




	
	
	
		
 
    return keytype, key_bytes, comment

			




        

    


    
    

    

        

                

                    kallithea/lib/vcs/backends/git/ssh.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -11,57 +11,57 @@

			




	
	
	
		
 
#

			




	
	
	
		
 
# You should have received a copy of the GNU General Public License

			




	
	
	
		
 
# along with this program.  If not, see <http://www.gnu.org/licenses/>.

			




	
	
	
		
 

			




	
	
	
		
 
import logging

			




	
	
	
		
 
import os

			




	
	
	
		
 

			




	
	
	
		
 
from kallithea.lib.hooks import log_pull_action

			




	
	
	
		
 
from kallithea.lib.utils import make_ui

			




	
	
	
		
 
from kallithea.lib.vcs.backends.ssh import BaseSshHandler

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
log = logging.getLogger(__name__)

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
class GitSshHandler(BaseSshHandler):

			




	
	
	
		
 
    vcs_type = 'git'

			




	
	
	
		
 

			




	
	
	
		
 
    @classmethod

			




	
	
	
		
 
    def make(cls, ssh_command_parts):

			




	
	
	
		
 
        r"""

			




	
	
	
		
 
        >>> import shlex

			




	
	
	
		
 

			




	
	
	
		
 
        >>> GitSshHandler.make(shlex.split("git-upload-pack '/foo bar'")).repo_name

			




	
	
	
		
 
        u'foo bar'

			




	
	
	
		
 
        'foo bar'

			




	
	
	
		
 
        >>> GitSshHandler.make(shlex.split("git-upload-pack '/foo bar'")).verb

			




	
	
	
		
 
        'git-upload-pack'

			




	
	
	
		
 
        >>> GitSshHandler.make(shlex.split(" git-upload-pack /blåbærgrød ")).repo_name # might not be necessary to support no quoting ... but we can

			




	
	
	
		
 
        u'bl\xe5b\xe6rgr\xf8d'

			




	
	
	
		
 
        'bl\xe5b\xe6rgr\xf8d'

			




	
	
	
		
 
        >>> GitSshHandler.make(shlex.split('''git-upload-pack "/foo'bar"''')).repo_name

			




	
	
	
		
 
        u"foo'bar"

			




	
	
	
		
 
        "foo'bar"

			




	
	
	
		
 
        >>> GitSshHandler.make(shlex.split("git-receive-pack '/foo'")).repo_name

			




	
	
	
		
 
        u'foo'

			




	
	
	
		
 
        'foo'

			




	
	
	
		
 
        >>> GitSshHandler.make(shlex.split("git-receive-pack '/foo'")).verb

			




	
	
	
		
 
        'git-receive-pack'

			




	
	
	
		
 

			




	
	
	
		
 
        >>> GitSshHandler.make(shlex.split("/bin/git-upload-pack '/foo'")) # ssh-serve will report 'SSH command %r is not supported'

			




	
	
	
		
 
        >>> GitSshHandler.make(shlex.split('''git-upload-pack /foo bar''')) # ssh-serve will report 'SSH command %r is not supported'

			




	
	
	
		
 
        >>> shlex.split("git-upload-pack '/foo'bar' x") # ssh-serve will report: Error parsing SSH command "...": No closing quotation

			




	
	
	
		
 
        Traceback (most recent call last):

			




	
	
	
		
 
        ValueError: No closing quotation

			




	
	
	
		
 
        >>> GitSshHandler.make(shlex.split('hg -R foo serve --stdio')) # not handled here

			




	
	
	
		
 
        """

			




	
	
	
		
 
        if (len(ssh_command_parts) == 2 and

			




	
	
	
		
 
            ssh_command_parts[0] in ['git-upload-pack', 'git-receive-pack'] and

			




	
	
	
		
 
            ssh_command_parts[1].startswith('/')

			




	
	
	
		
 
        ):

			




	
	
	
		
 
            return cls(ssh_command_parts[1][1:], ssh_command_parts[0])

			




	
	
	
		
 

			




	
	
	
		
 
        return None

			




	
	
	
		
 

			




	
	
	
		
 
    def __init__(self, repo_name, verb):

			




	
	
	
		
 
        BaseSshHandler.__init__(self, repo_name)

			




	
	
	
		
 
        self.verb = verb

			




	
	
	
		
 

			




	
	
	
		
 
    def _serve(self):

			




	
	
	
		
 
        if self.verb == 'git-upload-pack': # action 'pull'

			




        

    


    
    

    

        

                

                    kallithea/lib/vcs/backends/hg/ssh.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -13,51 +13,51 @@

			




	
	
	
		
 
# along with this program.  If not, see <http://www.gnu.org/licenses/>.

			




	
	
	
		
 

			




	
	
	
		
 
import logging

			




	
	
	
		
 

			




	
	
	
		
 
import mercurial.hg

			




	
	
	
		
 
import mercurial.wireprotoserver

			




	
	
	
		
 

			




	
	
	
		
 
from kallithea.lib.utils import make_ui

			




	
	
	
		
 
from kallithea.lib.vcs.backends.ssh import BaseSshHandler

			




	
	
	
		
 
from kallithea.lib.vcs.utils import safe_bytes

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
log = logging.getLogger(__name__)

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
class MercurialSshHandler(BaseSshHandler):

			




	
	
	
		
 
    vcs_type = 'hg'

			




	
	
	
		
 

			




	
	
	
		
 
    @classmethod

			




	
	
	
		
 
    def make(cls, ssh_command_parts):

			




	
	
	
		
 
        r"""

			




	
	
	
		
 
        >>> import shlex

			




	
	
	
		
 

			




	
	
	
		
 
        >>> MercurialSshHandler.make(shlex.split('hg -R "foo bar" serve --stdio')).repo_name

			




	
	
	
		
 
        u'foo bar'

			




	
	
	
		
 
        'foo bar'

			




	
	
	
		
 
        >>> MercurialSshHandler.make(shlex.split(' hg -R blåbærgrød serve --stdio ')).repo_name

			




	
	
	
		
 
        u'bl\xe5b\xe6rgr\xf8d'

			




	
	
	
		
 
        'bl\xe5b\xe6rgr\xf8d'

			




	
	
	
		
 
        >>> MercurialSshHandler.make(shlex.split('''hg -R 'foo"bar' serve --stdio''')).repo_name

			




	
	
	
		
 
        u'foo"bar'

			




	
	
	
		
 
        'foo"bar'

			




	
	
	
		
 

			




	
	
	
		
 
        >>> MercurialSshHandler.make(shlex.split('/bin/hg -R "foo" serve --stdio'))

			




	
	
	
		
 
        >>> MercurialSshHandler.make(shlex.split('''hg -R "foo"bar" serve --stdio''')) # ssh-serve will report: Error parsing SSH command "...": invalid syntax

			




	
	
	
		
 
        Traceback (most recent call last):

			




	
	
	
		
 
        ValueError: No closing quotation

			




	
	
	
		
 
        >>> MercurialSshHandler.make(shlex.split('git-upload-pack "/foo"')) # not handled here

			




	
	
	
		
 
        """

			




	
	
	
		
 
        if ssh_command_parts[:2] == ['hg', '-R'] and ssh_command_parts[3:] == ['serve', '--stdio']:

			




	
	
	
		
 
            return cls(ssh_command_parts[2])

			




	
	
	
		
 

			




	
	
	
		
 
        return None

			




	
	
	
		
 

			




	
	
	
		
 
    def _serve(self):

			




	
	
	
		
 
        # Note: we want a repo with config based on .hg/hgrc and can thus not use self.db_repo.scm_instance._repo.ui

			




	
	
	
		
 
        baseui = make_ui(repo_path=self.db_repo.repo_full_path)

			




	
	
	
		
 
        if not self.allow_push:

			




	
	
	
		
 
            baseui.setconfig(b'hooks', b'pretxnopen._ssh_reject', b'python:kallithea.lib.hooks.rejectpush')

			




	
	
	
		
 
            baseui.setconfig(b'hooks', b'prepushkey._ssh_reject', b'python:kallithea.lib.hooks.rejectpush')

			




	
	
	
		
 

			




	
	
	
		
 
        repo = mercurial.hg.repository(baseui, safe_bytes(self.db_repo.repo_full_path))

			




	
	
	
		
 
        log.debug("Starting Mercurial sshserver for %s", self.db_repo.repo_full_path)

			




	
	
	
		
 
        mercurial.wireprotoserver.sshserver(baseui, repo).serve_forever()

			




        

    


    
    

    

        

                

                    kallithea/lib/vcs/utils/helpers.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -110,49 +110,49 @@ def get_highlighted_code(name, code, typ

			




	
	
	
		
 
        return code

			




	
	
	
		
 
    from pygments import highlight

			




	
	
	
		
 
    from pygments.lexers import guess_lexer_for_filename, ClassNotFound

			




	
	
	
		
 
    from pygments.formatters import TerminalFormatter

			




	
	
	
		
 

			




	
	
	
		
 
    try:

			




	
	
	
		
 
        lexer = guess_lexer_for_filename(name, code)

			




	
	
	
		
 
        formatter = TerminalFormatter()

			




	
	
	
		
 
        content = highlight(code, lexer, formatter)

			




	
	
	
		
 
    except ClassNotFound:

			




	
	
	
		
 
        logging.debug("Couldn't guess Lexer, will not use pygments.")

			




	
	
	
		
 
        content = code

			




	
	
	
		
 
    return content

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
def parse_changesets(text):

			




	
	
	
		
 
    """

			




	
	
	
		
 
    Returns dictionary with *start*, *main* and *end* ids.

			




	
	
	
		
 

			




	
	
	
		
 
    Examples::

			




	
	
	
		
 

			




	
	
	
		
 
        >>> parse_changesets('aaabbb')

			




	
	
	
		
 
        {'start': None, 'main': 'aaabbb', 'end': None}

			




	
	
	
		
 
        >>> parse_changesets('aaabbb..cccddd')

			




	
	
	
		
 
        {'start': 'aaabbb', 'main': None, 'end': 'cccddd'}

			




	
	
	
		
 
        {'start': 'aaabbb', 'end': 'cccddd', 'main': None}

			




	
	
	
		
 

			




	
	
	
		
 
    """

			




	
	
	
		
 
    text = text.strip()

			




	
	
	
		
 
    CID_RE = r'[a-zA-Z0-9]+'

			




	
	
	
		
 
    if '..' not in text:

			




	
	
	
		
 
        m = re.match(r'^(?P<cid>%s)$' % CID_RE, text)

			




	
	
	
		
 
        if m:

			




	
	
	
		
 
            return {

			




	
	
	
		
 
                'start': None,

			




	
	
	
		
 
                'main': text,

			




	
	
	
		
 
                'end': None,

			




	
	
	
		
 
            }

			




	
	
	
		
 
    else:

			




	
	
	
		
 
        RE = r'^(?P<start>%s)?\.{2,3}(?P<end>%s)?$' % (CID_RE, CID_RE)

			




	
	
	
		
 
        m = re.match(RE, text)

			




	
	
	
		
 
        if m:

			




	
	
	
		
 
            result = m.groupdict()

			




	
	
	
		
 
            result['main'] = None

			




	
	
	
		
 
            return result

			




	
	
	
		
 
    raise ValueError("IDs not recognized")

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
def parse_datetime(text):

			




	
	
	
		
 
    """

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        Server instance: clio-31609
    
    
        This site is powered by
            Kallithea 0.7.0,
        which is
        © 2010–2025 by various authors & licensed under GPLv3.
            – Support