mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-30 00:20:08 +00:00
Code Issues Projects Releases Wiki Activity

bitbake: fetch2/wget: handle HTTP 308 Permanent Redirect

Browse Source 
urllib2.HTTPRedirectHandler.redirect_request doesn't handle HTTP reponse
code 308 (Permanent Redirect). This was fixed in c379bc5 but can't be
worked around without copying the entire redirect_request() method.

When we can depend on Python 3.13, FixedHTTPRedirectHandler can be
removed.

(Bitbake rev: 365829a2803b954ee6cb0364749551a91d806075)

Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ross Burton
2024-12-03 20:05:06 +00:00
committed by Richard Purdie
parent 59c725f411
commit e8ab6bc411
1 changed files with 37 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bitbake/lib/bb/fetch2/wget.py
+37 -5
View File
@@ -305,13 +305,45 @@ class Wget(FetchMethod):
class FixedHTTPRedirectHandler(urllib.request.HTTPRedirectHandler): class FixedHTTPRedirectHandler(urllib.request.HTTPRedirectHandler):
""" """
urllib2.HTTPRedirectHandler resets the method to GET on redirect, urllib2.HTTPRedirectHandler before 3.13 has two flaws:
when we want to follow redirects using the original method.
It resets the method to GET on redirect when we want to follow
redirects using the original method (typically HEAD). This was fixed
in 759e8e7.
It also doesn't handle 308 (Permanent Redirect). This was fixed in
c379bc5.
Until we depend on Python 3.13 onwards, copy the redirect_request
method to fix these issues.
""" """
def redirect_request(self, req, fp, code, msg, headers, newurl): def redirect_request(self, req, fp, code, msg, headers, newurl):
newreq = urllib.request.HTTPRedirectHandler.redirect_request(self, req, fp, code, msg, headers, newurl) m = req.get_method()
newreq.get_method = req.get_method if (not (code in (301, 302, 303, 307, 308) and m in ("GET", "HEAD")
return newreq or code in (301, 302, 303) and m == "POST")):
raise urllib.HTTPError(req.full_url, code, msg, headers, fp)
# Strictly (according to RFC 2616), 301 or 302 in response to
# a POST MUST NOT cause a redirection without confirmation
# from the user (of urllib.request, in this case). In practice,
# essentially all clients do redirect in this case, so we do
# the same.
# Be conciliant with URIs containing a space. This is mainly
# redundant with the more complete encoding done in http_error_302(),
# but it is kept for compatibility with other callers.
newurl = newurl.replace(' ', '%20')
CONTENT_HEADERS = ("content-length", "content-type")
newheaders = {k: v for k, v in req.headers.items()
if k.lower() not in CONTENT_HEADERS}
return urllib.request.Request(newurl,
method="HEAD" if m == "HEAD" else "GET",
headers=newheaders,
origin_req_host=req.origin_req_host,
unverifiable=True)
http_error_308 = urllib.request.HTTPRedirectHandler.http_error_302
# We need to update the environment here as both the proxy and HTTPS # We need to update the environment here as both the proxy and HTTPS
# handlers need variables set. The proxy needs http_proxy and friends to # handlers need variables set. The proxy needs http_proxy and friends to