new file mode 100644

@@ -0,0 +1,142 @@

+commit 23fc0416454c4ad5b9b23d520fbe6d89be3efc24

+Author: Steve Dower <steve.dower@microsoft.com>

+Date:   Mon Mar 11 21:34:03 2019 -0700

+

+    [3.6] bpo-36216: Add check for characters in netloc that normalize to separators (GH-12201) (GH-12215)

+

+diff --git a/Doc/library/urllib.parse.rst b/Doc/library/urllib.parse.rst

+index d991254..647af61 100644

+--- a/Doc/library/urllib.parse.rst

+@@ -121,6 +121,11 @@ or on combining URL components into a URL string.

+    Unmatched square brackets in the :attr:`netloc` attribute will raise a

+    :exc:`ValueError`.

+ 

++   Characters in the :attr:`netloc` attribute that decompose under NFKC

++   normalization (as used by the IDNA encoding) into any of ``/``, ``?``,

++   ``#``, ``@``, or ``:`` will raise a :exc:`ValueError`. If the URL is

++   decomposed before parsing, no error will be raised.

++

+    .. versionchanged:: 3.2

+       Added IPv6 URL parsing capabilities.

+

+@@ -138,6 +138,9 @@ or on combining URL components into a UR

+       Out-of-range port numbers now raise :exc:`ValueError`, instead of

+       returning :const:`None`.

+ 

++   .. versionchanged:: 3.6.9

++      Characters that affect netloc parsing under NFKC normalization will

++      now raise :exc:`ValueError`.

+ 

+ .. function:: parse_qs(qs, keep_blank_values=False, strict_parsing=False, encoding='utf-8', errors='replace')

+

+ 

+@@ -256,10 +265,19 @@ or on combining URL components into a URL string.

+    Unmatched square brackets in the :attr:`netloc` attribute will raise a

+    :exc:`ValueError`.

+ 

++   Characters in the :attr:`netloc` attribute that decompose under NFKC

++   normalization (as used by the IDNA encoding) into any of ``/``, ``?``,

++   ``#``, ``@``, or ``:`` will raise a :exc:`ValueError`. If the URL is

++   decomposed before parsing, no error will be raised.

++

+    .. versionchanged:: 3.6

+       Out-of-range port numbers now raise :exc:`ValueError`, instead of

+       returning :const:`None`.

+ 

++   .. versionchanged:: 3.6.9

++      Characters that affect netloc parsing under NFKC normalization will

++      now raise :exc:`ValueError`.

++

+ 

+ .. function:: urlunsplit(parts)

+ 

+diff --git a/Lib/test/test_urlparse.py b/Lib/test/test_urlparse.py

+index be50b47..e6638ae 100644

+--- a/Lib/test/test_urlparse.py

+@@ -1,3 +1,5 @@

++import sys

++import unicodedata

+ import unittest

+ import urllib.parse

+ 

+@@ -984,6 +986,27 @@ class UrlParseTestCase(unittest.TestCase):

+                 expected.append(name)

+         self.assertCountEqual(urllib.parse.__all__, expected)

+ 

++    def test_urlsplit_normalization(self):

++        # Certain characters should never occur in the netloc,

++        # including under normalization.

++        # Ensure that ALL of them are detected and cause an error

++        illegal_chars = '/:#?@'

++        hex_chars = {'{:04X}'.format(ord(c)) for c in illegal_chars}

++        denorm_chars = [

++            c for c in map(chr, range(128, sys.maxunicode))

++            if (hex_chars & set(unicodedata.decomposition(c).split()))

++            and c not in illegal_chars

++        ]

++        # Sanity check that we found at least one such character

++        self.assertIn('\u2100', denorm_chars)

++        self.assertIn('\uFF03', denorm_chars)

++

++        for scheme in ["http", "https", "ftp"]:

++            for c in denorm_chars:

++                url = "{}://netloc{}false.netloc/path".format(scheme, c)

++                with self.subTest(url=url, char='{:04X}'.format(ord(c))):

++                    with self.assertRaises(ValueError):

++                        urllib.parse.urlsplit(url)

+ 

+ class Utility_Tests(unittest.TestCase):

