0001-misc-avoid-URLs-starting-with-double-slash-29373.patch

Frédéric Péters, 28 décembre 2018 12:55

Voir les différences: en ligne côte à côte

Subject: [PATCH] misc: avoid URLs starting with double slash (#29373)

 tests/test_variadic_url.py | 14 +++++++-------
 wcs/qommon/misc.py         |  8 +++++++-
 2 files changed, 14 insertions(+), 8 deletions(-)

                     {'url': url}) == 'http://www.example.net/foobar'
             assert get_variadic_url('[url]/foobar/',
                     {'url': url}) == 'http://www.example.net/foobar/'
             assert get_variadic_url('{{url}}/foobar/',
                     {'url': url}) == 'http://www.example.net/foobar/'
         assert get_variadic_url('[url]foo/bar/',
                 {'url': 'http://www.example.net/'}) == 'http://www.example.net/foo/bar/'
         assert get_variadic_url('[url]foobar/',
-...
         assert get_variadic_url('{{ url }}/foobar',
                 {'url': 'http://www.example.net'}) == 'http://www.example.net/foobar'
         assert get_variadic_url('{{ url }}/foobar', # Django is more conservative here:
                 {'url': 'http://www.example.net/'}) == 'http://www.example.net//foobar'
                 {'url': 'http://www.example.net/'}) == 'http://www.example.net/foobar'
         # to be "smart", use Django templates language:
         for url in ('http://www.example.net', 'http://www.example.net/'):
             assert get_variadic_url('{{ url }}{% if url|last != "/" %}/{% endif %}foobar',
-...
         assert get_variadic_url('{{ url }}/?foo=bar',
                 {'url': 'http://www.example.net'}) == 'http://www.example.net/?foo=bar'
         assert get_variadic_url('{{ url }}/?foo=bar',
                 {'url': 'http://www.example.net/'}) == 'http://www.example.net//?foo=bar'
                 {'url': 'http://www.example.net/'}) == 'http://www.example.net/?foo=bar'
     def test_url_server_more(pub):
-...
         assert get_variadic_url('{{ url }}/foobar/json?toto',
                 {'url': 'http://www.example.net'}) == 'http://www.example.net/foobar/json?toto'
         assert get_variadic_url('{{ url }}/foobar/json?toto',
                 {'url': 'http://www.example.net/'}) == 'http://www.example.net//foobar/json?toto'
                 {'url': 'http://www.example.net/'}) == 'http://www.example.net/foobar/json?toto'
         assert get_variadic_url('{{ url }}foobar/json?toto',
                 {'url': 'http://www.example.net/'}) == 'http://www.example.net/foobar/json?toto'
-...
         assert get_variadic_url('{{ url }}/foobar/json?foo=bar',
                 {'url': 'http://www.example.net'}) == 'http://www.example.net/foobar/json?foo=bar'
         assert get_variadic_url('{{ url }}/foobar/json?foo=bar',
                 {'url': 'http://www.example.net/'}) == 'http://www.example.net//foobar/json?foo=bar'
                 {'url': 'http://www.example.net/'}) == 'http://www.example.net/foobar/json?foo=bar'
         assert get_variadic_url('{{ url }}foobar/json?foo=bar',
                 {'url': 'http://www.example.net/'}) == 'http://www.example.net/foobar/json?foo=bar'
-...
                 {'url': 'http://www.example.net'}) == 'http://www.example.net/foobar/baz/json?foo=bar'
         assert get_variadic_url('[url]/foobar/baz/json?foo=bar',
                 {'url': 'http://www.example.net/'}) == 'http://www.example.net/foobar/baz/json?foo=bar'
         assert get_variadic_url('[url]foobar/baz/json?foo=bar',
                 {'url': 'http://www.example.net/'}) == 'http://www.example.net/foobar/baz/json?foo=bar'
         # Django is more conservative
         assert get_variadic_url('{{ url }}/foobar/baz/json?foo=bar',
                 {'url': 'http://www.example.net'}) == 'http://www.example.net/foobar/baz/json?foo=bar'
         assert get_variadic_url('{{ url }}/foobar/baz/json?foo=bar',
                 {'url': 'http://www.example.net/'}) == 'http://www.example.net//foobar/baz/json?foo=bar'
                 {'url': 'http://www.example.net/'}) == 'http://www.example.net/foobar/baz/json?foo=bar'
         assert get_variadic_url('{{ url }}foobar/baz/json?foo=bar',
                 {'url': 'http://www.example.net/'}) == 'http://www.example.net/foobar/baz/json?foo=bar'

         # django template
         if '{{' in url or '{%' in url:
             try:
                 return Template(url).render(variables)
                 url = Template(url).render(variables)
                 p = urlparse.urlsplit(url)
                 scheme, netloc, path, query, fragment = (
                         p.scheme, p.netloc, p.path, p.query, p.fragment)
                 if path.startswith('//'):
                     path = path[1:]
                 return urlparse.urlunsplit((scheme, netloc, path, query, fragment))
             except (TemplateSyntaxError, VariableDoesNotExist):
                 return url
+    -

Projet

Général

Profil

Produits Entr'ouvert » w.c.s.

0001-misc-avoid-URLs-starting-with-double-slash-29373.patch