|
 |
afe2ee |
From b40eb0f43daecc6e2e3ce47b0be49cf570d02adc Mon Sep 17 00:00:00 2001
|
|
|
afe2ee |
From: Lumir Balhar <lbalhar@redhat.com>
|
|
|
afe2ee |
Date: Thu, 9 Jan 2020 11:14:58 +0100
|
|
|
afe2ee |
Subject: [PATCH] CVE-2019-9740
|
|
|
afe2ee |
|
|
|
afe2ee |
---
|
|
|
afe2ee |
util/url.py | 7 +++++++
|
|
|
afe2ee |
1 file changed, 7 insertions(+)
|
|
|
afe2ee |
|
|
|
afe2ee |
diff --git a/util/url.py b/util/url.py
|
|
|
afe2ee |
index 6b6f996..2784c85 100644
|
|
|
afe2ee |
--- a/util/url.py
|
|
|
afe2ee |
+++ b/util/url.py
|
|
|
afe2ee |
@@ -1,5 +1,6 @@
|
|
|
afe2ee |
from __future__ import absolute_import
|
|
|
afe2ee |
from collections import namedtuple
|
|
|
afe2ee |
+import re
|
|
|
afe2ee |
|
|
|
afe2ee |
from ..exceptions import LocationParseError
|
|
|
afe2ee |
|
|
|
afe2ee |
@@ -10,6 +11,8 @@ url_attrs = ['scheme', 'auth', 'host', 'port', 'path', 'query', 'fragment']
|
|
|
afe2ee |
# urllib3 infers URLs without a scheme (None) to be http.
|
|
|
afe2ee |
NORMALIZABLE_SCHEMES = ('http', 'https', None)
|
|
|
afe2ee |
|
|
|
afe2ee |
+_contains_disallowed_url_pchar_re = re.compile('[\x00-\x20\x7f]')
|
|
|
afe2ee |
+from ..packages.six.moves.urllib.parse import quote
|
|
|
afe2ee |
|
|
|
afe2ee |
class Url(namedtuple('Url', url_attrs)):
|
|
|
afe2ee |
"""
|
|
|
afe2ee |
@@ -155,6 +158,10 @@ def parse_url(url):
|
|
|
afe2ee |
# Empty
|
|
|
afe2ee |
return Url()
|
|
|
afe2ee |
|
|
|
afe2ee |
+ # Prevent CVE-2019-9740.
|
|
|
afe2ee |
+ # adapted from https://github.com/python/cpython/pull/12755
|
|
|
afe2ee |
+ url = _contains_disallowed_url_pchar_re.sub(lambda match: quote(match.group()), url)
|
|
|
afe2ee |
+
|
|
|
afe2ee |
scheme = None
|
|
|
afe2ee |
auth = None
|
|
|
afe2ee |
host = None
|
|
|
afe2ee |
--
|
|
|
afe2ee |
2.24.1
|
|
|
afe2ee |
|