+     """Testcase to test the various utility functions in the urllib."""

+diff --git a/Lib/urllib/parse.py b/Lib/urllib/parse.py

+index 85e68c8..7b06f4d 100644

+--- a/Lib/urllib/parse.py

+@@ -391,6 +391,21 @@ def _splitnetloc(url, start=0):

+             delim = min(delim, wdelim)     # use earliest delim position

+     return url[start:delim], url[delim:]   # return (domain, rest)

+ 

++def _checknetloc(netloc):

++    if not netloc or not any(ord(c) > 127 for c in netloc):

++        return

++    # looking for characters like \u2100 that expand to 'a/c'

++    # IDNA uses NFKC equivalence, so normalize for this check

++    import unicodedata

++    netloc2 = unicodedata.normalize('NFKC', netloc)

++    if netloc == netloc2:

++        return

++    _, _, netloc = netloc.rpartition('@') # anything to the left of '@' is okay

++    for c in '/?#@:':

++        if c in netloc2:

++            raise ValueError("netloc '" + netloc2 + "' contains invalid " +

++                             "characters under NFKC normalization")

++

+ def urlsplit(url, scheme='', allow_fragments=True):

+     """Parse a URL into 5 components:

+     <scheme>://<netloc>/<path>?<query>#<fragment>

+@@ -420,6 +435,7 @@ def urlsplit(url, scheme='', allow_fragments=True):

+                 url, fragment = url.split('#', 1)

+             if '?' in url:

+                 url, query = url.split('?', 1)

++            _checknetloc(netloc)

+             v = SplitResult(scheme, netloc, url, query, fragment)

+             _parse_cache[key] = v

+             return _coerce_result(v)

+@@ -443,6 +459,7 @@ def urlsplit(url, scheme='', allow_fragments=True):

+         url, fragment = url.split('#', 1)

+     if '?' in url:

+         url, query = url.split('?', 1)

++    _checknetloc(netloc)

+     v = SplitResult(scheme, netloc, url, query, fragment)

+     _parse_cache[key] = v

+     return _coerce_result(v)

+diff --git a/Misc/NEWS.d/next/Security/2019-03-06-09-38-40.bpo-36216.6q1m4a.rst b/Misc/NEWS.d/next/Security/2019-03-06-09-38-40.bpo-36216.6q1m4a.rst

+new file mode 100644

+index 0000000..5546394

+--- /dev/null

+@@ -0,0 +1,3 @@

++Changes urlsplit() to raise ValueError when the URL contains characters that

++decompose under IDNA encoding (NFKC-normalization) into characters that

++affect how the URL is parsed.

@@ -1,7 +1,7 @@

 Summary:        A high-level scripting language

 Name:           python3

 Version:        3.6.5

-Release:        4%{?dist}

+Release:        5%{?dist}

 License:        PSF

 URL:            http://www.python.org/

 Group:          System Environment/Programming

@@ -14,6 +14,7 @@ Patch1:         python3-support-photon-platform.patch

 Patch2:         python3-CVE-2017-18207.patch

 Patch3:         python3-CVE-2018-14647.patch

 Patch4:         python3-CVE-2018-20406.patch

+Patch5:         python3-CVE-2019-9636.patch

 BuildRequires:  pkg-config >= 0.28

 BuildRequires:  bzip2-devel

 BuildRequires:  ncurses-devel

@@ -138,7 +139,7 @@ The test package contains all regression tests for Python as well as the modules

 %patch2 -p1

 %patch3 -p1

 %patch4 -p1

-

+%patch5 -p1

 %build

 export OPT="${CFLAGS}"

@@ -268,6 +269,8 @@ rm -rf %{buildroot}/*

 %{_libdir}/python3.6/test/*

 %changelog

+*   Wed Mar 13 2019 Tapas Kundu <tkundu@vmware.com> 3.6.5-5

+-   Fix for CVE-2019-9636.patch

 *   Mon Feb 11 2019 Tapas Kundu <tkundu@vmware.com> 3.6.5-4

 -   Fix for CVE-2018-20406

 *   Mon Dec 31 2018 Tapas Kundu <tkundu@vmware.com> 3.6.5-3