abstract-webtools 0.1.6.156__tar.gz → 0.1.6.158__tar.gz

{abstract_webtools-0.1.6.156 → abstract_webtools-0.1.6.158}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: abstract_webtools
-Version: 0.1.6.156
+Version: 0.1.6.158
 Summary: Utilities for fetching/parsing web content with requests/urllib3/BS4 and helpers.
 Home-page: https://github.com/AbstractEndeavors/abstract_webtools
 Author: putkoff

{abstract_webtools-0.1.6.156 → abstract_webtools-0.1.6.158}/setup.py

@@ -5,7 +5,7 @@ README = Path("README.md").read_text(encoding="utf-8")
 
 setup(
     name="abstract_webtools",
-    version='0.1.6.156',  # bump once per release
+    version='0.1.6.158',  # bump once per release
     author="putkoff",
     author_email="partners@abstractendeavors.com",
     description="Utilities for fetching/parsing web content with requests/urllib3/BS4 and helpers.",

{abstract_webtools-0.1.6.156 → abstract_webtools-0.1.6.158}/src/abstract_webtools/managers/sslManager.py

@@ -1,21 +1,24 @@
-from ..abstract_webtools import *
 # sslManager.py
-from ..abstract_webtools import *  # must expose ssl, ssl_
-from .cipherManager import CipherManager  # be explicit, safer
+from ..abstract_webtools import *
+import ssl, certifi
 
 class SSLManager:
-    def __init__(self, ciphers=None, ssl_options=None, certification=None):
+    def __init__(self, ciphers=None, ssl_options=None, certification=None, cafile=None):
         self.ciphers = ciphers or CipherManager().ciphers_string
         self.ssl_options = ssl_options or self.get_default_ssl_settings()
         self.certification = certification or ssl.CERT_REQUIRED
+        self.cafile = cafile or certifi.where()          # << add this
         self.ssl_context = self.get_context()
 
     def get_default_ssl_settings(self):
         return ssl.OP_NO_TLSv1 | ssl.OP_NO_TLSv1_1 | ssl.OP_NO_COMPRESSION
 
     def get_context(self):
-        return ssl_.create_urllib3_context(
+        ctx = ssl_.create_urllib3_context(
             ciphers=self.ciphers,
             cert_reqs=self.certification,
-            options=self.ssl_options
+            options=self.ssl_options,
         )
+        # load CA roots
+        ctx.load_verify_locations(cafile=self.cafile)    # << add this
+        return ctx

abstract_webtools-0.1.6.158/src/abstract_webtools/managers/tlsAdapter.py

@@ -0,0 +1,64 @@
+# tls_adapter.py
+from typing import Optional, List
+from requests.adapters import HTTPAdapter
+from urllib3.poolmanager import PoolManager
+
+# If these live in your package root, adjust the import as needed:
+from ..abstract_webtools import SSLManager
+
+class TLSAdapter(HTTPAdapter):
+    """
+    Requests adapter that injects a preconfigured SSLContext (from SSLManager)
+    into both the main pool and any proxy pools.
+    """
+    def __init__(
+        self,
+        ssl_manager: Optional[SSLManager] = None,
+        ciphers: Optional[List[str]] = None,
+        certification: Optional[int] = None,   # e.g. ssl.CERT_REQUIRED
+        ssl_options: Optional[int] = None
+    ) -> None:
+        self.ssl_manager = ssl_manager or SSLManager(
+            ciphers=ciphers,
+            ssl_options=ssl_options,
+            certification=certification,
+        )
+        # expose a few attrs if you compare in the singleton
+        self.ciphers = self.ssl_manager.ciphers
+        self.certification = self.ssl_manager.certification
+        self.ssl_options = self.ssl_manager.ssl_options
+        self.ssl_context = self.ssl_manager.ssl_context
+        super().__init__()
+
+    def init_poolmanager(self, *args, **kwargs) -> None:
+        kwargs["ssl_context"] = self.ssl_context
+        super().init_poolmanager(*args, **kwargs)
+
+    def proxy_manager_for(self, proxy, **proxy_kwargs) -> PoolManager:
+        proxy_kwargs["ssl_context"] = self.ssl_context
+        return super().proxy_manager_for(proxy, **proxy_kwargs)
+
+
+class TLSAdapterSingleton:
+    _instance: Optional[TLSAdapter] = None
+
+    @staticmethod
+    def get_instance(
+        ciphers: Optional[List[str]] = None,
+        certification: Optional[int] = None,
+        ssl_options: Optional[int] = None
+    ) -> TLSAdapter:
+        inst = TLSAdapterSingleton._instance
+        if (
+            inst is None
+            or inst.ciphers != ciphers
+            or inst.certification != certification
+            or inst.ssl_options != ssl_options
+        ):
+            inst = TLSAdapter(
+                ciphers=ciphers,
+                certification=certification,
+                ssl_options=ssl_options,
+            )
+            TLSAdapterSingleton._instance = inst
+        return inst

{abstract_webtools-0.1.6.156 → abstract_webtools-0.1.6.158}/src/abstract_webtools.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: abstract_webtools
-Version: 0.1.6.156
+Version: 0.1.6.158
 Summary: Utilities for fetching/parsing web content with requests/urllib3/BS4 and helpers.
 Home-page: https://github.com/AbstractEndeavors/abstract_webtools
 Author: putkoff

abstract_webtools-0.1.6.156/src/abstract_webtools/managers/tlsAdapter.py

@@ -1,27 +0,0 @@
-from ..abstract_webtools import *
-class TLSAdapter(HTTPAdapter):
-    def __init__(self, ssl_manager=None,ciphers=None, certification: Optional[str] = None, ssl_options: Optional[List[str]] = None):
-        if ssl_manager == None:
-            ssl_manager = SSLManager(ciphers=ciphers, ssl_options=ssl_options, certification=certification)
-        self.ssl_manager = ssl_manager
-        self.ciphers = ssl_manager.ciphers
-        self.certification = ssl_manager.certification
-        self.ssl_options = ssl_manager.ssl_options
-        self.ssl_context = self.ssl_manager.ssl_context
-        super().__init__()
-
-    def init_poolmanager(self, *args, **kwargs):
-        kwargs['ssl_context'] = self.ssl_context
-        return super().init_poolmanager(*args, **kwargs)
-class TLSAdapterSingleton:
-    _instance: Optional[TLSAdapter] = None
-    
-    @staticmethod
-    def get_instance(ciphers: Optional[List[str]] = None, certification: Optional[str] = None, ssl_options: Optional[List[str]] = None) -> TLSAdapter:
-        if (not TLSAdapterSingleton._instance) or (
-            TLSAdapterSingleton._instance.ciphers != ciphers or 
-            TLSAdapterSingleton._instance.certification != certification or 
-            TLSAdapterSingleton._instance.ssl_options != ssl_options
-        ):
-            TLSAdapterSingleton._instance = TLSAdapter(ciphers=ciphers, certification=certification, ssl_options=ssl_options)
-        return TLSAdapterSingleton._instance