diff options
Diffstat (limited to 'meta-python/recipes-devtools/python/python3-twisted/CVE-2024-41671-0001.patch')
| -rw-r--r-- | meta-python/recipes-devtools/python/python3-twisted/CVE-2024-41671-0001.patch | 89 |
1 files changed, 89 insertions, 0 deletions
diff --git a/meta-python/recipes-devtools/python/python3-twisted/CVE-2024-41671-0001.patch b/meta-python/recipes-devtools/python/python3-twisted/CVE-2024-41671-0001.patch new file mode 100644 index 0000000000..1f6bf6bbfc --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-twisted/CVE-2024-41671-0001.patch | |||
| @@ -0,0 +1,89 @@ | |||
| 1 | From 046a164f89a0f08d3239ecebd750360f8914df33 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Adi Roiban <adiroiban@gmail.com> | ||
| 3 | Date: Mon Jul 29 14:28:03 2024 +0100 | ||
| 4 | Subject: [PATCH] Merge commit from fork | ||
| 5 | |||
| 6 | Added HTML output encoding the "URL" parameter of the "redirectTo" function | ||
| 7 | |||
| 8 | CVE: CVE-2024-41671 | ||
| 9 | |||
| 10 | Upstream-Status: Backport [https://github.com/twisted/twisted/commit/046a164f89a0f08d3239ecebd750360f8914df33] | ||
| 11 | |||
| 12 | Signed-off-by: Soumya Sambu <soumya.sambu@windriver.com> | ||
| 13 | --- | ||
| 14 | src/twisted/web/_template_util.py | 2 +- | ||
| 15 | src/twisted/web/test/test_util.py | 39 ++++++++++++++++++++++++++++++- | ||
| 16 | 2 files changed, 39 insertions(+), 2 deletions(-) | ||
| 17 | |||
| 18 | diff --git a/src/twisted/web/_template_util.py b/src/twisted/web/_template_util.py | ||
| 19 | index 230c33f..7266079 100644 | ||
| 20 | --- a/src/twisted/web/_template_util.py | ||
| 21 | +++ b/src/twisted/web/_template_util.py | ||
| 22 | @@ -92,7 +92,7 @@ def redirectTo(URL: bytes, request: IRequest) -> bytes: | ||
| 23 | </body> | ||
| 24 | </html> | ||
| 25 | """ % { | ||
| 26 | - b"url": URL | ||
| 27 | + b"url": escape(URL.decode("utf-8")).encode("utf-8") | ||
| 28 | } | ||
| 29 | return content | ||
| 30 | |||
| 31 | diff --git a/src/twisted/web/test/test_util.py b/src/twisted/web/test/test_util.py | ||
| 32 | index 1e76300..9847dcb 100644 | ||
| 33 | --- a/src/twisted/web/test/test_util.py | ||
| 34 | +++ b/src/twisted/web/test/test_util.py | ||
| 35 | @@ -5,7 +5,6 @@ | ||
| 36 | Tests for L{twisted.web.util}. | ||
| 37 | """ | ||
| 38 | |||
| 39 | - | ||
| 40 | import gc | ||
| 41 | |||
| 42 | from twisted.internet import defer | ||
| 43 | @@ -64,6 +63,44 @@ class RedirectToTests(TestCase): | ||
| 44 | targetURL = "http://target.example.com/4321" | ||
| 45 | self.assertRaises(TypeError, redirectTo, targetURL, request) | ||
| 46 | |||
| 47 | + def test_legitimateRedirect(self): | ||
| 48 | + """ | ||
| 49 | + Legitimate URLs are fully interpolated in the `redirectTo` response body without transformation | ||
| 50 | + """ | ||
| 51 | + request = DummyRequest([b""]) | ||
| 52 | + html = redirectTo(b"https://twisted.org/", request) | ||
| 53 | + expected = b""" | ||
| 54 | +<html> | ||
| 55 | + <head> | ||
| 56 | + <meta http-equiv=\"refresh\" content=\"0;URL=https://twisted.org/\"> | ||
| 57 | + </head> | ||
| 58 | + <body bgcolor=\"#FFFFFF\" text=\"#000000\"> | ||
| 59 | + <a href=\"https://twisted.org/\">click here</a> | ||
| 60 | + </body> | ||
| 61 | +</html> | ||
| 62 | +""" | ||
| 63 | + self.assertEqual(html, expected) | ||
| 64 | + | ||
| 65 | + def test_maliciousRedirect(self): | ||
| 66 | + """ | ||
| 67 | + Malicious URLs are HTML-escaped before interpolating them in the `redirectTo` response body | ||
| 68 | + """ | ||
| 69 | + request = DummyRequest([b""]) | ||
| 70 | + html = redirectTo( | ||
| 71 | + b'https://twisted.org/"><script>alert(document.location)</script>', request | ||
| 72 | + ) | ||
| 73 | + expected = b""" | ||
| 74 | +<html> | ||
| 75 | + <head> | ||
| 76 | + <meta http-equiv=\"refresh\" content=\"0;URL=https://twisted.org/"><script>alert(document.location)</script>\"> | ||
| 77 | + </head> | ||
| 78 | + <body bgcolor=\"#FFFFFF\" text=\"#000000\"> | ||
| 79 | + <a href=\"https://twisted.org/"><script>alert(document.location)</script>\">click here</a> | ||
| 80 | + </body> | ||
| 81 | +</html> | ||
| 82 | +""" | ||
| 83 | + self.assertEqual(html, expected) | ||
| 84 | + | ||
| 85 | |||
| 86 | class ParentRedirectTests(SynchronousTestCase): | ||
| 87 | """ | ||
| 88 | -- | ||
| 89 | 2.40.0 | ||