diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-05 22:28:33 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-05 22:31:28 +0300 |
commit | 193236933b0f4ab91b1625b64e2187e2db4e0e8f (patch) | |
tree | e12769d7c76d8b0517d6de3d3c72189753d253ed /meta-openembedded/meta-python/recipes-devtools/python/python-requests/0001-Strip-Authorization-header-whenever-root-URL-changes.patch | |
parent | bd93df9478f2f56ffcbc8cb88f1709c735dcd85b (diff) | |
download | openbmc-193236933b0f4ab91b1625b64e2187e2db4e0e8f.tar.xz |
reset upstream subtrees to HEAD
Reset the following subtrees on HEAD:
poky: 8217b477a1(master)
meta-xilinx: 64aa3d35ae(master)
meta-openembedded: 0435c9e193(master)
meta-raspberrypi: 490a4441ac(master)
meta-security: cb6d1c85ee(master)
Squashed patches:
meta-phosphor: drop systemd 239 patches
meta-phosphor: mrw-api: use correct install path
Change-Id: I268e2646d9174ad305630c6bbd3fbc1a6105f43d
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-openembedded/meta-python/recipes-devtools/python/python-requests/0001-Strip-Authorization-header-whenever-root-URL-changes.patch')
-rw-r--r-- | meta-openembedded/meta-python/recipes-devtools/python/python-requests/0001-Strip-Authorization-header-whenever-root-URL-changes.patch | 62 |
1 files changed, 0 insertions, 62 deletions
diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-requests/0001-Strip-Authorization-header-whenever-root-URL-changes.patch b/meta-openembedded/meta-python/recipes-devtools/python/python-requests/0001-Strip-Authorization-header-whenever-root-URL-changes.patch deleted file mode 100644 index 80ef5ffb16..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-requests/0001-Strip-Authorization-header-whenever-root-URL-changes.patch +++ /dev/null @@ -1,62 +0,0 @@ -From fb0d391138df48e93c44a2087ea796cca5e229c0 Mon Sep 17 00:00:00 2001 -From: Bruce Merry <bmerry@ska.ac.za> -Date: Thu, 28 Jun 2018 16:38:42 +0200 -Subject: [PATCH 1/2] Strip Authorization header whenever root URL changes - -Previously the header was stripped only if the hostname changed, but in -an https -> http redirect that can leak the credentials on the wire -(#4716). Based on with RFC 7235 section 2.2, the header is now stripped -if the "canonical root URL" (scheme+authority) has changed, by checking -scheme, hostname and port. - -Upstream-Status: Backport - -Fix CVE-2018-18074 - -Signed-off-by: Chen Qi <Qi.Chen@windriver.com> ---- - requests/sessions.py | 4 +++- - tests/test_requests.py | 12 +++++++++++- - 2 files changed, 14 insertions(+), 2 deletions(-) - -diff --git a/requests/sessions.py b/requests/sessions.py -index ba13526..2969d83 100644 ---- a/requests/sessions.py -+++ b/requests/sessions.py -@@ -242,7 +242,9 @@ class SessionRedirectMixin(object): - original_parsed = urlparse(response.request.url) - redirect_parsed = urlparse(url) - -- if (original_parsed.hostname != redirect_parsed.hostname): -+ if (original_parsed.hostname != redirect_parsed.hostname -+ or original_parsed.port != redirect_parsed.port -+ or original_parsed.scheme != redirect_parsed.scheme): - del headers['Authorization'] - - # .netrc might have more auth for us on our new host. -diff --git a/tests/test_requests.py b/tests/test_requests.py -index fcddb1d..e0e801a 100644 ---- a/tests/test_requests.py -+++ b/tests/test_requests.py -@@ -1575,7 +1575,17 @@ class TestRequests: - auth=('user', 'pass'), - ) - assert r.history[0].request.headers['Authorization'] -- assert not r.request.headers.get('Authorization', '') -+ assert 'Authorization' not in r.request.headers -+ -+ def test_auth_is_stripped_on_scheme_redirect(self, httpbin, httpbin_secure, httpbin_ca_bundle): -+ r = requests.get( -+ httpbin_secure('redirect-to'), -+ params={'url': httpbin('get')}, -+ auth=('user', 'pass'), -+ verify=httpbin_ca_bundle -+ ) -+ assert r.history[0].request.headers['Authorization'] -+ assert 'Authorization' not in r.request.headers - - def test_auth_is_retained_for_redirect_on_host(self, httpbin): - r = requests.get(httpbin('redirect/1'), auth=('user', 'pass')) --- -2.7.4 - |