Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
SUSE:SLE-15-SP5:GA
python-requests.23814
02-proper-handl-ports-auth-strip.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File 02-proper-handl-ports-auth-strip.patch of Package python-requests.23814
From ea9436a5d6a5934a906e91202349aabf9af75d15 Mon Sep 17 00:00:00 2001 From: Nate Prewitt <Nate.Prewitt@gmail.com> Date: Sun, 28 Oct 2018 23:17:39 -0700 Subject: [PATCH] proper handling for default ports in auth stripping --- requests/sessions.py | 13 +++++++++++-- requests/utils.py | 2 ++ tests/test_requests.py | 11 +++++++++++ 3 files changed, 24 insertions(+), 2 deletions(-) --- a/requests/sessions.py +++ b/requests/sessions.py @@ -20,7 +20,7 @@ from .cookies import ( from .models import Request, PreparedRequest, DEFAULT_REDIRECT_LIMIT from .hooks import default_hooks, dispatch_hook from ._internal_utils import to_native_string -from .utils import to_key_val_list, default_headers +from .utils import to_key_val_list, default_headers, DEFAULT_PORTS from .exceptions import ( TooManyRedirects, InvalidSchema, ChunkedEncodingError, ContentDecodingError) @@ -129,8 +129,17 @@ class SessionRedirectMixin(object): if (old_parsed.scheme == 'http' and old_parsed.port in (80, None) and new_parsed.scheme == 'https' and new_parsed.port in (443, None)): return False + + # Handle default port usage corresponding to scheme. + changed_port = old_parsed.port != new_parsed.port + changed_scheme = old_parsed.scheme != new_parsed.scheme + default_port = (DEFAULT_PORTS.get(old_parsed.scheme, None), None) + if (not changed_scheme and old_parsed.port in default_port + and new_parsed.port in default_port): + return False + # Standard case: root URI must match - return old_parsed.port != new_parsed.port or old_parsed.scheme != new_parsed.scheme + return changed_port or changed_scheme def resolve_redirects(self, resp, req, stream=False, timeout=None, verify=True, cert=None, proxies=None, yield_requests=False, **adapter_kwargs): --- a/requests/utils.py +++ b/requests/utils.py @@ -38,6 +38,8 @@ NETRC_FILES = ('.netrc', '_netrc') DEFAULT_CA_BUNDLE_PATH = certs.where() +DEFAULT_PORTS = {'http': 80, 'https': 443} + if platform.system() == 'Windows': # provide a proxy_bypass version on Windows without DNS lookups --- a/tests/test_requests.py +++ b/tests/test_requests.py @@ -1518,6 +1518,17 @@ class TestRequests: s = requests.Session() assert s.should_strip_auth('http://example.com:1234/foo', 'https://example.com:4321/bar') + @pytest.mark.parametrize( + 'old_uri, new_uri', ( + ('https://example.com:443/foo', 'https://example.com/bar'), + ('http://example.com:80/foo', 'http://example.com/bar'), + ('https://example.com/foo', 'https://example.com:443/bar'), + ('http://example.com/foo', 'http://example.com:80/bar') + )) + def test_should_strip_auth_default_port(self, old_uri, new_uri): + s = requests.Session() + assert not s.should_strip_auth(old_uri, new_uri) + def test_manual_redirect_with_partial_body_read(self, httpbin): s = requests.Session() r1 = s.get(httpbin('redirect/2'), allow_redirects=False, stream=True)
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor