wormhole-proxy 3.3.2__tar.gz → 3.3.4__tar.gz

{wormhole_proxy-3.3.2 → wormhole_proxy-3.3.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: wormhole-proxy
-Version: 3.3.2
+Version: 3.3.4
 Summary: Asynchronous I/O HTTP and HTTPS Proxy on Python >= 3.11
 License: MIT
 Keywords: wormhole,asynchronous,web,proxy

{wormhole_proxy-3.3.2 → wormhole_proxy-3.3.4}/pyproject.toml

@@ -1,7 +1,7 @@
 # Main project metadata (PEP 621 standard)
 [project]
 name = "wormhole-proxy"
-version = "3.3.2"
+version = "3.3.4"
 description = "Asynchronous I/O HTTP and HTTPS Proxy on Python >= 3.11"
 readme = "README.md"
 authors = [

{wormhole_proxy-3.3.2 → wormhole_proxy-3.3.4}/wormhole/handler.py

@@ -303,9 +303,13 @@ async def process_https_tunnel(
 
     finally:
         # Ensure server streams are closed if they were opened.
-        if server_writer and not server_writer.is_closing():
+        if server_writer is not None and not server_writer.is_closing():
             server_writer.close()
-            await server_writer.wait_closed()
+            wc = getattr(server_writer, "wait_closed", None)
+            if callable(wc):
+                result = wc()
+                if asyncio.iscoroutine(result):
+                    await result
 
 
 async def _send_http_request(
@@ -432,7 +436,11 @@ async def process_http_request(
                 )
                 if server_writer and not server_writer.is_closing():
                     server_writer.close()
-                    await server_writer.wait_closed()
+                    wc = getattr(server_writer, "wait_closed", None)
+                    if callable(wc):
+                        result = wc()
+                        if asyncio.iscoroutine(result):
+                            await result
 
                 # Attempt 2: Fallback to original HTTP/1.0
                 original_headers = [

{wormhole_proxy-3.3.2 → wormhole_proxy-3.3.4}/wormhole/proxy.py

@@ -49,8 +49,16 @@ async def main_async(args) -> None:
             )
         )
 
+    # Initialize the resolver with the configured verbosity.
+    resolver.initialize(verbose=args.verbose)
+
     if args.allowlist:
-        num_allowed = load_allowlist(args.allowlist, args.host)
+        num_allowed = load_allowlist(
+            args.allowlist,
+            args.host,
+            ident={"id": "000000", "client": args.host},
+            verbose=args.verbose,
+        )
         if num_allowed > 0:
             logger.info(
                 flm(
@@ -61,7 +69,12 @@ async def main_async(args) -> None:
             )
 
     if args.ad_block_db:
-        num_blocked = await load_ad_block_db(args.ad_block_db, args.host)
+        num_blocked = await load_ad_block_db(
+            args.ad_block_db,
+            args.host,
+            ident={"id": "000000", "client": args.host},
+            verbose=args.verbose,
+        )
         if num_blocked > 0:
             logger.info(
                 flm(
@@ -73,11 +86,18 @@ async def main_async(args) -> None:
 
     shutdown_event = asyncio.Event()
 
+    def _shutdown_handler():
+        """Handles shutdown signals to gracefully stop the server."""
+        shutdown_event.set()
+
     # Set up signal handlers for graceful shutdown.
     loop = asyncio.get_running_loop()
-    for sig in (signal.SIGINT, signal.SIGTERM):
-        loop.add_signal_handler(sig, lambda: shutdown_event.set())
+    [
+        loop.add_signal_handler(sig, _shutdown_handler)
+        for sig in (signal.SIGINT, signal.SIGTERM)
+    ]
 
+    # Start the Wormhole server with the provided arguments.
     server = await start_wormhole_server(
         args.host,
         args.port,
@@ -86,6 +106,7 @@ async def main_async(args) -> None:
         args.allow_private,
     )
 
+    # Log the server startup completion, 000000 means internal server ID.
     logger.info(
         flm(
             "Server startup complete. Waiting for connections...",
@@ -246,7 +267,6 @@ def main() -> int:
         args.verbose,
         async_mode=is_server_mode,
     )
-    resolver.configure(verbose=args.verbose)
 
     if args.update_ad_block_db:
         # For this standalone utility, configure a simple logger to show progress.

{wormhole_proxy-3.3.2 → wormhole_proxy-3.3.4}/wormhole/resolver.py

@@ -32,12 +32,12 @@ class Resolver:
             self.resolver: aiodns.DNSResolver | None = None
             self.hosts_cache: dict[str, str] = {}
             self.verbose: int = 0  # Verbosity level, configured separately
-            self._load_hosts_file()
             Resolver._instance = self
 
-    def configure(self, verbose: int) -> None:
-        """Sets the verbosity level for logging."""
+    def initialize(self, verbose: int) -> None:
+        """Initializes the resolver with a verbosity level and loads the hosts file."""
         self.verbose = verbose
+        self._load_hosts_file()
 
     @staticmethod
     def get_instance() -> "Resolver":
@@ -64,7 +64,7 @@ class Resolver:
     def _load_hosts_file(self) -> None:
         """Parses the system's hosts file and populates the cache."""
         hosts_path = self._get_hosts_path()
-        ident = {"id": "resolver", "client": "internal"}
+        ident = {"id": "000000", "client": "0.0.0.0"}
 
         if not hosts_path.exists():
             logger.warning(
@@ -144,7 +144,10 @@ class Resolver:
         for res in results:
             if isinstance(res, list):
                 for record in res:
-                    resolved_ips.add(record.host)
+                    if isinstance(record.host, bytes):
+                        resolved_ips.add(record.host.decode())
+                    else:
+                        resolved_ips.add(record.host)
             elif isinstance(res, aiodns.error.DNSError):
                 # Ignore common "not found" errors. Log other DNS errors for debugging.
                 if res.args[0] not in (

{wormhole_proxy-3.3.2 → wormhole_proxy-3.3.4}/wormhole/safeguards.py

@@ -1,4 +1,4 @@
-from .logger import logger
+from .logger import logger, format_log_message as flm
 from functools import lru_cache
 import aiosqlite
 import ipaddress
@@ -7,6 +7,8 @@ import sys
 
 # A hardcoded default allowlist for most known safe domains.
 DEFAULT_ALLOWLIST: set[str] = {
+    "bit.ly",  # Bitly for URL shortening
+    "azurewebsites.net",  # Azure Web App
     "s3.amazonaws.com",  # Amazon S3 for static assets"
     "fonts.googleapis.com",  # Google Fonts
     "safebrowsing.googleapis.com",  # Google Safe Browsing for security
@@ -84,7 +86,9 @@ def is_private_ip(ip_str: str) -> bool:
         return True
 
 
-async def load_ad_block_db(path: str, host: str) -> int:
+async def load_ad_block_db(
+    path: str, host: str, ident: dict[str, str], verbose: int = 0
+) -> int:
     """
     Loads a list of domains to block from a SQLite database into a global set
     for fast in-memory access.
@@ -105,7 +109,11 @@ async def load_ad_block_db(path: str, host: str) -> int:
                     AD_BLOCK_SET.add(row[0])
     except Exception as e:
         logger.error(
-            f"[000000][{host}]: Could not load ad-block database from '{path}': {e}",
+            flm(
+                f"Could not load ad-block database from '{path}': {e}",
+                ident=ident,
+                verbose=verbose,
+            )
         )
 
     if AD_BLOCK_SET:
@@ -114,13 +122,19 @@ async def load_ad_block_db(path: str, host: str) -> int:
         content_size = sum(sys.getsizeof(s) for s in AD_BLOCK_SET)
         total_size_mb = (set_size + content_size) / (1024 * 1024)
         logger.debug(
-            f"[000000][{host}]: Ad-block set memory usage: ~{total_size_mb:.2f} MB for {len(AD_BLOCK_SET)} domains"
+            flm(
+                f"Ad-block set memory usage: ~{total_size_mb:.2f} MB for {len(AD_BLOCK_SET)} domains",
+                ident=ident,
+                verbose=verbose,
+            )
         )
 
     return len(AD_BLOCK_SET)
 
 
-def load_allowlist(path: str, host: str) -> int:
+def load_allowlist(
+    path: str, host: str, ident: dict[str, str], verbose: int = 0
+) -> int:
     """
     Loads domains from a user-provided file and adds them to the global allowlist set.
     """
@@ -130,7 +144,13 @@ def load_allowlist(path: str, host: str) -> int:
                 if line.strip() and not line.startswith("#"):
                     ALLOW_LIST_SET.add(line.strip().lower())
     except FileNotFoundError:
-        logger.error(f"[000000][{host}]: Allowlist file not found at '{path}'")
+        logger.error(
+            flm(
+                f"Allowlist file not found at '{path}'",
+                ident=ident,
+                verbose=verbose,
+            )
+        )
     return len(ALLOW_LIST_SET)