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
 
@@ -69,13 +69,13 @@ def expand(template, mako_variable_value
 
    ...                         '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
kallithea/lib/markup_renderer.py
➞
Show inline comments
 
@@ -116,23 +116,23 @@ class MarkupRenderer(object):
 
        """
 
        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

			




	
	
		
 
@@ -165,29 +165,29 @@ class MarkupRenderer(object):

			




	
	
	
		
 
    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>

			




	
	
	
		
 
        """

			




        

    


    
    

    

        

                

                    kallithea/lib/ssh.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -41,38 +41,38 @@ 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:

			




        

    


    
    

    

        

                

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

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -29,21 +29,21 @@ class GitSshHandler(BaseSshHandler):

			




	
	
	
		
 
    @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

			




        

    


    
    

    

        

                

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

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -31,17 +31,17 @@ class MercurialSshHandler(BaseSshHandler

			




	
	
	
		
 
    @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

			




        

    


    
    

    

        

                

                    kallithea/lib/vcs/utils/helpers.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -128,13 +128,13 @@ def parse_changesets(text):

			




	
	
	
		
 

			




	
	
	
		
 
    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)

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








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