Skip to content

Fix no_proxy being too greedy. #4812

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gilbsgilbs wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fix no_proxy being too greedy. #4812

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
692e5f5
Fix no_proxy being too greedy.
gilbsgilbs Oct 1, 2018
72c574c
Update minimum required pytest version.
gilbsgilbs Oct 1, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Pipfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ verify_ssl = true
name = "pypi"

[dev-packages]
pytest = ">=2.8.0"
pytest = ">=3.1.0"
codecov = "*"
pytest-httpbin = ">=0.0.7"
pytest-mock = "*"
Expand Down
8 changes: 6 additions & 2 deletions requests/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -727,12 +727,16 @@ def should_bypass_proxies(url, no_proxy):
# matches the IP of the index
return True
else:
host_with_port = parsed.hostname
host_without_port = '.' + parsed.hostname
host_with_port = host_without_port
if parsed.port:
host_with_port += ':{0}'.format(parsed.port)

for host in no_proxy:
if parsed.hostname.endswith(host) or host_with_port.endswith(host):
if not host.startswith('.'):
host = '.' + host

if host_without_port.endswith(host) or host_with_port.endswith(host):
# The URL does match something in no_proxy, so we don't want
# to apply the proxies on this URL.
return True
Expand Down
10 changes: 10 additions & 0 deletions tests/test_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
from io import BytesIO
import zipfile
from collections import deque
import sys

import pytest
from requests import compat
Expand Down Expand Up @@ -182,6 +183,7 @@ def test_not_bypass(self, url):
'http://192.168.1.1:5000/',
'http://192.168.1.1/',
'http://www.requests.com/',
'http://requests.com/',
))
def test_bypass_no_proxy_keyword(self, url):
no_proxy = '192.168.1.1,requests.com'
Expand All @@ -194,6 +196,13 @@ def test_bypass_no_proxy_keyword(self, url):
'http://172.16.1.1/',
'http://172.16.1.1:5000/',
'http://localhost.localdomain:5000/v1.0/',
pytest.param(
'http://somerequests.com',
marks=pytest.mark.skipif(
(sys.version_info[0], sys.version_info[1]) == (3, 4),
reason='Python 3.4 implementation of no_proxy is greedy',
),
),
))
def test_not_bypass_no_proxy_keyword(self, url, monkeypatch):
# This is testing that the 'no_proxy' argument overrides the
Expand Down Expand Up @@ -619,6 +628,7 @@ def test_urldefragauth(url, expected):
('http://172.16.1.1:5000/', True),
('http://localhost.localdomain:5000/v1.0/', True),
('http://google.com:6000/', True),
('http://zgoogle.com:6000/', False),
('http://172.16.1.12/', False),
('http://172.16.1.12:5000/', False),
('http://google.com:5000/v1.0/', False),
Expand Down