| From 2d4a3fee6de2fa45eb82169361918f759269b4ec Mon Sep 17 00:00:00 2001 |
| From: Seth Michael Larson <sethmichaellarson@gmail.com> |
| Date: Wed, 26 May 2021 10:43:12 -0500 |
| Subject: [PATCH] Improve performance of sub-authority splitting in URL |
| |
| CVE: CVE-2021-33503 |
| Upstream-Status: Backport [https://github.com/urllib3/urllib3/commit/2d4a3fee6de2fa45eb82169361918f759269b4ec.patch] |
| Signed-off-by: Nikhil R <nikhil.r@kpit.com> |
| Signed-off-by: Ranjitsinh Rathod <ranjitsinh.rathod@kpit.com> |
| Comment: Refresh hunks to remove patch fuzz warnings |
| |
| --- |
| src/urllib3/util/url.py | 8 +++++--- |
| test/test_util.py | 10 ++++++++++ |
| 2 files changed, 15 insertions(+), 3 deletions(-) |
| |
| diff --git a/src/urllib3/util/url.py b/src/urllib3/util/url.py |
| index 6ff238fe3c..81a03da9e3 100644 |
| --- a/src/urllib3/util/url.py |
| +++ b/src/urllib3/util/url.py |
| @@ -63,12 +63,12 @@ IPV6_ADDRZ_RE = re.compile("^" + IPV6_ADDRZ_PAT + "$") |
| BRACELESS_IPV6_ADDRZ_RE = re.compile("^" + IPV6_ADDRZ_PAT[2:-2] + "$") |
| ZONE_ID_RE = re.compile("(" + ZONE_ID_PAT + r")\]$") |
| |
| -SUBAUTHORITY_PAT = (u"^(?:(.*)@)?(%s|%s|%s)(?::([0-9]{0,5}))?$") % ( |
| +_HOST_PORT_PAT = ("^(%s|%s|%s)(?::([0-9]{0,5}))?$") % ( |
| REG_NAME_PAT, |
| IPV4_PAT, |
| IPV6_ADDRZ_PAT, |
| ) |
| -SUBAUTHORITY_RE = re.compile(SUBAUTHORITY_PAT, re.UNICODE | re.DOTALL) |
| +_HOST_PORT_RE = re.compile(_HOST_PORT_PAT, re.UNICODE | re.DOTALL) |
| |
| UNRESERVED_CHARS = set( |
| "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789._-~" |
| @@ -368,7 +368,9 @@ def parse_url(url): |
| scheme = scheme.lower() |
| |
| if authority: |
| - auth, host, port = SUBAUTHORITY_RE.match(authority).groups() |
| + auth, _, host_port = authority.rpartition("@") |
| + auth = auth or None |
| + host, port = _HOST_PORT_RE.match(host_port).groups() |
| if auth and normalize_uri: |
| auth = _encode_invalid_chars(auth, USERINFO_CHARS) |
| if port == "": |
| diff --git a/test/test_util.py b/test/test_util.py |
| index a5b68a084b..88409e2d6c 100644 |
| --- a/test/test_util.py |
| +++ b/test/test_util.py |
| @@ -425,6 +425,16 @@ class TestUtil(object): |
| query="%0D%0ASET%20test%20failure12%0D%0A:8080/test/?test=a", |
| ), |
| ), |
| + # Tons of '@' causing backtracking |
| + ("https://" + ("@" * 10000) + "[", False), |
| + ( |
| + "https://user:" + ("@" * 10000) + "example.com", |
| + Url( |
| + scheme="https", |
| + auth="user:" + ("%40" * 9999), |
| + host="example.com", |
| + ), |
| + ), |
| ] |
| |
| @pytest.mark.parametrize("url, expected_url", url_vulnerabilities) |