Complete Yocto mirror with license table for TQMa6UL (2038-compliance)
- 264 license table entries with exact download URLs (224/264 resolved) - Complete sources/ directory with all BitBake recipes - Build configuration: tqma6ul-multi-mba6ulx, spaetzle (musl) - Full traceability for Softwarefreigabeantrag - GCC 13.4.0, Linux 6.6.102, U-Boot 2023.04, musl 1.2.4 - License distribution: GPL-2.0 (24), MIT (23), GPL-2.0+ (18), BSD-3 (16)
This commit is contained in:
Siggi (OpenClaw Agent)
@@ -0,0 +1,283 @@
|
||||
From f05b1329126d5be6de501f9d1e3e36738bc08857 Mon Sep 17 00:00:00 2001
|
||||
From: Illia Volochii <illia.volochii@gmail.com>
|
||||
Date: Wed, 18 Jun 2025 16:25:01 +0300
|
||||
Subject: [PATCH] Merge commit from fork
|
||||
|
||||
* Apply Quentin's suggestion
|
||||
|
||||
Co-authored-by: Quentin Pradet <quentin.pradet@gmail.com>
|
||||
|
||||
* Add tests for disabled redirects in the pool manager
|
||||
|
||||
* Add a possible fix for the issue with not raised `MaxRetryError`
|
||||
|
||||
* Make urllib3 handle redirects instead of JS when JSPI is used
|
||||
|
||||
* Fix info in the new comment
|
||||
|
||||
* State that redirects with XHR are not controlled by urllib3
|
||||
|
||||
* Remove excessive params from new test requests
|
||||
|
||||
* Add tests reaching max non-0 redirects
|
||||
|
||||
* Test redirects with Emscripten
|
||||
|
||||
* Fix `test_merge_pool_kwargs`
|
||||
|
||||
* Add a changelog entry
|
||||
|
||||
* Parametrize tests
|
||||
|
||||
* Drop a fix for Emscripten
|
||||
|
||||
* Apply Seth's suggestion to docs
|
||||
|
||||
Co-authored-by: Seth Michael Larson <sethmichaellarson@gmail.com>
|
||||
|
||||
* Use a minor release instead of the patch one
|
||||
|
||||
---------
|
||||
|
||||
Co-authored-by: Quentin Pradet <quentin.pradet@gmail.com>
|
||||
Co-authored-by: Seth Michael Larson <sethmichaellarson@gmail.com>
|
||||
|
||||
CVE: CVE-2025-50181
|
||||
Upstream-Status: Backport [https://github.com/urllib3/urllib3/commit/f05b1329126d5be6de501f9d1e3e36738bc08857]
|
||||
|
||||
Signed-off-by: Yogita Urade <yogita.urade@windriver.com>
|
||||
---
|
||||
docs/reference/contrib/emscripten.rst | 2 +-
|
||||
dummyserver/app.py | 1 +
|
||||
src/urllib3/poolmanager.py | 18 +++-
|
||||
test/contrib/emscripten/test_emscripten.py | 16 ++++
|
||||
test/test_poolmanager.py | 5 +-
|
||||
test/with_dummyserver/test_poolmanager.py | 101 +++++++++++++++++++++
|
||||
6 files changed, 139 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/docs/reference/contrib/emscripten.rst b/docs/reference/contrib/emscripten.rst
|
||||
index 9e85629..c88e422 100644
|
||||
--- a/docs/reference/contrib/emscripten.rst
|
||||
+++ b/docs/reference/contrib/emscripten.rst
|
||||
@@ -68,7 +68,7 @@ Features which are usable with Emscripten support are:
|
||||
* Timeouts
|
||||
* Retries
|
||||
* Streaming (with Web Workers and Cross-Origin Isolation)
|
||||
-* Redirects
|
||||
+* Redirects (determined by browser/runtime, not restrictable with urllib3)
|
||||
* Decompressing response bodies
|
||||
|
||||
Features which don't work with Emscripten:
|
||||
diff --git a/dummyserver/app.py b/dummyserver/app.py
|
||||
index 9fc9d1b..96e0dab 100644
|
||||
--- a/dummyserver/app.py
|
||||
+++ b/dummyserver/app.py
|
||||
@@ -228,6 +228,7 @@ async def encodingrequest() -> ResponseReturnValue:
|
||||
|
||||
|
||||
@hypercorn_app.route("/redirect", methods=["GET", "POST", "PUT"])
|
||||
+@pyodide_testing_app.route("/redirect", methods=["GET", "POST", "PUT"])
|
||||
async def redirect() -> ResponseReturnValue:
|
||||
"Perform a redirect to ``target``"
|
||||
values = await request.values
|
||||
diff --git a/src/urllib3/poolmanager.py b/src/urllib3/poolmanager.py
|
||||
index 085d1db..5763fea 100644
|
||||
--- a/src/urllib3/poolmanager.py
|
||||
+++ b/src/urllib3/poolmanager.py
|
||||
@@ -203,6 +203,22 @@ class PoolManager(RequestMethods):
|
||||
**connection_pool_kw: typing.Any,
|
||||
) -> None:
|
||||
super().__init__(headers)
|
||||
+ if "retries" in connection_pool_kw:
|
||||
+ retries = connection_pool_kw["retries"]
|
||||
+ if not isinstance(retries, Retry):
|
||||
+ # When Retry is initialized, raise_on_redirect is based
|
||||
+ # on a redirect boolean value.
|
||||
+ # But requests made via a pool manager always set
|
||||
+ # redirect to False, and raise_on_redirect always ends
|
||||
+ # up being False consequently.
|
||||
+ # Here we fix the issue by setting raise_on_redirect to
|
||||
+ # a value needed by the pool manager without considering
|
||||
+ # the redirect boolean.
|
||||
+ raise_on_redirect = retries is not False
|
||||
+ retries = Retry.from_int(retries, redirect=False)
|
||||
+ retries.raise_on_redirect = raise_on_redirect
|
||||
+ connection_pool_kw = connection_pool_kw.copy()
|
||||
+ connection_pool_kw["retries"] = retries
|
||||
self.connection_pool_kw = connection_pool_kw
|
||||
|
||||
self.pools: RecentlyUsedContainer[PoolKey, HTTPConnectionPool]
|
||||
@@ -456,7 +472,7 @@ class PoolManager(RequestMethods):
|
||||
kw["body"] = None
|
||||
kw["headers"] = HTTPHeaderDict(kw["headers"])._prepare_for_method_change()
|
||||
|
||||
- retries = kw.get("retries")
|
||||
+ retries = kw.get("retries", response.retries)
|
||||
if not isinstance(retries, Retry):
|
||||
retries = Retry.from_int(retries, redirect=redirect)
|
||||
|
||||
diff --git a/test/contrib/emscripten/test_emscripten.py b/test/contrib/emscripten/test_emscripten.py
|
||||
index 17264d8..0e107fa 100644
|
||||
--- a/test/contrib/emscripten/test_emscripten.py
|
||||
+++ b/test/contrib/emscripten/test_emscripten.py
|
||||
@@ -949,6 +949,22 @@ def test_retries(
|
||||
pyodide_test(selenium_coverage, testserver_http.http_host, find_unused_port())
|
||||
|
||||
|
||||
+def test_redirects(
|
||||
+ selenium_coverage: typing.Any, testserver_http: PyodideServerInfo
|
||||
+) -> None:
|
||||
+ @run_in_pyodide # type: ignore[misc]
|
||||
+ def pyodide_test(selenium_coverage: typing.Any, host: str, port: int) -> None:
|
||||
+ from urllib3 import request
|
||||
+
|
||||
+ redirect_url = f"http://{host}:{port}/redirect"
|
||||
+ response = request("GET", redirect_url)
|
||||
+ assert response.status == 200
|
||||
+
|
||||
+ pyodide_test(
|
||||
+ selenium_coverage, testserver_http.http_host, testserver_http.http_port
|
||||
+ )
|
||||
+
|
||||
+
|
||||
@install_urllib3_wheel()
|
||||
def test_insecure_requests_warning(
|
||||
selenium_coverage: typing.Any, testserver_http: PyodideServerInfo
|
||||
diff --git a/test/test_poolmanager.py b/test/test_poolmanager.py
|
||||
index ab5f203..b481a19 100644
|
||||
--- a/test/test_poolmanager.py
|
||||
+++ b/test/test_poolmanager.py
|
||||
@@ -379,9 +379,10 @@ class TestPoolManager:
|
||||
|
||||
def test_merge_pool_kwargs(self) -> None:
|
||||
"""Assert _merge_pool_kwargs works in the happy case"""
|
||||
- p = PoolManager(retries=100)
|
||||
+ retries = retry.Retry(total=100)
|
||||
+ p = PoolManager(retries=retries)
|
||||
merged = p._merge_pool_kwargs({"new_key": "value"})
|
||||
- assert {"retries": 100, "new_key": "value"} == merged
|
||||
+ assert {"retries": retries, "new_key": "value"} == merged
|
||||
|
||||
def test_merge_pool_kwargs_none(self) -> None:
|
||||
"""Assert false-y values to _merge_pool_kwargs result in defaults"""
|
||||
diff --git a/test/with_dummyserver/test_poolmanager.py b/test/with_dummyserver/test_poolmanager.py
|
||||
index af77241..7f163ab 100644
|
||||
--- a/test/with_dummyserver/test_poolmanager.py
|
||||
+++ b/test/with_dummyserver/test_poolmanager.py
|
||||
@@ -84,6 +84,89 @@ class TestPoolManager(HypercornDummyServerTestCase):
|
||||
assert r.status == 200
|
||||
assert r.data == b"Dummy server!"
|
||||
|
||||
+ @pytest.mark.parametrize(
|
||||
+ "retries",
|
||||
+ (0, Retry(total=0), Retry(redirect=0), Retry(total=0, redirect=0)),
|
||||
+ )
|
||||
+ def test_redirects_disabled_for_pool_manager_with_0(
|
||||
+ self, retries: typing.Literal[0] | Retry
|
||||
+ ) -> None:
|
||||
+ """
|
||||
+ Check handling redirects when retries is set to 0 on the pool
|
||||
+ manager.
|
||||
+ """
|
||||
+ with PoolManager(retries=retries) as http:
|
||||
+ with pytest.raises(MaxRetryError):
|
||||
+ http.request("GET", f"{self.base_url}/redirect")
|
||||
+
|
||||
+ # Setting redirect=True should not change the behavior.
|
||||
+ with pytest.raises(MaxRetryError):
|
||||
+ http.request("GET", f"{self.base_url}/redirect", redirect=True)
|
||||
+
|
||||
+ # Setting redirect=False should not make it follow the redirect,
|
||||
+ # but MaxRetryError should not be raised.
|
||||
+ response = http.request("GET", f"{self.base_url}/redirect", redirect=False)
|
||||
+ assert response.status == 303
|
||||
+
|
||||
+ @pytest.mark.parametrize(
|
||||
+ "retries",
|
||||
+ (
|
||||
+ False,
|
||||
+ Retry(total=False),
|
||||
+ Retry(redirect=False),
|
||||
+ Retry(total=False, redirect=False),
|
||||
+ ),
|
||||
+ )
|
||||
+ def test_redirects_disabled_for_pool_manager_with_false(
|
||||
+ self, retries: typing.Literal[False] | Retry
|
||||
+ ) -> None:
|
||||
+ """
|
||||
+ Check that setting retries set to False on the pool manager disables
|
||||
+ raising MaxRetryError and redirect=True does not change the
|
||||
+ behavior.
|
||||
+ """
|
||||
+ with PoolManager(retries=retries) as http:
|
||||
+ response = http.request("GET", f"{self.base_url}/redirect")
|
||||
+ assert response.status == 303
|
||||
+
|
||||
+ response = http.request("GET", f"{self.base_url}/redirect", redirect=True)
|
||||
+ assert response.status == 303
|
||||
+
|
||||
+ response = http.request("GET", f"{self.base_url}/redirect", redirect=False)
|
||||
+ assert response.status == 303
|
||||
+
|
||||
+ def test_redirects_disabled_for_individual_request(self) -> None:
|
||||
+ """
|
||||
+ Check handling redirects when they are meant to be disabled
|
||||
+ on the request level.
|
||||
+ """
|
||||
+ with PoolManager() as http:
|
||||
+ # Check when redirect is not passed.
|
||||
+ with pytest.raises(MaxRetryError):
|
||||
+ http.request("GET", f"{self.base_url}/redirect", retries=0)
|
||||
+ response = http.request("GET", f"{self.base_url}/redirect", retries=False)
|
||||
+ assert response.status == 303
|
||||
+
|
||||
+ # Check when redirect=True.
|
||||
+ with pytest.raises(MaxRetryError):
|
||||
+ http.request(
|
||||
+ "GET", f"{self.base_url}/redirect", retries=0, redirect=True
|
||||
+ )
|
||||
+ response = http.request(
|
||||
+ "GET", f"{self.base_url}/redirect", retries=False, redirect=True
|
||||
+ )
|
||||
+ assert response.status == 303
|
||||
+
|
||||
+ # Check when redirect=False.
|
||||
+ response = http.request(
|
||||
+ "GET", f"{self.base_url}/redirect", retries=0, redirect=False
|
||||
+ )
|
||||
+ assert response.status == 303
|
||||
+ response = http.request(
|
||||
+ "GET", f"{self.base_url}/redirect", retries=False, redirect=False
|
||||
+ )
|
||||
+ assert response.status == 303
|
||||
+
|
||||
def test_cross_host_redirect(self) -> None:
|
||||
with PoolManager() as http:
|
||||
cross_host_location = f"{self.base_url_alt}/echo?a=b"
|
||||
@@ -138,6 +221,24 @@ class TestPoolManager(HypercornDummyServerTestCase):
|
||||
pool = http.connection_from_host(self.host, self.port)
|
||||
assert pool.num_connections == 1
|
||||
|
||||
+ # Check when retries are configured for the pool manager.
|
||||
+ with PoolManager(retries=1) as http:
|
||||
+ with pytest.raises(MaxRetryError):
|
||||
+ http.request(
|
||||
+ "GET",
|
||||
+ f"{self.base_url}/redirect",
|
||||
+ fields={"target": f"/redirect?target={self.base_url}/"},
|
||||
+ )
|
||||
+
|
||||
+ # Here we allow more retries for the request.
|
||||
+ response = http.request(
|
||||
+ "GET",
|
||||
+ f"{self.base_url}/redirect",
|
||||
+ fields={"target": f"/redirect?target={self.base_url}/"},
|
||||
+ retries=2,
|
||||
+ )
|
||||
+ assert response.status == 200
|
||||
+
|
||||
def test_redirect_cross_host_remove_headers(self) -> None:
|
||||
with PoolManager() as http:
|
||||
r = http.request(
|
||||
--
|
||||
2.40.0
|
||||
Reference in New Issue
Block a user