MSVSphere Packaging Team
4 months ago
commit
226932d528
GPG Key ID:
B2B0B9F29E528FE8
@ -0,0 +1 @@
|
||||
SOURCES/requests-v2.32.3.tar.gz
|
||||
@ -0,0 +1 @@
|
||||
412ecbc13900d9cbba88681eb29d66da9c6cae80 SOURCES/requests-v2.32.3.tar.gz
|
||||
@ -0,0 +1,277 @@
|
||||
From 91526670ad66e83e799459cb23b031b88bb680b4 Mon Sep 17 00:00:00 2001
|
||||
From: Derek Higgins <derekh@redhat.com>
|
||||
Date: Thu, 30 May 2024 11:15:18 +0200
|
||||
Subject: [PATCH 2/2] Add ipv6 support to should_bypass_proxies
|
||||
|
||||
Add support to should_bypass_proxies to support
|
||||
IPv6 ipaddresses and CIDRs in no_proxy. Includes
|
||||
adding IPv6 support to various other helper functions.
|
||||
|
||||
Co-authored-by: Lumir Balhar <lbalhar@redhat.com>
|
||||
---
|
||||
src/requests/utils.py | 83 ++++++++++++++++++++++++++++++++++++-------
|
||||
tests/test_utils.py | 66 +++++++++++++++++++++++++++++++---
|
||||
2 files changed, 132 insertions(+), 17 deletions(-)
|
||||
|
||||
diff --git a/src/requests/utils.py b/src/requests/utils.py
|
||||
index ae6c42f..0363698 100644
|
||||
--- a/src/requests/utils.py
|
||||
+++ b/src/requests/utils.py
|
||||
@@ -679,18 +679,46 @@ def requote_uri(uri):
|
||||
return quote(uri, safe=safe_without_percent)
|
||||
|
||||
|
||||
+def _get_mask_bits(mask, totalbits=32):
|
||||
+ """Converts a mask from /xx format to a int
|
||||
+ to be used as a mask for IP's in int format
|
||||
+
|
||||
+ Example: if mask is 24 function returns 0xFFFFFF00
|
||||
+ if mask is 24 and totalbits=128 function
|
||||
+ returns 0xFFFFFF00000000000000000000000000
|
||||
+
|
||||
+ :rtype: int
|
||||
+ """
|
||||
+ bits = ((1 << mask) - 1) << (totalbits - mask)
|
||||
+ return bits
|
||||
+
|
||||
+
|
||||
def address_in_network(ip, net):
|
||||
"""This function allows you to check if an IP belongs to a network subnet
|
||||
|
||||
Example: returns True if ip = 192.168.1.1 and net = 192.168.1.0/24
|
||||
returns False if ip = 192.168.1.1 and net = 192.168.100.0/24
|
||||
+ returns True if ip = 1:2:3:4::1 and net = 1:2:3:4::/64
|
||||
|
||||
:rtype: bool
|
||||
"""
|
||||
- ipaddr = struct.unpack("=L", socket.inet_aton(ip))[0]
|
||||
netaddr, bits = net.split("/")
|
||||
- netmask = struct.unpack("=L", socket.inet_aton(dotted_netmask(int(bits))))[0]
|
||||
- network = struct.unpack("=L", socket.inet_aton(netaddr))[0] & netmask
|
||||
+ if is_ipv4_address(ip) and is_ipv4_address(netaddr):
|
||||
+ ipaddr = struct.unpack(">L", socket.inet_aton(ip))[0]
|
||||
+ netmask = _get_mask_bits(int(bits))
|
||||
+ network = struct.unpack(">L", socket.inet_aton(netaddr))[0]
|
||||
+ elif is_ipv6_address(ip) and is_ipv6_address(netaddr):
|
||||
+ ipaddr_msb, ipaddr_lsb = struct.unpack(
|
||||
+ ">QQ", socket.inet_pton(socket.AF_INET6, ip)
|
||||
+ )
|
||||
+ ipaddr = (ipaddr_msb << 64) ^ ipaddr_lsb
|
||||
+ netmask = _get_mask_bits(int(bits), 128)
|
||||
+ network_msb, network_lsb = struct.unpack(
|
||||
+ ">QQ", socket.inet_pton(socket.AF_INET6, netaddr)
|
||||
+ )
|
||||
+ network = (network_msb << 64) ^ network_lsb
|
||||
+ else:
|
||||
+ return False
|
||||
return (ipaddr & netmask) == (network & netmask)
|
||||
|
||||
|
||||
@@ -710,12 +738,39 @@ def is_ipv4_address(string_ip):
|
||||
:rtype: bool
|
||||
"""
|
||||
try:
|
||||
- socket.inet_aton(string_ip)
|
||||
+ socket.inet_pton(socket.AF_INET, string_ip)
|
||||
+ except OSError:
|
||||
+ return False
|
||||
+ return True
|
||||
+
|
||||
+
|
||||
+def is_ipv6_address(string_ip):
|
||||
+ """
|
||||
+ :rtype: bool
|
||||
+ """
|
||||
+ try:
|
||||
+ socket.inet_pton(socket.AF_INET6, string_ip)
|
||||
except OSError:
|
||||
return False
|
||||
return True
|
||||
|
||||
|
||||
+def compare_ips(a, b):
|
||||
+ """
|
||||
+ Compare 2 IP's, uses socket.inet_pton to normalize IPv6 IPs
|
||||
+
|
||||
+ :rtype: bool
|
||||
+ """
|
||||
+ if a == b:
|
||||
+ return True
|
||||
+ try:
|
||||
+ return socket.inet_pton(socket.AF_INET6, a) == socket.inet_pton(
|
||||
+ socket.AF_INET6, b
|
||||
+ )
|
||||
+ except OSError:
|
||||
+ return False
|
||||
+
|
||||
+
|
||||
def is_valid_cidr(string_network):
|
||||
"""
|
||||
Very simple check of the cidr format in no_proxy variable.
|
||||
@@ -723,17 +778,19 @@ def is_valid_cidr(string_network):
|
||||
:rtype: bool
|
||||
"""
|
||||
if string_network.count("/") == 1:
|
||||
+ address, mask = string_network.split("/")
|
||||
try:
|
||||
- mask = int(string_network.split("/")[1])
|
||||
+ mask = int(mask)
|
||||
except ValueError:
|
||||
return False
|
||||
|
||||
- if mask < 1 or mask > 32:
|
||||
- return False
|
||||
-
|
||||
- try:
|
||||
- socket.inet_aton(string_network.split("/")[0])
|
||||
- except OSError:
|
||||
+ if is_ipv4_address(address):
|
||||
+ if mask < 1 or mask > 32:
|
||||
+ return False
|
||||
+ elif is_ipv6_address(address):
|
||||
+ if mask < 1 or mask > 128:
|
||||
+ return False
|
||||
+ else:
|
||||
return False
|
||||
else:
|
||||
return False
|
||||
@@ -790,12 +847,12 @@ def should_bypass_proxies(url, no_proxy):
|
||||
# the end of the hostname, both with and without the port.
|
||||
no_proxy = (host for host in no_proxy.replace(" ", "").split(",") if host)
|
||||
|
||||
- if is_ipv4_address(parsed.hostname):
|
||||
+ if is_ipv4_address(parsed.hostname) or is_ipv6_address(parsed.hostname):
|
||||
for proxy_ip in no_proxy:
|
||||
if is_valid_cidr(proxy_ip):
|
||||
if address_in_network(parsed.hostname, proxy_ip):
|
||||
return True
|
||||
- elif parsed.hostname == proxy_ip:
|
||||
+ elif compare_ips(parsed.hostname, proxy_ip):
|
||||
# If no_proxy ip was defined in plain IP notation instead of cidr notation &
|
||||
# matches the IP of the index
|
||||
return True
|
||||
diff --git a/tests/test_utils.py b/tests/test_utils.py
|
||||
index 5e9b56e..befbb46 100644
|
||||
--- a/tests/test_utils.py
|
||||
+++ b/tests/test_utils.py
|
||||
@@ -14,9 +14,11 @@ from requests._internal_utils import unicode_is_ascii
|
||||
from requests.cookies import RequestsCookieJar
|
||||
from requests.structures import CaseInsensitiveDict
|
||||
from requests.utils import (
|
||||
+ _get_mask_bits,
|
||||
_parse_content_type_header,
|
||||
add_dict_to_cookiejar,
|
||||
address_in_network,
|
||||
+ compare_ips,
|
||||
dotted_netmask,
|
||||
extract_zipped_paths,
|
||||
get_auth_from_url,
|
||||
@@ -263,8 +265,15 @@ class TestIsIPv4Address:
|
||||
|
||||
|
||||
class TestIsValidCIDR:
|
||||
- def test_valid(self):
|
||||
- assert is_valid_cidr("192.168.1.0/24")
|
||||
+ @pytest.mark.parametrize(
|
||||
+ "value",
|
||||
+ (
|
||||
+ "192.168.1.0/24",
|
||||
+ "1:2:3:4::/64",
|
||||
+ ),
|
||||
+ )
|
||||
+ def test_valid(self, value):
|
||||
+ assert is_valid_cidr(value)
|
||||
|
||||
@pytest.mark.parametrize(
|
||||
"value",
|
||||
@@ -274,6 +283,11 @@ class TestIsValidCIDR:
|
||||
"192.168.1.0/128",
|
||||
"192.168.1.0/-1",
|
||||
"192.168.1.999/24",
|
||||
+ "1:2:3:4::1",
|
||||
+ "1:2:3:4::/a",
|
||||
+ "1:2:3:4::0/321",
|
||||
+ "1:2:3:4::/-1",
|
||||
+ "1:2:3:4::12211/64",
|
||||
),
|
||||
)
|
||||
def test_invalid(self, value):
|
||||
@@ -287,6 +301,12 @@ class TestAddressInNetwork:
|
||||
def test_invalid(self):
|
||||
assert not address_in_network("172.16.0.1", "192.168.1.0/24")
|
||||
|
||||
+ def test_valid_v6(self):
|
||||
+ assert address_in_network("1:2:3:4::1111", "1:2:3:4::/64")
|
||||
+
|
||||
+ def test_invalid_v6(self):
|
||||
+ assert not address_in_network("1:2:3:4:1111", "1:2:3:4::/124")
|
||||
+
|
||||
|
||||
class TestGuessFilename:
|
||||
@pytest.mark.parametrize(
|
||||
@@ -722,6 +742,11 @@ def test_urldefragauth(url, expected):
|
||||
("http://172.16.1.12:5000/", False),
|
||||
("http://google.com:5000/v1.0/", False),
|
||||
("file:///some/path/on/disk", True),
|
||||
+ ("http://[1:2:3:4:5:6:7:8]:5000/", True),
|
||||
+ ("http://[1:2:3:4::1]/", True),
|
||||
+ ("http://[1:2:3:9::1]/", True),
|
||||
+ ("http://[1:2:3:9:0:0:0:1]/", True),
|
||||
+ ("http://[1:2:3:9::2]/", False),
|
||||
),
|
||||
)
|
||||
def test_should_bypass_proxies(url, expected, monkeypatch):
|
||||
@@ -730,11 +755,11 @@ def test_should_bypass_proxies(url, expected, monkeypatch):
|
||||
"""
|
||||
monkeypatch.setenv(
|
||||
"no_proxy",
|
||||
- "192.168.0.0/24,127.0.0.1,localhost.localdomain,172.16.1.1, google.com:6000",
|
||||
+ "192.168.0.0/24,127.0.0.1,localhost.localdomain,1:2:3:4::/64,1:2:3:9::1,172.16.1.1, google.com:6000",
|
||||
)
|
||||
monkeypatch.setenv(
|
||||
"NO_PROXY",
|
||||
- "192.168.0.0/24,127.0.0.1,localhost.localdomain,172.16.1.1, google.com:6000",
|
||||
+ "192.168.0.0/24,127.0.0.1,localhost.localdomain,1:2:3:4::/64,1:2:3:9::1,172.16.1.1, google.com:6000",
|
||||
)
|
||||
assert should_bypass_proxies(url, no_proxy=None) == expected
|
||||
|
||||
@@ -956,3 +981,36 @@ def test_should_bypass_proxies_win_registry_ProxyOverride_value(monkeypatch):
|
||||
monkeypatch.setattr(winreg, "OpenKey", OpenKey)
|
||||
monkeypatch.setattr(winreg, "QueryValueEx", QueryValueEx)
|
||||
assert should_bypass_proxies("http://example.com/", None) is False
|
||||
+
|
||||
+
|
||||
+@pytest.mark.parametrize(
|
||||
+ "mask, totalbits, maskbits",
|
||||
+ (
|
||||
+ (24, None, 0xFFFFFF00),
|
||||
+ (31, None, 0xFFFFFFFE),
|
||||
+ (0, None, 0x0),
|
||||
+ (4, 4, 0xF),
|
||||
+ (24, 128, 0xFFFFFF00000000000000000000000000),
|
||||
+ ),
|
||||
+)
|
||||
+def test__get_mask_bits(mask, totalbits, maskbits):
|
||||
+ args = {"mask": mask}
|
||||
+ if totalbits:
|
||||
+ args["totalbits"] = totalbits
|
||||
+ assert _get_mask_bits(**args) == maskbits
|
||||
+
|
||||
+
|
||||
+@pytest.mark.parametrize(
|
||||
+ "a, b, expected",
|
||||
+ (
|
||||
+ ("1.2.3.4", "1.2.3.4", True),
|
||||
+ ("1.2.3.4", "2.2.3.4", False),
|
||||
+ ("1::4", "1.2.3.4", False),
|
||||
+ ("1::4", "1::4", True),
|
||||
+ ("1::4", "1:0:0:0:0:0:0:4", True),
|
||||
+ ("1::4", "1:0:0:0:0:0::4", True),
|
||||
+ ("1::4", "1:0:0:0:0:0:1:4", False),
|
||||
+ ),
|
||||
+)
|
||||
+def test_compare_ips(a, b, expected):
|
||||
+ assert compare_ips(a, b) == expected
|
||||
--
|
||||
2.45.1
|
||||
|
||||
@ -0,0 +1,59 @@
|
||||
From bb733473e91e71b812ada46bc110f607630f9327 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Hrn=C4=8Diar?= <thrnciar@redhat.com>
|
||||
Date: Thu, 30 May 2024 11:10:29 +0200
|
||||
Subject: [PATCH 1/2] system certs
|
||||
|
||||
Co-authored-by: Lumir Balhar <lbalhar@redhat.com>
|
||||
---
|
||||
setup.cfg | 1 -
|
||||
setup.py | 1 -
|
||||
src/requests/certs.py | 8 +++++++-
|
||||
3 files changed, 7 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/setup.cfg b/setup.cfg
|
||||
index 8d44e0e..fa10a53 100644
|
||||
--- a/setup.cfg
|
||||
+++ b/setup.cfg
|
||||
@@ -4,7 +4,6 @@ provides-extra =
|
||||
socks
|
||||
use_chardet_on_py3
|
||||
requires-dist =
|
||||
- certifi>=2017.4.17
|
||||
charset_normalizer>=2,<4
|
||||
idna>=2.5,<4
|
||||
urllib3>=1.21.1,<3
|
||||
diff --git a/setup.py b/setup.py
|
||||
index 1b0eb37..03d19b0 100755
|
||||
--- a/setup.py
|
||||
+++ b/setup.py
|
||||
@@ -62,7 +62,6 @@ requires = [
|
||||
"charset_normalizer>=2,<4",
|
||||
"idna>=2.5,<4",
|
||||
"urllib3>=1.21.1,<3",
|
||||
- "certifi>=2017.4.17",
|
||||
]
|
||||
test_requirements = [
|
||||
"pytest-httpbin==2.0.0",
|
||||
diff --git a/src/requests/certs.py b/src/requests/certs.py
|
||||
index be422c3..9aee713 100644
|
||||
--- a/src/requests/certs.py
|
||||
+++ b/src/requests/certs.py
|
||||
@@ -10,8 +10,14 @@ only one — the one from the certifi package.
|
||||
If you are packaging Requests, e.g., for a Linux distribution or a managed
|
||||
environment, you can change the definition of where() to return a separately
|
||||
packaged CA bundle.
|
||||
+
|
||||
+This Fedora-patched package returns "/etc/pki/tls/certs/ca-bundle.crt" provided
|
||||
+by the ca-certificates RPM package.
|
||||
"""
|
||||
-from certifi import where
|
||||
+
|
||||
+def where():
|
||||
+ """Return the absolute path to the system CA bundle."""
|
||||
+ return '/etc/pki/tls/certs/ca-bundle.crt'
|
||||
|
||||
if __name__ == "__main__":
|
||||
print(where())
|
||||
--
|
||||
2.45.1
|
||||
|
||||
Loading…
Reference in new issue