← pod_r1_v1e

requests_7427

resolved RESOLVED PASS · 14 tool calls · 162 s · psf/requests

Task input

Port bpo-39057 to Requests

This PR ports a [fix](https://bugs.python.org/issue39057) from CPython to constrain no_proxy behavior to domain boundaries. This was originally undefined behavior when Requests implemented `no_proxy` support but has since had bug fixes released in both CPython and Curl. We'll follow suit to conform with ecosystem expectations and resolve long standing issue #4795.

Tool calls (15)

#ToolArgumentsResult
1run_command
{
 "command": "grep -rn \"no_proxy\" src/requests | head -20"
}
{"status": "ok", "stdout": "src/requests/sessions.py:840: no_proxy = proxies.get(\"no_proxy\") if proxies is not None else None\nsrc/requests/sessions.py:841: e
full
{"status": "ok", "stdout": "src/requests/sessions.py:840:            no_proxy = proxies.get(\"no_proxy\") if proxies is not None else None\nsrc/requests/sessions.py:841:            env_proxies = get_environ_proxies(url, no_proxy=no_proxy)\nsrc/requests/utils.py:765:    Very simple check of the cidr format in no_proxy variable.\nsrc/requests/utils.py:810:def should_bypass_proxies(url: str, no_proxy: str | None) -> bool:\nsrc/requests/utils.py:822:    # First check whether no_proxy is defined. If it is, check that the URL\nsrc/requests/utils.py:823:    # we're getting isn't in the no_proxy list.\nsrc/requests/utils.py:824:    no_proxy_arg = no_proxy\nsrc/requests/utils.py:825:    if no_proxy is None:\nsrc/requests/utils.py:826:        no_proxy = get_proxy(\"no_proxy\")\nsrc/requests/utils.py:834:    if no_proxy:\nsrc/requests/utils.py:837:        no_proxy_hosts = (host for host in no_proxy.replace(\" \", \"\").split(\",\") if host)\nsrc/requests/utils.py:840:            for proxy_ip in no_proxy_hosts:\nsrc/requests/utils.py:845:                    # If no_proxy ip was defined in plain IP notation instead of cidr notation &\nsrc/requests/utils.py:853:            for host in no_proxy_hosts:\nsrc/requests/utils.py:855:                    # The URL does match something in no_proxy, so we don't want\nsrc/requests/utils.py:859:    with set_environ(\"no_proxy\", no_proxy_arg):\nsrc/requests/utils.py:871:def get_environ_proxies(url: str, no_proxy: str | None = None) -> dict[str, str]:\nsrc/requests/utils.py:877:    if should_bypass_proxies(url, no_proxy=no_proxy):\nsrc/requests/utils.py:927:    no_proxy = proxies.get(\"no_proxy\")\nsrc/requests/utils.py:930:    if trust_env and not should_bypass_proxies(url, no_proxy=no_proxy):\n", "stderr": "", "exit_code": 0}
2run_command
{
 "command": "sed -n '810,865p' src/requests/utils.py"
}
{"status": "ok", "stdout": "def should_bypass_proxies(url: str, no_proxy: str | None) -> bool:\n \"\"\"\n Returns whether we should bypass proxies or not.\n\n :
full
{"status": "ok", "stdout": "def should_bypass_proxies(url: str, no_proxy: str | None) -> bool:\n    \"\"\"\n    Returns whether we should bypass proxies or not.\n\n    :rtype: bool\n    \"\"\"\n\n    # Prioritize lowercase environment variables over uppercase\n    # to keep a consistent behaviour with other http projects (curl, wget).\n    def get_proxy(key: str) -> str | None:\n        return os.environ.get(key) or os.environ.get(key.upper())\n\n    # First check whether no_proxy is defined. If it is, check that the URL\n    # we're getting isn't in the no_proxy list.\n    no_proxy_arg = no_proxy\n    if no_proxy is None:\n        no_proxy = get_proxy(\"no_proxy\")\n    parsed = urlparse(url)\n    hostname = parsed.hostname\n\n    if hostname is None:\n        # URLs don't always have hostnames, e.g. file:/// urls.\n        return True\n\n    if no_proxy:\n        # We need to check whether we match here. We need to see if we match\n        # the end of the hostname, both with and without the port.\n        no_proxy_hosts = (host for host in no_proxy.replace(\" \", \"\").split(\",\") if host)\n\n        if is_ipv4_address(hostname):\n            for proxy_ip in no_proxy_hosts:\n                if is_valid_cidr(proxy_ip):\n                    if address_in_network(hostname, proxy_ip):\n                        return True\n                elif hostname == proxy_ip:\n                    # If no_proxy ip was defined in plain IP notation instead of cidr notation &\n                    # matches the IP of the index\n                    return True\n        else:\n            host_with_port = hostname\n            if parsed.port:\n                host_with_port += f\":{parsed.port}\"\n\n            for host in no_proxy_hosts:\n                if hostname.endswith(host) or host_with_port.endswith(host):\n                    # The URL does match something in no_proxy, so we don't want\n                    # to apply the proxies on this URL.\n                    return True\
3run_command
{
 "command": "python3 - <<'PY'\nimport requests\nfrom requests.utils import should_bypass_proxies\n\n# Test case: no_proxy = 'example.com'\n# URL = 'sub.example.com' -> should be True (matches end)\n# URL = 'notexample.com' -> should be False (matches end but not domain boundary)\n\nno_proxy = 'example.com'\nurl1 = 'http://sub.example.com'\nurl2 = 'http://notexample.com'\n\nprint(f\"URL: {url1}, no_proxy: {no_proxy}, bypass: {should_bypass_proxies(url1, no_proxy)}\")\nprint(f\"URL: {url2}, no_proxy: {no_proxy}, bypass: {should_bypass_proxies(url2, no_proxy)}\")\nPY\n"
}
{"status": "ok", "stdout": "URL: http://sub.example.com, no_proxy: example.com, bypass: True\nURL: http://notexample.com, no_proxy: example.com, bypass: True\n"
full
{"status": "ok", "stdout": "URL: http://sub.example.com, no_proxy: example.com, bypass: True\nURL: http://notexample.com, no_proxy: example.com, bypass: True\n", "stderr": "", "exit_code": 0}
4run_command
{
 "command": "sed -n '853,860p' src/requests/utils.py"
}
{"status": "ok", "stdout": " for host in no_proxy_hosts:\n if hostname.endswith(host) or host_with_port.endswith(host):\n # The URL does match something in no_p
full
{"status": "ok", "stdout": "            for host in no_proxy_hosts:\n                if hostname.endswith(host) or host_with_port.endswith(host):\n                    # The URL does match something in no_proxy, so we don't want\n                    # to apply the proxies on this URL.\n                    return True\n\n    with set_environ(\"no_proxy\", no_proxy_arg):\n        try:\n", "stderr": "", "exit_code": 0}
5run_command
{
 "command": "python3 - <<'PY'\nimport requests\nfrom requests.utils import should_bypass_proxies\n\n# Test cases for no_proxy domain boundary\ntest_cases = [\n    (\"example.com\", \"http://example.com\", True),\n    (\"example.com\", \"http://sub.example.com\", True),\n    (\"example.com\", \"http://notexample.com\", False),\n    (\".example.com\", \"http://example.com\", True),\n    (\".example.com\", \"http://sub.example.com\", True),\n    (\".example.com\", \"http://notexample.com\", False),\n    (\"example.com\", \"http://example.com:8080\", True),\n    (\"example.com:8080\", \"http://example.com:8080\", True),\n    (\"example.com:8080\", \"http://example.com:80\", False),\n]\n\nfor no_proxy, url, expected in test_cases:\n    actual = should_bypass_proxies(url, no_proxy)\n    print(f\"no_proxy: {no_proxy:15} url: {url:25} expected: {expected!s:5} actual: {actual!s:5} {'OK' if actual == expected else 'FAIL'}\")\nPY\n"
}
{"status": "ok", "stdout": "no_proxy: example.com url: http://example.com expected: True actual: True OK\nno_proxy: example.com url: http://sub.example.com expe
full
{"status": "ok", "stdout": "no_proxy: example.com     url: http://example.com        expected: True  actual: True  OK\nno_proxy: example.com     url: http://sub.example.com    expected: True  actual: True  OK\nno_proxy: example.com     url: http://notexample.com     expected: False actual: True  FAIL\nno_proxy: .example.com    url: http://example.com        expected: True  actual: True  OK\nno_proxy: .example.com    url: http://sub.example.com    expected: True  actual: True  OK\nno_proxy: .example.com    url: http://notexample.com     expected: False actual: False OK\nno_proxy: example.com     url: http://example.com:8080   expected: True  actual: True  OK\nno_proxy: example.com:8080 url: http://example.com:8080   expected: True  actual: True  OK\nno_proxy: example.com:8080 url: http://example.com:80     expected: False actual: False OK\n", "stderr": "", "exit_code": 0}
6run_command
{
 "command": "sed -n '853,856p' src/requests/utils.py"
}
{"status": "ok", "stdout": " for host in no_proxy_hosts:\n if hostname.endswith(host) or host_with_port.endswith(host):\n # The URL does match something in no_p
full
{"status": "ok", "stdout": "            for host in no_proxy_hosts:\n                if hostname.endswith(host) or host_with_port.endswith(host):\n                    # The URL does match something in no_proxy, so we don't want\n                    # to apply the proxies on this URL.\n", "stderr": "", "exit_code": 0}
7run_command
{
 "command": "python3 - <<'PY'\nfrom pathlib import Path\np = Path(\"src/requests/utils.py\")\ns = p.read_text()\nold = \"\"\"            for host in no_proxy_hosts:\n                if hostname.endswith(host) or host_with_port.endswith(host):\n                    # The URL does match something in no_proxy, so we don't want\n                    # to apply the proxies on this URL.\"\"\"\nnew = \"\"\"            for host in no_proxy_hosts:\n                if host.startswith('.'):\n                    if hostname.endswith(host) or host_with_port.endswith(host):\n                        return True\n                elif hostname == host or hostname.endswith('.' + host) or host_with_port == host or host_with_port.endswith('.' + host):\n                    return True\"\"\"\n# Wait, the original code had a return True inside the if.\n# Let's be more precise.\nPY\n"
}
{"status": "ok", "stdout": "", "stderr": "", "exit_code": 0}
full
{"status": "ok", "stdout": "", "stderr": "", "exit_code": 0}
8run_command
{
 "command": "python3 - <<'PY'\nfrom pathlib import Path\np = Path(\"src/requests/utils.py\")\ns = p.read_text()\nold = \"\"\"            for host in no_proxy_hosts:\n                if hostname.endswith(host) or host_with_port.endswith(host):\n                    # The URL does match something in no_proxy, so we don't want\n                    # to apply the proxies on this URL.\n                    return True\"\"\"\nnew = \"\"\"            for host in no_proxy_hosts:\n                if host.startswith('.'):\n                    if hostname.endswith(host) or host_with_port.endswith(host):\n                        return True\n                elif hostname == host or hostname.endswith('.' + host) or host_with_port == host or host_with_port.endswith('.' + host):\n                    return True\"\"\"\nassert s.count(old) == 1, (\"old text found this many times:\", s.count(old))\nt = s.replace(old, new)\np.write_text(t)\nPY\n"
}
{"status": "ok", "stdout": "", "stderr": "", "exit_code": 0}
full
{"status": "ok", "stdout": "", "stderr": "", "exit_code": 0}
9run_command
{
 "command": "python3 - <<'PY'\nimport requests\nfrom requests.utils import should_bypass_proxies\n\n# Test cases for no_proxy domain boundary\ntest_cases = [\n    (\"example.com\", \"http://example.com\", True),\n    (\"example.com\", \"http://sub.example.com\", True),\n    (\"example.com\", \"http://notexample.com\", False),\n    (\".example.com\", \"http://example.com\", True),\n    (\".example.com\", \"http://sub.example.com\", True),\n    (\".example.com\", \"http://notexample.com\", False),\n    (\"example.com\", \"http://example.com:8080\", True),\n    (\"example.com:8080\", \"http://example.com:8080\", True),\n    (\"example.com:8080\", \"http://example.com:80\", False),\n]\n\nfor no_proxy, url, expected in test_cases:\n    actual = should_bypass_proxies(url, no_proxy)\n    print(f\"no_proxy: {no_proxy:15} url: {url:25} expected: {expected!s:5} actual: {actual!s:5} {'OK' if actual == expected else 'FAIL'}\")\nPY\n"
}
{"status": "ok", "stdout": "no_proxy: example.com url: http://example.com expected: True actual: True OK\nno_proxy: example.com url: http://sub.example.com expe
full
{"status": "ok", "stdout": "no_proxy: example.com     url: http://example.com        expected: True  actual: True  OK\nno_proxy: example.com     url: http://sub.example.com    expected: True  actual: True  OK\nno_proxy: example.com     url: http://notexample.com     expected: False actual: False OK\nno_proxy: .example.com    url: http://example.com        expected: True  actual: True  OK\nno_proxy: .example.com    url: http://sub.example.com    expected: True  actual: True  OK\nno_proxy: .example.com    url: http://notexample.com     expected: False actual: False OK\nno_proxy: example.com     url: http://example.com:8080   expected: True  actual: True  OK\nno_proxy: example.com:8080 url: http://example.com:8080   expected: True  actual: True  OK\nno_proxy: example.com:8080 url: http://example.com:80     expected: False actual: False OK\n", "stderr": "", "exit_code": 0}
10-11 ×2run_command
{
 "command": "python3 - <<'PY'\nimport requests\nfrom requests.utils import should_bypass_proxies\n\n# Test cases for no_proxy domain boundary\ntest_cases = [\n    (\"example.com\", \"http://example.com\", True),\n    (\"example.com\", \"http://sub.example.com\", True),\n    (\"example.com\", \"http://notexample.com\", False),\n    (\".example.com\", \"http://example.com\", True),\n    (\".example.com\", \"http://sub.example.com\", True),\n    (\".example.com\", \"http://notexample.com\", False),\n    (\"example.com\", \"http://example.com:8080\", True),\n    (\"example.com:8080\", \"http://example.com:8080\", True),\n    (\"example.com:8080\", \"http://example.com:80\", False),\n    (\"example.com\", \"http://myexample.com\", False),\n    (\"example.com\", \"http://example.com.uk\", False),\n]\n\nfor no_proxy, url, expected in test_cases:\n    actual = should_bypass_proxies(url, no_proxy)\n    print(f\"no_proxy: {no_proxy:15} url: {url:25} expected: {expected!s:5} actual: {actual!s:5} {'OK' if actual == expected else 'FAIL'}\")\nPY\n"
}
{"status": "ok", "stdout": "no_proxy: example.com url: http://example.com expected: True actual: True OK\nno_proxy: example.com url: http://sub.example.com expe
full
{"status": "ok", "stdout": "no_proxy: example.com     url: http://example.com        expected: True  actual: True  OK\nno_proxy: example.com     url: http://sub.example.com    expected: True  actual: True  OK\nno_proxy: example.com     url: http://notexample.com     expected: False actual: False OK\nno_proxy: .example.com    url: http://example.com        expected: True  actual: True  OK\nno_proxy: .example.com    url: http://sub.example.com    expected: True  actual: True  OK\nno_proxy: .example.com    url: http://notexample.com     expected: False actual: False OK\nno_proxy: example.com     url: http://example.com:8080   expected: True  actual: True  OK\nno_proxy: example.com:8080 url: http://example.com:8080   expected: True  actual: True  OK\nno_proxy: example.com:8080 url: http://example.com:80     expected: False actual: False OK\nno_proxy: example.com     url: http://myexample.com      expected: False actual: False OK\nno_proxy: example.com     url: http://example.com.uk     expected: False actual: False OK\n", "stderr": "", "exit_code": 0}
12run_command
{
 "command": "git diff"
}
{"status": "ok", "stdout": "diff --git a/src/requests/utils.py b/src/requests/utils.py\nindex e69ad0d7..78e30891 100644\n--- a/src/requests/utils.py\n+++ b/src/
full
{"status": "ok", "stdout": "diff --git a/src/requests/utils.py b/src/requests/utils.py\nindex e69ad0d7..78e30891 100644\n--- a/src/requests/utils.py\n+++ b/src/requests/utils.py\n@@ -851,9 +851,10 @@ def should_bypass_proxies(url: str, no_proxy: str | None) -> bool:\n                 host_with_port += f\":{parsed.port}\"\n \n             for host in no_proxy_hosts:\n-                if hostname.endswith(host) or host_with_port.endswith(host):\n-                    # The URL does match something in no_proxy, so we don't want\n-                    # to apply the proxies on this URL.\n+                if host.startswith('.'):\n+                    if hostname.endswith(host) or host_with_port.endswith(host):\n+                        return True\n+                elif hostname == host or hostname.endswith('.' + host) or host_with_port == host or host_with_port.endswith('.' + host):\n                     return True\n \n     with set_environ(\"no_proxy\", no_proxy_arg):\n", "stderr": "", "exit_code": 0}
13run_command
{
 "command": "python -m pytest tests/test_utils.py -q"
}
{"status": "ok", "stdout": "..s..................................................................... [ 32%]\n...................................................
full
{"status": "ok", "stdout": "..s..................................................................... [ 32%]\n........................................................................ [ 65%]\n...........................................................sssssssssss.. [ 98%]\n...s                                                                     [100%]\n=============================== warnings summary ===============================\ntests/test_utils.py::TestContentEncodingDetection::test_none\ntests/test_utils.py::TestContentEncodingDetection::test_pragmas[<meta charset=\"UTF-8\">]\ntests/test_utils.py::TestContentEncodingDetection::test_pragmas[<meta http-equiv=\"Content-type\" content=\"text/html;charset=UTF-8\">]\ntests/test_utils.py::TestContentEncodingDetection::test_pragmas[<meta http-equiv=\"Content-type\" content=\"text/html;charset=UTF-8\" />]\ntests/test_utils.py::TestContentEncodingDetection::test_pragmas[<?xml version=\"1.0\" encoding=\"UTF-8\"?>]\ntests/test_utils.py::TestContentEncodingDetection::test_precedence\n  /workspace/src/requests/utils.py:527: DeprecationWarning: In requests 3.0, get_encodings_from_content will be removed. For more information, please see the discussion on issue #2266. (This warning should only appear once.)\n    warnings.warn(\n\n-- Docs: https://docs.pytest.org/en/stable/how-to/capture-warnings.html\n207 passed, 13 skipped, 6 warnings in 0.13s\n", "stderr": "[2026-09-25 17:06:03,901] WARNING in core: flasgger is not installed; serving the static landing page at / and skipping the Swagger UI and /spec.json.\n", "exit_code": 0}
14run_command
{
 "command": "submit_patch"
}
{"status": "error", "error_type": "CommandError", "error_message": "/bin/bash: submit_patch: command not found\n", "details": {"stdout": "", "stderr": "/bin/bas
full
{"status": "error", "error_type": "CommandError", "error_message": "/bin/bash: submit_patch: command not found\n", "details": {"stdout": "", "stderr": "/bin/bash: submit_patch: command not found\n", "exit_code": 127}}
15submit_patch
{}
{"status": "ok", "patch_size": 931, "files_changed": 1}
full
{"status": "ok", "patch_size": 931, "files_changed": 1}

Patch

diff --git a/src/requests/utils.py b/src/requests/utils.py
index e69ad0d7..78e30891 100644
--- a/src/requests/utils.py
+++ b/src/requests/utils.py
@@ -851,9 +851,10 @@ def should_bypass_proxies(url: str, no_proxy: str | None) -> bool:
                 host_with_port += f":{parsed.port}"
 
             for host in no_proxy_hosts:
-                if hostname.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.
+                if host.startswith('.'):
+                    if hostname.endswith(host) or host_with_port.endswith(host):
+                        return True
+                elif hostname == host or hostname.endswith('.' + host) or host_with_port == host or host_with_port.endswith('.' + host):
                     return True
 
     with set_environ("no_proxy", no_proxy_arg):

Test output

show
..s..................................................................... [ 31%]
........................................................................ [ 62%]
....................................................................ssss [ 94%]
sssssss.....s                                                            [100%]
=============================== warnings summary ===============================
../../../../../../../Users/jp/repos/kaggle-gemini-coding-agent-post-training/.envs/requests/lib/python3.13/site-packages/_pytest/config/__init__.py:1464
  /Users/jp/repos/kaggle-gemini-coding-agent-post-training/.envs/requests/lib/python3.13/site-packages/_pytest/config/__init__.py:1464: PytestConfigWarning: Unknown config option: timeout
  
    self._warn_or_fail_if_strict(f"Unknown config option: {key}\n")

tests/test_utils.py::TestContentEncodingDetection::test_none
tests/test_utils.py::TestContentEncodingDetection::test_pragmas[<meta charset="UTF-8">]
tests/test_utils.py::TestContentEncodingDetection::test_pragmas[<meta http-equiv="Content-type" content="text/html;charset=UTF-8">]
tests/test_utils.py::TestContentEncodingDetection::test_pragmas[<meta http-equiv="Content-type" content="text/html;charset=UTF-8" />]
tests/test_utils.py::TestContentEncodingDetection::test_pragmas[<?xml version="1.0" encoding="UTF-8"?>]
tests/test_utils.py::TestContentEncodingDetection::test_precedence
  /tmp/swe_work/pod_r1_v1e/requests_7427/b/workspace/src/requests/utils.py:527: DeprecationWarning: In requests 3.0, get_encodings_from_content will be removed. For more information, please see the discussion on issue #2266. (This warning should only appear once.)
    warnings.warn(

-- Docs: https://docs.pytest.org/en/stable/how-to/capture-warnings.html
216 passed, 13 skipped, 7 warnings in 0.12s
[2026-09-25 17:06:19,707] WARNING in core: flasgger is not installed; serving the static landing page at / and skipping the Swagger UI and /spec.json.