summaryrefslogtreecommitdiffstats
path: root/meta-python/recipes-devtools/python/python3-django-3.2.25/0001-Fixed-33367-Fixed-URLValidator-crash-in-some-edge-ca.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta-python/recipes-devtools/python/python3-django-3.2.25/0001-Fixed-33367-Fixed-URLValidator-crash-in-some-edge-ca.patch')
-rw-r--r--meta-python/recipes-devtools/python/python3-django-3.2.25/0001-Fixed-33367-Fixed-URLValidator-crash-in-some-edge-ca.patch56
1 files changed, 56 insertions, 0 deletions
diff --git a/meta-python/recipes-devtools/python/python3-django-3.2.25/0001-Fixed-33367-Fixed-URLValidator-crash-in-some-edge-ca.patch b/meta-python/recipes-devtools/python/python3-django-3.2.25/0001-Fixed-33367-Fixed-URLValidator-crash-in-some-edge-ca.patch
new file mode 100644
index 0000000000..24ed73e9b5
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python3-django-3.2.25/0001-Fixed-33367-Fixed-URLValidator-crash-in-some-edge-ca.patch
@@ -0,0 +1,56 @@
1From 065b10e2757af671f3e64f0c8714e6f2e4eca727 Mon Sep 17 00:00:00 2001
2From: Gyorgy Sarvari <skandigraun@gmail.com>
3Date: Wed, 15 Dec 2021 11:55:19 -0300
4Subject: [PATCH] Fixed #33367 -- Fixed URLValidator crash in some edge cases.
5
6From: mendespedro <windowsxpedro@gmail.com>
7
8Upstream-Status: Backport [https://github.com/django/django/commit/e8b4feddc34ffe5759ec21da8fa027e86e653f1c]
9Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
10---
11 django/core/validators.py | 14 ++++++++------
12 1 file changed, 8 insertions(+), 6 deletions(-)
13
14diff --git a/django/core/validators.py b/django/core/validators.py
15index 94cc3bf..03cd9b8 100644
16--- a/django/core/validators.py
17+++ b/django/core/validators.py
18@@ -111,15 +111,16 @@ class URLValidator(RegexValidator):
19 raise ValidationError(self.message, code=self.code, params={'value': value})
20
21 # Then check full URL
22+ try:
23+ splitted_url = urlsplit(value)
24+ except ValueError:
25+ raise ValidationError(self.message, code=self.code, params={'value': value})
26 try:
27 super().__call__(value)
28 except ValidationError as e:
29 # Trivial case failed. Try for possible IDN domain
30 if value:
31- try:
32- scheme, netloc, path, query, fragment = urlsplit(value)
33- except ValueError: # for example, "Invalid IPv6 URL"
34- raise ValidationError(self.message, code=self.code, params={'value': value})
35+ scheme, netloc, path, query, fragment = splitted_url
36 try:
37 netloc = punycode(netloc) # IDN -> ACE
38 except UnicodeError: # invalid domain part
39@@ -130,7 +131,7 @@ class URLValidator(RegexValidator):
40 raise
41 else:
42 # Now verify IPv6 in the netloc part
43- host_match = re.search(r'^\[(.+)\](?::\d{2,5})?$', urlsplit(value).netloc)
44+ host_match = re.search(r'^\[(.+)\](?::\d{2,5})?$', splitted_url.netloc)
45 if host_match:
46 potential_ip = host_match[1]
47 try:
48@@ -142,7 +143,7 @@ class URLValidator(RegexValidator):
49 # section 3.1. It's defined to be 255 bytes or less, but this includes
50 # one byte for the length of the name and one byte for the trailing dot
51 # that's used to indicate absolute names in DNS.
52- if len(urlsplit(value).hostname) > 253:
53+ if splitted_url.hostname is None or len(splitted_url.hostname) > 253:
54 raise ValidationError(self.message, code=self.code, params={'value': value})
55
56