francis.wang
4c86c082a2
Combine poky (Yocto scarthgap), meta-openembedded (scarthgap), and meta-openwrt into a single repository. Components: - poky/ Yocto core framework (BitBake + OE-Core) - meta-openembedded/ Community layers (meta-oe, meta-python, meta-networking) - meta-openwrt/ OpenWrt customization layer - setup-env.sh One-click build environment setup - README.md Project documentation
134 lines
5.3 KiB
Diff
134 lines
5.3 KiB
Diff
From be751c3f3a11d40c2133bee5fb6ab6931df31936 Mon Sep 17 00:00:00 2001
|
|
From: "Miss Islington (bot)"
|
|
<31488909+miss-islington@users.noreply.github.com>
|
|
Date: Thu, 23 Apr 2026 15:05:17 +0200
|
|
Subject: [PATCH] [3.13] gh-90309: Base64-encode cookie values embedded in
|
|
JS (GH-148888)
|
|
|
|
CVE: CVE-2026-6019
|
|
Upstream-Status: Backport [https://github.com/python/cpython/commit/3c59b8b53fc75c7f9578d16fb8201ceb43e8f76c]
|
|
|
|
Backport Changes:
|
|
- This file is not present in the current version and is therefore omitted.
|
|
Misc/NEWS.d/next/Security/2026-04-21-13-46-30.gh-issue-90309.srvj9q.rst
|
|
|
|
(cherry picked from commit 76b3923d688c0efc580658476c5f525ec8735104)
|
|
|
|
Co-authored-by: Seth Larson <seth@python.org>
|
|
(cherry picked from commit 3c59b8b53fc75c7f9578d16fb8201ceb43e8f76c)
|
|
Signed-off-by: Sudhir Dumbhare <sudumbha@cisco.com>
|
|
---
|
|
Lib/http/cookies.py | 8 ++++++--
|
|
Lib/test/test_http_cookies.py | 29 ++++++++++++++++++-----------
|
|
2 files changed, 24 insertions(+), 13 deletions(-)
|
|
|
|
diff --git a/Lib/http/cookies.py b/Lib/http/cookies.py
|
|
index 63d119ad46c..aebc2a163e4 100644
|
|
--- a/Lib/http/cookies.py
|
|
+++ b/Lib/http/cookies.py
|
|
@@ -389,17 +389,21 @@ class Morsel(dict):
|
|
return '<%s: %s>' % (self.__class__.__name__, self.OutputString())
|
|
|
|
def js_output(self, attrs=None):
|
|
+ import base64
|
|
# Print javascript
|
|
output_string = self.OutputString(attrs)
|
|
if _has_control_character(output_string):
|
|
raise CookieError("Control characters are not allowed in cookies")
|
|
+ # Base64-encode value to avoid template
|
|
+ # injection in cookie values.
|
|
+ output_encoded = base64.b64encode(output_string.encode('utf-8')).decode("ascii")
|
|
return """
|
|
<script type="text/javascript">
|
|
<!-- begin hiding
|
|
- document.cookie = \"%s\";
|
|
+ document.cookie = atob(\"%s\");
|
|
// end hiding -->
|
|
</script>
|
|
- """ % (output_string.replace('"', r'\"'))
|
|
+ """ % (output_encoded,)
|
|
|
|
def OutputString(self, attrs=None):
|
|
# Build up our result
|
|
diff --git a/Lib/test/test_http_cookies.py b/Lib/test/test_http_cookies.py
|
|
index 2478a6c630f..6aa5df068f9 100644
|
|
--- a/Lib/test/test_http_cookies.py
|
|
+++ b/Lib/test/test_http_cookies.py
|
|
@@ -1,5 +1,5 @@
|
|
# Simple test suite for http/cookies.py
|
|
-
|
|
+import base64
|
|
import copy
|
|
import unittest
|
|
import doctest
|
|
@@ -152,17 +152,19 @@ class CookieTests(unittest.TestCase):
|
|
|
|
self.assertEqual(C.output(['path']),
|
|
'Set-Cookie: Customer="WILE_E_COYOTE"; Path=/acme')
|
|
- self.assertEqual(C.js_output(), r"""
|
|
+ cookie_encoded = base64.b64encode(b'Customer="WILE_E_COYOTE"; Path=/acme; Version=1').decode('ascii')
|
|
+ self.assertEqual(C.js_output(), fr"""
|
|
<script type="text/javascript">
|
|
<!-- begin hiding
|
|
- document.cookie = "Customer=\"WILE_E_COYOTE\"; Path=/acme; Version=1";
|
|
+ document.cookie = atob("{cookie_encoded}");
|
|
// end hiding -->
|
|
</script>
|
|
""")
|
|
- self.assertEqual(C.js_output(['path']), r"""
|
|
+ cookie_encoded = base64.b64encode(b'Customer="WILE_E_COYOTE"; Path=/acme').decode('ascii')
|
|
+ self.assertEqual(C.js_output(['path']), fr"""
|
|
<script type="text/javascript">
|
|
<!-- begin hiding
|
|
- document.cookie = "Customer=\"WILE_E_COYOTE\"; Path=/acme";
|
|
+ document.cookie = atob("{cookie_encoded}");
|
|
// end hiding -->
|
|
</script>
|
|
""")
|
|
@@ -259,17 +261,19 @@ class CookieTests(unittest.TestCase):
|
|
|
|
self.assertEqual(C.output(['path']),
|
|
'Set-Cookie: Customer="WILE_E_COYOTE"; Path=/acme')
|
|
- self.assertEqual(C.js_output(), r"""
|
|
+ expected_encoded_cookie = base64.b64encode(b'Customer=\"WILE_E_COYOTE\"; Path=/acme; Version=1').decode('ascii')
|
|
+ self.assertEqual(C.js_output(), fr"""
|
|
<script type="text/javascript">
|
|
<!-- begin hiding
|
|
- document.cookie = "Customer=\"WILE_E_COYOTE\"; Path=/acme; Version=1";
|
|
+ document.cookie = atob("{expected_encoded_cookie}");
|
|
// end hiding -->
|
|
</script>
|
|
""")
|
|
- self.assertEqual(C.js_output(['path']), r"""
|
|
+ expected_encoded_cookie = base64.b64encode(b'Customer=\"WILE_E_COYOTE\"; Path=/acme').decode('ascii')
|
|
+ self.assertEqual(C.js_output(['path']), fr"""
|
|
<script type="text/javascript">
|
|
<!-- begin hiding
|
|
- document.cookie = "Customer=\"WILE_E_COYOTE\"; Path=/acme";
|
|
+ document.cookie = atob("{expected_encoded_cookie}");
|
|
// end hiding -->
|
|
</script>
|
|
""")
|
|
@@ -360,13 +364,16 @@ class MorselTests(unittest.TestCase):
|
|
self.assertEqual(
|
|
M.output(),
|
|
"Set-Cookie: %s=%s; Path=/foo" % (i, "%s_coded_val" % i))
|
|
+ expected_encoded_cookie = base64.b64encode(
|
|
+ ("%s=%s; Path=/foo" % (i, "%s_coded_val" % i)).encode("ascii")
|
|
+ ).decode('ascii')
|
|
expected_js_output = """
|
|
<script type="text/javascript">
|
|
<!-- begin hiding
|
|
- document.cookie = "%s=%s; Path=/foo";
|
|
+ document.cookie = atob("%s");
|
|
// end hiding -->
|
|
</script>
|
|
- """ % (i, "%s_coded_val" % i)
|
|
+ """ % (expected_encoded_cookie,)
|
|
self.assertEqual(M.js_output(), expected_js_output)
|
|
for i in ["foo bar", "foo@bar"]:
|
|
# Try some illegal characters
|
|
--
|
|
2.35.6
|
|
|