fluidattacks-core 2.2.0__tar.gz → 2.2.2__tar.gz

{fluidattacks_core-2.2.0 → fluidattacks_core-2.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fluidattacks-core
-Version: 2.2.0
+Version: 2.2.2
 Summary: Fluid Attacks Core Library
 License: MPL-2.0
 Author: Development

{fluidattacks_core-2.2.0 → fluidattacks_core-2.2.2}/fluidattacks_core/git/warp.py

@@ -1,3 +1,4 @@
+import aiohttp
 import asyncio
 import logging
 import re
@@ -12,6 +13,51 @@ class WarpError(Exception):
     pass
 
 
+async def _public_ip_test(expected_ip: str) -> bool:
+    ip_service_url = "https://api.ipify.org?format=text"
+
+    try:
+        async with aiohttp.ClientSession() as session:
+            async with session.get(ip_service_url) as response:
+                if response.status == 200:
+                    public_ip = await response.text()
+                    LOGGER.info("Current public IP: %s", public_ip)
+                    return public_ip.strip() == expected_ip
+
+                LOGGER.error(
+                    "Failed to fetch public IP. Status code: %s",
+                    response.status,
+                )
+                return False
+    except aiohttp.ClientError as error:
+        LOGGER.error("Error while fetching public IP: %s", error)
+        return False
+
+
+async def public_ip_ready(
+    expected_ip: str, *, attempts: int, seconds_per_attempt: int
+) -> bool:
+    for attempt_number in range(1, attempts + 1):
+        LOGGER.info(
+            "Checking public IP... Attempt %s/%s",
+            attempt_number,
+            attempts,
+        )
+        if await _public_ip_test(expected_ip):
+            LOGGER.info(
+                "Public IP test successful after %s attempts",
+                attempt_number,
+            )
+            return True
+        LOGGER.info(
+            "Public IP test failed. Retrying in %s seconds",
+            seconds_per_attempt,
+        )
+        await asyncio.sleep(seconds_per_attempt)
+    LOGGER.error("Public IP test failed after %s attempts", attempts)
+    return False
+
+
 async def _dns_test() -> bool:
     domain = "notify.bugsnag.com"  # Using a domain that used to fail
 

{fluidattacks_core-2.2.0 → fluidattacks_core-2.2.2}/fluidattacks_core/http/client.py

@@ -7,6 +7,7 @@ import certifi
 import ipaddress
 import ssl
 from typing import (
+    Any,
     Literal,
     Sequence,
 )
@@ -47,10 +48,12 @@ async def request(
     dns_rebind_protection: bool = True,
     enforce_sanitization: bool = False,
     headers: dict[str, str] | None = None,
+    json: Any | None = None,
     ports: list[int] | None = None,
     schemes: list[str] | None = None,
     timeout: int = 10,
 ) -> aiohttp.ClientResponse:
+    # pylint: disable=too-many-locals
     validate_url(
         url,
         ascii_only=ascii_only,
@@ -75,6 +78,7 @@ async def request(
             method,
             url,
             allow_redirects=not dns_rebind_protection,
+            json=json,
             timeout=aiohttp.ClientTimeout(total=timeout),
         ) as response:
             await response.read()

{fluidattacks_core-2.2.0 → fluidattacks_core-2.2.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "fluidattacks-core"
-version = "2.2.0"
+version = "2.2.2"
 description = "Fluid Attacks Core Library"
 authors = ["Development <development@fluidattacks.com>"]
 license = "MPL-2.0"