upstream/mercurial-mirror Files · tests/test-hgwebdir-paths.py

sslutil: synchronize hostname matching logic with CPython...

sslutil: synchronize hostname matching logic with CPython sslutil contains its own hostname matching logic. CPython has code for the same intent. However, it is only available to Python 2.7.9+ (or distributions that have backported 2.7.9's ssl module improvements). This patch effectively imports CPython's hostname matching code from its ssl.py into sslutil.py. The hostname matching code itself is pretty similar. However, the DNS name matching code is much more robust and spec conformant. As the test changes show, this changes some behavior around wildcard handling and IDNA matching. The new behavior allows wildcards in the middle of words (e.g. 'f*.com' matches 'foo.com') This is spec compliant according to RFC 6125 Section 6.5.3 item 3. There is one test where the matcher is more strict. Before, '*.a.com' matched '.a.com'. Now it doesn't match. Strictly speaking this is a security vulnerability.

Pulkit Goyal - - Load All Authors

File last commit:

r28932:4eac8633 default


                r29452:26a5d605

3.8.4 stable

Download file

             test-hgwebdir-paths.py
        
                    48 lines
            
             | 1.1 KiB
            
                | text/x-python
            
             |
                PythonLexer
            
             / tests / test-hgwebdir-paths.py
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Pulkit Goyal
    
tests: make test-hgwebdir-paths use absolute_import

              r28932
            
      from __future__ import absolute_import

        Jeremy Whitlock
    
hgweb: make hgwebdir handle dict/list paths the same as config paths...

              r8529
            
      import os

        Pulkit Goyal
    
tests: make test-hgwebdir-paths use absolute_import

              r28932
            
      from mercurial import (

          hg,

          ui as uimod,

      )

      from mercurial.hgweb import (

          hgwebdir_mod,

      )

      hgwebdir = hgwebdir_mod.hgwebdir

        Jeremy Whitlock
    
hgweb: make hgwebdir handle dict/list paths the same as config paths...

              r8529
            
      os.mkdir('webdir')

      os.chdir('webdir')

        Matt Mackall
    
backout dbdb777502dc (issue3077) (issue3071)...

              r15381
            
      webdir = os.path.realpath('.')

        Jeremy Whitlock
    
hgweb: make hgwebdir handle dict/list paths the same as config paths...

              r8529
            
        Pulkit Goyal
    
tests: make test-hgwebdir-paths use absolute_import

              r28932
            
      u = uimod.ui()

        Jeremy Whitlock
    
hgweb: make hgwebdir handle dict/list paths the same as config paths...

              r8529
            
      hg.repository(u, 'a', create=1)

      hg.repository(u, 'b', create=1)

      os.chdir('b')

      hg.repository(u, 'd', create=1)

      os.chdir('..')

      hg.repository(u, 'c', create=1)

      os.chdir('..')

      paths = {'t/a/': '%s/a' % webdir,

               'b': '%s/b' % webdir,

               'coll': '%s/*' % webdir,

               'rcoll': '%s/**' % webdir}

      config = os.path.join(webdir, 'hgwebdir.conf')

      configfile = open(config, 'w')

      configfile.write('[paths]\n')

      for k, v in paths.items():

          configfile.write('%s = %s\n' % (k, v))

      configfile.close()

      confwd = hgwebdir(config)

      dictwd = hgwebdir(paths)

      assert len(confwd.repos) == len(dictwd.repos), 'different numbers'

      assert len(confwd.repos) == 9, 'expected 9 repos, found %d' % len(confwd.repos)

      found = dict(confwd.repos)

      for key, path in dictwd.repos:

          assert key in found, 'repository %s was not found' % key

          assert found[key] == path, 'different paths for repo %s' % key

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

Pulkit Goyal tests: make test-hgwebdir-paths use absolute_import	r28932	from __future__ import absolute_import

Jeremy Whitlock hgweb: make hgwebdir handle dict/list paths the same as config paths...	r8529	import os
Pulkit Goyal tests: make test-hgwebdir-paths use absolute_import	r28932	from mercurial import (
		hg,
		ui as uimod,
		)
		from mercurial.hgweb import (
		hgwebdir_mod,
		)
		hgwebdir = hgwebdir_mod.hgwebdir
Jeremy Whitlock hgweb: make hgwebdir handle dict/list paths the same as config paths...	r8529
		os.mkdir('webdir')
		os.chdir('webdir')

Matt Mackall backout dbdb777502dc (issue3077) (issue3071)...	r15381	webdir = os.path.realpath('.')
Jeremy Whitlock hgweb: make hgwebdir handle dict/list paths the same as config paths...	r8529
Pulkit Goyal tests: make test-hgwebdir-paths use absolute_import	r28932	u = uimod.ui()
Jeremy Whitlock hgweb: make hgwebdir handle dict/list paths the same as config paths...	r8529	hg.repository(u, 'a', create=1)
		hg.repository(u, 'b', create=1)
		os.chdir('b')
		hg.repository(u, 'd', create=1)
		os.chdir('..')
		hg.repository(u, 'c', create=1)
		os.chdir('..')

		paths = {'t/a/': '%s/a' % webdir,
		'b': '%s/b' % webdir,
		'coll': '%s/*' % webdir,
		'rcoll': '%s/**' % webdir}

		config = os.path.join(webdir, 'hgwebdir.conf')
		configfile = open(config, 'w')
		configfile.write('[paths]\n')
		for k, v in paths.items():
		configfile.write('%s = %s\n' % (k, v))
		configfile.close()

		confwd = hgwebdir(config)
		dictwd = hgwebdir(paths)

		assert len(confwd.repos) == len(dictwd.repos), 'different numbers'
		assert len(confwd.repos) == 9, 'expected 9 repos, found %d' % len(confwd.repos)

		found = dict(confwd.repos)
		for key, path in dictwd.repos:
		assert key in found, 'repository %s was not found' % key
		assert found[key] == path, 'different paths for repo %s' % key