atomicshop 3.3.22__py3-none-any.whl → 3.3.24__py3-none-any.whl

atomicshop/__init__.py

@@ -1,4 +1,4 @@
 """Atomic Basic functions and classes to make developer life easier"""
 
 __author__ = "Den Kras"
-__version__ = '3.3.22'
+__version__ = '3.3.24'

atomicshop/web.py

@@ -1,11 +1,13 @@
 import os
 import urllib.request
+import urllib.error
 import ssl
 from typing import Any
+import http.client
+
 # noinspection PyPackageRequirements
 import certifi
 
-
 from .archiver import zips
 from .urls import url_parser
 from .file_io import file_io
@@ -211,12 +213,34 @@ def download(
     # Create a default SSL context using the certifi CA store.
     # This is useful for environments where the system's CA store is not available or not trusted.
     # 'certifi.where()' returns the path to the certifi CA bundle.
-    ssl_context = ssl.create_default_context(cafile=certifi.where())
+    ssl_context: ssl.SSLContext = ssl.create_default_context(cafile=certifi.where())
 
     # In order to use 'urllib.request', it is not enough to 'import urllib', you need to 'import urllib.request'.
     # Build a Request object with headers if provided.
     req = urllib.request.Request(file_url, headers=headers or {})
-    file_to_download = urllib.request.urlopen(req, context=ssl_context)
+
+    def do_urlopen(ssl_context_internal: ssl.SSLContext) -> http.client.HTTPResponse | None:
+        try:
+            response: http.client.HTTPResponse = urllib.request.urlopen(req, context=ssl_context_internal)
+            return response
+        except urllib.error.URLError as e:
+            if getattr(e, 'reason', None) and isinstance(e.reason, ssl.SSLCertVerificationError):
+                if getattr(e.reason, 'reason', None) and e.reason.reason == 'CERTIFICATE_VERIFY_FAILED':
+                    if getattr(e.reason, 'verify_message', None) and e.reason.verify_message == 'unable to get local issuer certificate':
+                        return None
+
+            raise e
+
+    # Try to open the URL with the created SSL context with certifi.
+    file_to_download = do_urlopen(ssl_context_internal=ssl_context)
+    if not file_to_download:
+        # If failed, try to open the URL with the system's default SSL context.
+        ssl_context = ssl.create_default_context()
+        file_to_download = do_urlopen(ssl_context_internal=ssl_context)
+        if not file_to_download:
+            print_api.print_api(
+                'ERROR: URL open failed with both certifi and system\'s default SSL context.', error_type=True, **kwargs)
+            return None
 
     # Check status of url.
     if not is_status_ok(status_code=file_to_download.status, **kwargs):

atomicshop/wrappers/githubw.py

@@ -21,7 +21,7 @@ class GitHubWrapper:
             user_name: str = None,
             repo_name: str = None,
             repo_url: str = None,
-            branch: str = 'master',
+            branch: str = 'main',
             path: str = None,
             pat: str = None,
             branch_file_extension: Literal[

atomicshop/wrappers/socketw/socket_wrapper.py

@@ -1,5 +1,7 @@
 import multiprocessing
 import threading
+import time
+
 import select
 from typing import Literal, Union, Callable, Any
 from pathlib import Path
@@ -568,7 +570,22 @@ class SocketWrapper:
                 if client_socket:
                     # Get the protocol type from the socket.
                     is_tls: bool = False
-                    tls_properties = ssl_base.is_tls(client_socket)
+
+                    time.sleep(1)  # Wait a second to gather some data.
+                    try:
+                        tls_properties = ssl_base.is_tls(client_socket)
+                    except ConnectionResetError as e:
+                        self.statistics_writer.write_accept_error(
+                            engine=engine_name,
+                            source_host=source_hostname,
+                            source_ip=source_ip,
+                            error_message=str(e),
+                            dest_port=str(dest_port),
+                            host=domain_from_engine,
+                            process_name=process_name)
+
+                        continue
+
                     if tls_properties:
                         is_tls = True
                         tls_type, tls_version = tls_properties
@@ -682,6 +699,7 @@ class SocketWrapper:
                         host=domain_from_engine,
                         process_name=process_name)
             except Exception as e:
+
                 self.exceptions_logger.write(e)
 
 

{atomicshop-3.3.22.dist-info → atomicshop-3.3.24.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: atomicshop
-Version: 3.3.22
+Version: 3.3.24
 Summary: Atomic functions and classes to make developer life easier
 Author: Denis Kras
 License-Expression: MIT
@@ -8,7 +8,7 @@ Project-URL: Homepage, https://github.com/BugSec-Official/atomicshop
 Classifier: Intended Audience :: Developers
 Classifier: Programming Language :: Python :: 3
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
-Requires-Python: >=3.10
+Requires-Python: <3.13,>=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
 Requires-Dist: wheel

{atomicshop-3.3.22.dist-info → atomicshop-3.3.24.dist-info}/RECORD

@@ -1,4 +1,4 @@
-atomicshop/__init__.py,sha256=CwR_3jqYkF_a_nmrM3h4bWwuqn_DXHc7ThZPhoeOZoE,123
+atomicshop/__init__.py,sha256=BNlDCkYh5Y719V4A5KzdBQCz8nL2MOid4wXu4pqzNw8,123
 atomicshop/_basics_temp.py,sha256=6cu2dd6r2dLrd1BRNcVDKTHlsHs_26Gpw8QS6v32lQ0,3699
 atomicshop/_create_pdf_demo.py,sha256=Yi-PGZuMg0RKvQmLqVeLIZYadqEZwUm-4A9JxBl_vYA,3713
 atomicshop/_patch_import.py,sha256=ENp55sKVJ0e6-4lBvZnpz9PQCt3Otbur7F6aXDlyje4,6334
@@ -48,7 +48,7 @@ atomicshop/uuids.py,sha256=JSQdm3ZTJiwPQ1gYe6kU0TKS_7suwVrHc8JZDGYlydM,2214
 atomicshop/venvs.py,sha256=D9lwOoObkYoRx-weuoAmbvN-RdSHhVm4DE9TVl-utAs,903
 atomicshop/versioning.py,sha256=e5W6m9AF3__M5nntqI9CqNAeHqkwY9JhlnpYeZ1CEus,970
 atomicshop/virtualization.py,sha256=LPP4vjE0Vr10R6DA4lqhfX_WaNdDGRAZUW0Am6VeGco,494
-atomicshop/web.py,sha256=zceiDUNIJfSSOKXNaKthvQJpIkU_sTTCWDEBbIQ_K5g,13068
+atomicshop/web.py,sha256=mHWrHb-zl0NRg7oHBZr-0k66aTBmKLvanBzoCZ63Xks,14340
 atomicshop/websocket_parse.py,sha256=aLHWyKqaYqEn_MRBWm2L6rIl6QPmqbVrjEXE_rBzwCw,16711
 atomicshop/a_installs/ubuntu/docker_rootless.py,sha256=9IPNtGZYjfy1_n6ZRt7gWz9KZgR6XCgevjqq02xk-o0,281
 atomicshop/a_installs/ubuntu/docker_sudo.py,sha256=JzayxeyKDtiuT4Icp2L2LyFRbx4wvpyN_bHLfZ-yX5E,281
@@ -187,7 +187,7 @@ atomicshop/wrappers/astw.py,sha256=VkYfkfyc_PJLIOxByT6L7B8uUmKY6-I8XGZl4t_z828,4
 atomicshop/wrappers/configparserw.py,sha256=JwDTPjZoSrv44YKwIRcjyUnpN-FjgXVfMqMK_tJuSgU,22800
 atomicshop/wrappers/cryptographyw.py,sha256=QEUpDn8vUvMg3ADz6-4oC2kbDNC_woDlw7C0zU7qFVM,14233
 atomicshop/wrappers/ffmpegw.py,sha256=wcq0ZnAe0yajBOuTKZCCaKI7CDBjkq7FAgdW5IsKcVE,6031
-atomicshop/wrappers/githubw.py,sha256=PpG0U1MRoDY2LLYpLxnoUbSb8Pz9d47HtwBnOwxMaRY,27550
+atomicshop/wrappers/githubw.py,sha256=BEEJuWd1eBfiv1FSgb76D4nEBRpFU9j37lztn-KbYa4,27548
 atomicshop/wrappers/netshw.py,sha256=8WE_576XiiHykwFuE-VkCx5CydMpFlztX4frlEteCtI,6350
 atomicshop/wrappers/numpyw.py,sha256=sBV4gSKyr23kXTalqAb1oqttzE_2XxBooCui66jbAqc,1025
 atomicshop/wrappers/olefilew.py,sha256=biD5m58rogifCYmYhJBrAFb9O_Bn_spLek_9HofLeYE,2051
@@ -308,14 +308,14 @@ atomicshop/wrappers/socketw/sender.py,sha256=aX_K8l_rHjd5AWb8bi5mt8-YTkMYVRDB6Dn
 atomicshop/wrappers/socketw/sni.py,sha256=uj6KKYKmSrzXcKBhVLaHQhYn1wNfIUpdnmcvn21V9iE,18176
 atomicshop/wrappers/socketw/socket_client.py,sha256=WWIiCxUX9irN9aWzJ6-1xrXNB_iv_diq3ha1yrWsNGU,22671
 atomicshop/wrappers/socketw/socket_server_tester.py,sha256=Qobmh4XV8ZxLUaw-eW4ESKAbeSLecCKn2OWFzMhadk0,6420
-atomicshop/wrappers/socketw/socket_wrapper.py,sha256=8tRoccWvnDNXaK2iYsT68RyxHHjILdPjw2R7SxPC6go,41621
+atomicshop/wrappers/socketw/socket_wrapper.py,sha256=YZG15mhldOKeTqGOJ0J5YUrT6ZjDczk3zkmz-qNyRL8,42277
 atomicshop/wrappers/socketw/ssl_base.py,sha256=62-hPm7zla1rh3m_WvDnXqKH-sDUTdiRptD8STCkgdk,2313
 atomicshop/wrappers/socketw/statistics_csv.py,sha256=_gA8bMX6Sw_UCXKi2y9wNAwlqifgExgDGfQIa9pFxQA,5543
 atomicshop/wrappers/winregw/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 atomicshop/wrappers/winregw/winreg_installed_software.py,sha256=Qzmyktvob1qp6Tjk2DjLfAqr_yXV0sgWzdMW_9kwNjY,2345
 atomicshop/wrappers/winregw/winreg_network.py,sha256=ih0BVNwByLvf9F_Lac4EdmDYYJA3PzMvmG0PieDZrsE,9905
-atomicshop-3.3.22.dist-info/licenses/LICENSE.txt,sha256=lLU7EYycfYcK2NR_1gfnhnRC8b8ccOTElACYplgZN88,1094
-atomicshop-3.3.22.dist-info/METADATA,sha256=XyMxJFTTJwHywcPPUpS42MjToQQiaXSP6vjxpdphYH0,9312
-atomicshop-3.3.22.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-atomicshop-3.3.22.dist-info/top_level.txt,sha256=EgKJB-7xcrAPeqTRF2laD_Np2gNGYkJkd4OyXqpJphA,11
-atomicshop-3.3.22.dist-info/RECORD,,
+atomicshop-3.3.24.dist-info/licenses/LICENSE.txt,sha256=lLU7EYycfYcK2NR_1gfnhnRC8b8ccOTElACYplgZN88,1094
+atomicshop-3.3.24.dist-info/METADATA,sha256=fb1OsnGbWGATd0fNLjhFrbzs_N-FLryohFjpdsl27QU,9318
+atomicshop-3.3.24.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+atomicshop-3.3.24.dist-info/top_level.txt,sha256=EgKJB-7xcrAPeqTRF2laD_Np2gNGYkJkd4OyXqpJphA,11
+atomicshop-3.3.24.dist-info/RECORD,,