python-proxy-headers 0.2.0__tar.gz → 0.2.2__tar.gz

{python_proxy_headers-0.2.0/python_proxy_headers.egg-info → python_proxy_headers-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-proxy-headers
-Version: 0.2.0
+Version: 0.2.2
 Summary: Handle custom proxy headers for http & https requests in various python libraries
 Author-email: ProxyMesh <support@proxymesh.com>
 Project-URL: Homepage, https://github.com/proxymesh/python-proxy-headers
@@ -10,7 +10,7 @@ Project-URL: Documentation, https://python-proxy-headers.readthedocs.io/en/lates
 Project-URL: ProxyMesh, https://proxymesh.com
 Classifier: Programming Language :: Python :: 3
 Classifier: Operating System :: OS Independent
-Classifier: License :: OSI Approved :: BSD License
+Classifier: License :: OSI Approved :: MIT License
 Classifier: Intended Audience :: Developers
 Classifier: Topic :: Internet :: WWW/HTTP
 Classifier: Topic :: Software Development :: Libraries :: Python Modules

{python_proxy_headers-0.2.0 → python_proxy_headers-0.2.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "python-proxy-headers"
-version = "0.2.0"
+version = "0.2.2"
 authors = [
   { name="ProxyMesh", email="support@proxymesh.com" },
 ]
@@ -14,7 +14,7 @@ requires-python = ">=3.8"
 classifiers = [
   "Programming Language :: Python :: 3",
   "Operating System :: OS Independent",
-	"License :: OSI Approved :: BSD License",
+	"License :: OSI Approved :: MIT License",
 	"Intended Audience :: Developers",
 	"Topic :: Internet :: WWW/HTTP",
   "Topic :: Software Development :: Libraries :: Python Modules",
@@ -25,4 +25,4 @@ Homepage = "https://github.com/proxymesh/python-proxy-headers"
 Changelog = "https://github.com/proxymesh/python-proxy-headers/commits/main/"
 Issues = "https://github.com/proxymesh/python-proxy-headers/issues"
 Documentation = "https://python-proxy-headers.readthedocs.io/en/latest/"
-ProxyMesh = "https://proxymesh.com"
+ProxyMesh = "https://proxymesh.com"

{python_proxy_headers-0.2.0 → python_proxy_headers-0.2.2}/python_proxy_headers/urllib3_proxy_manager.py

@@ -3,6 +3,8 @@ from http.client import _read_headers
 from urllib3.connection import HTTPSConnection
 from urllib3.connectionpool import HTTPConnectionPool, HTTPSConnectionPool
 from urllib3.poolmanager import ProxyManager
+from urllib3.util.request import make_headers
+from urllib3.util.url import parse_url
 
 if sys.version_info < (3, 12, 0):
 	#####################################
@@ -128,6 +130,22 @@ class HTTPSProxyConnectionPool(HTTPSConnectionPool):
 
 class ProxyHeaderManager(ProxyManager):
 	def __init__(self, *args, **kwargs):
+		# urllib3.ProxyManager does not add Proxy-Authorization from user:pass in the
+		# proxy URL; requests does via HTTPAdapter.proxy_headers(). Merge URL auth here
+		# so direct proxy_from_url() matches requests and authenticates CONNECT.
+		proxy_url = kwargs.get("proxy_url")
+		if proxy_url is None and args:
+			proxy_url = args[0]
+		proxy_headers = kwargs.get("proxy_headers")
+		merged = dict(proxy_headers or {})
+		if isinstance(proxy_url, str):
+			parsed = parse_url(proxy_url)
+			if parsed.auth and not any(
+				k.lower() == "proxy-authorization" for k in merged
+			):
+				merged.update(make_headers(proxy_basic_auth=parsed.auth))
+		if merged != dict(proxy_headers or {}):
+			kwargs["proxy_headers"] = merged
 		super().__init__(*args, **kwargs)
 		self.pool_classes_by_scheme = {"http": HTTPConnectionPool, "https": HTTPSProxyConnectionPool}
 

{python_proxy_headers-0.2.0 → python_proxy_headers-0.2.2/python_proxy_headers.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-proxy-headers
-Version: 0.2.0
+Version: 0.2.2
 Summary: Handle custom proxy headers for http & https requests in various python libraries
 Author-email: ProxyMesh <support@proxymesh.com>
 Project-URL: Homepage, https://github.com/proxymesh/python-proxy-headers
@@ -10,7 +10,7 @@ Project-URL: Documentation, https://python-proxy-headers.readthedocs.io/en/lates
 Project-URL: ProxyMesh, https://proxymesh.com
 Classifier: Programming Language :: Python :: 3
 Classifier: Operating System :: OS Independent
-Classifier: License :: OSI Approved :: BSD License
+Classifier: License :: OSI Approved :: MIT License
 Classifier: Intended Audience :: Developers
 Classifier: Topic :: Internet :: WWW/HTTP
 Classifier: Topic :: Software Development :: Libraries :: Python Modules