fluidattacks-core 2.15.7__tar.gz → 2.16.0__tar.gz

{fluidattacks_core-2.15.7 → fluidattacks_core-2.16.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fluidattacks-core
-Version: 2.15.7
+Version: 2.16.0
 Summary: Fluid Attacks Core Library
 Author-email: Development <development@fluidattacks.com>
 License: MPL-2.0
@@ -49,6 +49,7 @@ Requires-Dist: platformdirs>=4.3.8; extra == "cpg"
 Provides-Extra: filesystem
 Provides-Extra: sarif
 Requires-Dist: pydantic>=2.12.3; extra == "sarif"
+Provides-Extra: semver
 Provides-Extra: all
 Requires-Dist: fluidattacks-core[aio]; extra == "all"
 Requires-Dist: fluidattacks-core[authz]; extra == "all"
@@ -59,6 +60,7 @@ Requires-Dist: fluidattacks-core[serializers]; extra == "all"
 Requires-Dist: fluidattacks-core[filesystem]; extra == "all"
 Requires-Dist: fluidattacks-core[cpg]; extra == "all"
 Requires-Dist: fluidattacks-core[sarif]; extra == "all"
+Requires-Dist: fluidattacks-core[semver]; extra == "all"
 
 # Fluid Attacks Core Library
 

{fluidattacks_core-2.15.7 → fluidattacks_core-2.16.0}/fluidattacks_core/aio/tasks.py

@@ -165,7 +165,8 @@ async def merge_async_generators(
 
     """
     if limit < 1:
-        raise ValueError("limit must be at least 1")
+        msg = "limit must be at least 1"
+        raise ValueError(msg)
 
     queue: asyncio.Queue[T | object] = asyncio.Queue()
     active_generators = [0]  # Use list to allow modification in nested function

{fluidattacks_core-2.15.7 → fluidattacks_core-2.16.0}/fluidattacks_core/git/__init__.py

@@ -131,9 +131,9 @@ async def get_line_author(
         OSError,
         SubprocessError,
         UnicodeDecodeError,
-    ) as exc:
+    ):
         LOGGER.exception(
-            exc,
+            "An error occurred while getting the line author",
             extra={
                 "extra": {
                     "repo_path": repo_path,
@@ -200,7 +200,7 @@ async def is_commit_in_branch(
     return branch in stdout.decode()
 
 
-def rebase(
+def rebase(  # noqa: PLR0913
     repo: Repo,
     *,
     path: str,
@@ -223,9 +223,9 @@ def rebase(
             M=True,
             C=True,
         ).splitlines()
-    except GitError as exc:
+    except GitError:
         if ignore_errors:
-            LOGGER.exception(exc)
+            LOGGER.exception("A git error occurred while rebasing")
             return None
 
         raise
@@ -240,10 +240,10 @@ def rebase(
         new_path = (
             new_path.encode("latin-1").decode("unicode-escape").encode("latin-1").decode("utf-8")
         ).strip('"')
-    except (UnicodeDecodeError, UnicodeEncodeError) as exc:
+    except (UnicodeDecodeError, UnicodeEncodeError):
         if ignore_errors:
             LOGGER.exception(
-                exc,
+                "Error decoding the new path",
                 extra={
                     "extra": {
                         "path": path,
@@ -267,7 +267,7 @@ def get_head_commit(path_to_repo: Path, branch: str) -> str | None:
         return None
 
 
-async def clone(
+async def clone(  # noqa: PLR0913
     repo_url: str,
     repo_branch: str,
     *,

{fluidattacks_core-2.15.7 → fluidattacks_core-2.16.0}/fluidattacks_core/git/classes.py

@@ -18,7 +18,7 @@ class RebaseResult(NamedTuple):
     rev: str
 
 
-class InvalidParameter(Exception):
+class InvalidParameter(Exception):  # noqa: N818
     """Exception to control empty required parameters."""
 
     def __init__(self, field: str = "") -> None:

{fluidattacks_core-2.15.7 → fluidattacks_core-2.16.0}/fluidattacks_core/git/clone.py

@@ -75,14 +75,14 @@ async def ssh_clone(
         )
         _, stderr = await proc.communicate()
     except OSError as ex:
-        LOGGER.exception(ex, extra={"extra": {"branch": branch, "repo": repo_url}})
+        LOGGER.exception(MSG, extra={"extra": {"branch": branch, "repo": repo_url}})
 
         return None, str(ex)
 
-    os.remove(ssh_file_name)
+    os.remove(ssh_file_name)  # noqa: PTH107
 
     if mirror and proc.returncode == 0:
-        with open(f"{folder_to_clone_root}/.info.json", "w") as f:  # noqa: ASYNC230
+        with open(f"{folder_to_clone_root}/.info.json", "w") as f:  # noqa: ASYNC230,PTH123
             json.dump({"fluid_branch": branch, "repo": repo_url}, f)
     if proc.returncode == 0:
         return (folder_to_clone_root, None)
@@ -92,7 +92,7 @@ async def ssh_clone(
     return (None, stderr.decode("utf-8"))
 
 
-async def https_clone(
+async def https_clone(  # noqa: PLR0913
     *,
     branch: str,
     repo_url: str,
@@ -149,12 +149,12 @@ async def https_clone(
         )
         _, stderr = await proc.communicate()
     except OSError as ex:
-        LOGGER.exception(ex, extra={"extra": {"branch": branch, "repo": repo_url}})
+        LOGGER.exception(MSG, extra={"extra": {"branch": branch, "repo": repo_url}})
 
         return None, str(ex)
 
     if mirror and proc.returncode == 0:
-        with open(f"{folder_to_clone_root}/.info.json", "w") as f:  # noqa: ASYNC230
+        with open(f"{folder_to_clone_root}/.info.json", "w") as f:  # noqa: ASYNC230,PTH123
             json.dump({"fluid_branch": branch, "repo": repo_url}, f)
 
     if proc.returncode == 0:
@@ -165,7 +165,7 @@ async def https_clone(
     return (None, stderr.decode("utf-8"))
 
 
-async def codecommit_clone(
+async def codecommit_clone(  # noqa: PLR0913
     *,
     env: dict[str, str],
     branch: str,
@@ -202,12 +202,12 @@ async def codecommit_clone(
         )
         _, stderr = await proc.communicate()
     except OSError as ex:
-        LOGGER.exception(ex, extra={"extra": {"branch": branch, "repo": repo_url}})
+        LOGGER.exception(MSG, extra={"extra": {"branch": branch, "repo": repo_url}})
 
         return None, str(ex)
 
     if mirror and proc.returncode == 0:
-        with open(f"{folder_to_clone_root}/.info.json", "w") as f:  # noqa: ASYNC230
+        with open(f"{folder_to_clone_root}/.info.json", "w") as f:  # noqa: ASYNC230, PTH123
             json.dump({"fluid_branch": branch, "repo": repo_url}, f)
 
     if proc.returncode == 0:
@@ -218,7 +218,7 @@ async def codecommit_clone(
     return (None, stderr.decode("utf-8"))
 
 
-async def call_codecommit_clone(
+async def call_codecommit_clone(  # noqa: PLR0913
     *,
     branch: str,
     repo_url: str,
@@ -252,7 +252,7 @@ async def call_codecommit_clone(
         )
 
     except ClientError as exc:
-        LOGGER.error(
+        LOGGER.exception(
             MSG,
             extra={
                 "extra": {

{fluidattacks_core-2.15.7 → fluidattacks_core-2.16.0}/fluidattacks_core/git/delete_files.py

@@ -15,7 +15,7 @@ def delete_out_of_scope_files(git_ignore: list[str], repo_path: str) -> None:
         if match.startswith(".git/"):
             continue
 
-        file_path = os.path.join(repo_path, match)
+        file_path = os.path.join(repo_path, match)  # noqa: PTH118
         if Path(file_path).is_file():
             with suppress(FileNotFoundError):
                 Path(file_path).unlink()
@@ -23,10 +23,12 @@ def delete_out_of_scope_files(git_ignore: list[str], repo_path: str) -> None:
     # remove empty directories
     for root, dirs, _ in os.walk(repo_path, topdown=False):
         for dir_name in dirs:
-            dir_path = os.path.join(root, dir_name)
+            dir_path = os.path.join(root, dir_name)  # noqa: PTH118
             try:
                 if not os.listdir(dir_path):  # noqa: PTH208
                     Path(dir_path).rmdir()
-            except FileNotFoundError as exc:
-                LOGGER.exception(exc, extra={"extra": {"dir_path": dir_path}})
+            except FileNotFoundError:
+                LOGGER.exception(
+                    "Error removing empty directory", extra={"extra": {"dir_path": dir_path}}
+                )
                 continue

{fluidattacks_core-2.15.7 → fluidattacks_core-2.16.0}/fluidattacks_core/git/download_file.py

@@ -8,7 +8,7 @@ LOGGER = logging.getLogger(__name__)
 
 
 async def download_file(url: str, destination_path: str) -> bool:
-    async with aiohttp.ClientSession(timeout=aiohttp.ClientTimeout(total=3600)) as session:
+    async with aiohttp.ClientSession(timeout=aiohttp.ClientTimeout(total=3600)) as session:  # noqa: SIM117
         async with session.get(url) as response:
             if response.status == 200:
                 async with aiofiles.open(destination_path, "wb") as file:

{fluidattacks_core-2.15.7 → fluidattacks_core-2.16.0}/fluidattacks_core/git/download_repo.py

@@ -30,8 +30,8 @@ def _safe_extract_tar(tar_handler: tarfile.TarFile, file_path: Path) -> bool:
             continue
         try:
             tar_handler.extract(member, path=file_path, numeric_owner=True)
-        except tarfile.ExtractError as ex:
-            LOGGER.error("Error extracting %s: %s", member.name, ex)
+        except tarfile.ExtractError:
+            LOGGER.exception("Error extracting %s", member.name)
 
     return True
 
@@ -39,7 +39,7 @@ def _safe_extract_tar(tar_handler: tarfile.TarFile, file_path: Path) -> bool:
 def remove_symlinks_in_directory(directory: str) -> None:
     for root, _, files in os.walk(directory):
         for file in files:
-            file_path = os.path.join(root, file)
+            file_path = os.path.join(root, file)  # noqa: PTH118
             if Path(file_path).is_symlink():
                 Path(file_path).unlink(missing_ok=True)
 
@@ -47,10 +47,8 @@ def remove_symlinks_in_directory(directory: str) -> None:
 async def reset_repo(repo_path: str) -> bool:
     try:
         Path.cwd()
-    except OSError as exc:
-        LOGGER.error("Failed to get the working directory: %s", repo_path)
-        LOGGER.error(exc)
-        LOGGER.error("\n")
+    except OSError:
+        LOGGER.exception("Failed to get the working directory: %s", repo_path)
         os.chdir(repo_path)
 
     try:
@@ -64,19 +62,14 @@ async def reset_repo(repo_path: str) -> bool:
                 "*",
             ],
         )
-    except GitError as exc:
-        LOGGER.error("Failed to add safe directory %s", repo_path)
-        LOGGER.error(exc)
-        LOGGER.error("\n")
+    except GitError:
+        LOGGER.exception("Failed to add safe directory %s", repo_path)
 
     try:
         repo = Repo(repo_path)
         repo.git.reset("--hard", "HEAD")
-    except GitError as exc:
-        LOGGER.error("Expand repositories has failed:")
-        LOGGER.error("Repository: %s", repo_path)
-        LOGGER.error(exc)
-        LOGGER.error("\n")
+    except GitError:
+        LOGGER.exception("Expand repositories has failed for repository %s", repo_path)
 
         return False
 
@@ -121,8 +114,10 @@ async def download_repo_from_s3(
 
             shutil.move(extracted_dir, destination_path)
 
-        except OSError as ex:
-            LOGGER.exception(ex, extra={"extra": {"path": destination_path}})
+        except OSError:
+            LOGGER.exception(
+                "Error downloading repository", extra={"extra": {"path": destination_path}}
+            )
             return False
 
     if not await reset_repo(str(destination_path.absolute())):

{fluidattacks_core-2.15.7 → fluidattacks_core-2.16.0}/fluidattacks_core/git/https_utils.py

@@ -90,7 +90,8 @@ async def _get_url(
         original = parse_url(original_url.removesuffix("/"))
         url = parse_url(redirect_url.removesuffix("/")) if redirect_url else original
     except LocationParseError as exc:
-        raise HTTPValidationError(f"Invalid URL {redirect_url}") from exc
+        msg = f"Invalid URL {redirect_url}"
+        raise HTTPValidationError(msg) from exc
 
     if max_retries < 1:
         return format_redirected_url(original, url)
@@ -174,7 +175,7 @@ async def _execute_git_command(
     return stdout, _stderr, proc.returncode
 
 
-async def https_ls_remote(
+async def https_ls_remote(  # noqa: PLR0913
     *,
     repo_url: str,
     branch: str,
@@ -210,7 +211,7 @@ async def https_ls_remote(
     return None, stderr.decode("utf-8")
 
 
-async def call_https_ls_remote(
+async def call_https_ls_remote(  # noqa: PLR0913
     *,
     repo_url: str,
     user: str | None,

{fluidattacks_core-2.15.7 → fluidattacks_core-2.16.0}/fluidattacks_core/git/remote.py

@@ -3,7 +3,7 @@ from .https_utils import call_https_ls_remote
 from .ssh_utils import call_ssh_ls_remote
 
 
-async def ls_remote(
+async def ls_remote(  # noqa: PLR0913
     repo_url: str,
     repo_branch: str,
     *,

{fluidattacks_core-2.15.7 → fluidattacks_core-2.16.0}/fluidattacks_core/git/ssh_utils.py

@@ -10,8 +10,7 @@ def _add_ssh_scheme_to_url(url: str) -> str:
     scheme: str = "ssh://"
     if url.startswith(scheme):
         return url
-    url_with_scheme = scheme + url
-    return url_with_scheme
+    return scheme + url
 
 
 def _url_has_port(url: str) -> bool:
@@ -65,8 +64,7 @@ def _set_default_ssh_port(url_with_scheme: str) -> str:
     if len(url_parts) < 3:
         return url_with_scheme
 
-    url_with_default_port = f"{url_parts[0]}:{url_parts[1]}:/{url_parts[2]}"
-    return url_with_default_port
+    return f"{url_parts[0]}:{url_parts[1]}:/{url_parts[2]}"
 
 
 def parse_ssh_url(url: str) -> str:
@@ -76,13 +74,12 @@ def parse_ssh_url(url: str) -> str:
     url_with_scheme = _add_ssh_scheme_to_url(url)
 
     # url misses an explicit ssh port
-    url_with_default_ssh_port = _set_default_ssh_port(url_with_scheme)
-    return url_with_default_ssh_port
+    return _set_default_ssh_port(url_with_scheme)
 
 
 def _create_ssh_file(temp_dir: str, credential_key: str) -> str:
-    ssh_file_name: str = os.path.join(temp_dir, str(uuid.uuid4()))
-    with open(
+    ssh_file_name: str = os.path.join(temp_dir, str(uuid.uuid4()))  # noqa: PTH118
+    with open(  # noqa: PTH123
         os.open(ssh_file_name, os.O_CREAT | os.O_WRONLY, 0o400),
         "w",
         encoding="utf-8",
@@ -139,7 +136,7 @@ async def ssh_ls_remote(
             return None, "git ls-remote time out"
 
         finally:
-            os.remove(ssh_file_name)
+            os.remove(ssh_file_name)  # noqa: PTH107
 
         if return_code == 0:
             return stdout.decode().split("\t")[0], None

{fluidattacks_core-2.15.7 → fluidattacks_core-2.16.0}/fluidattacks_core/git/utils.py

@@ -25,9 +25,7 @@ def _format_token(
     provider: str | None,
 ) -> str:
     formatted_token = _format_token_for_provider(provider, token, host)
-    url = _replace_netloc_in_url(parsed_url, formatted_token)
-
-    return url
+    return _replace_netloc_in_url(parsed_url, formatted_token)
 
 
 def _quote_if_not_none(value: str | None) -> str | None:
@@ -36,8 +34,7 @@ def _quote_if_not_none(value: str | None) -> str | None:
 
 def _quote_path_in_url(url: str) -> ParseResult:
     parsed_url = urlparse(url)
-    parsed_url = parsed_url._replace(path=quote(unquote(parsed_url.path)))
-    return parsed_url
+    return parsed_url._replace(path=quote(unquote(parsed_url.path)))
 
 
 def _get_host_from_url(parsed_url: ParseResult) -> str:
@@ -47,7 +44,7 @@ def _get_host_from_url(parsed_url: ParseResult) -> str:
     return host
 
 
-def _get_url_based_on_credentials(
+def _get_url_based_on_credentials(  # noqa: PLR0913
     *,
     parsed_url: ParseResult,
     token: str | None,
@@ -63,7 +60,7 @@ def _get_url_based_on_credentials(
     return parsed_url.geturl()
 
 
-def format_url(
+def format_url(  # noqa: PLR0913
     *,
     repo_url: str,
     user: str | None = None,
@@ -79,7 +76,7 @@ def format_url(
     host = _get_host_from_url(parsed_url)
     user = _quote_if_not_none(user)
     password = _quote_if_not_none(password)
-    url = _get_url_based_on_credentials(
+    return _get_url_based_on_credentials(
         parsed_url=parsed_url,
         token=token,
         host=host,
@@ -87,5 +84,3 @@ def format_url(
         user=user,
         password=password,
     )
-
-    return url

{fluidattacks_core-2.15.7 → fluidattacks_core-2.16.0}/fluidattacks_core/git/warp.py

@@ -18,7 +18,7 @@ class WarpError(Exception):
 async def test_public_ip(expected_ip: str) -> bool:
     ip_service_url = "https://api.ipify.org?format=text"
     try:
-        async with aiohttp.ClientSession() as session:
+        async with aiohttp.ClientSession() as session:  # noqa: SIM117
             async with session.get(ip_service_url) as response:
                 if response.status == 200:
                     public_ip = await response.text()
@@ -28,8 +28,8 @@ async def test_public_ip(expected_ip: str) -> bool:
                 LOGGER.error("Failed to fetch public IP. Status code: %s", response.status)
                 return False
 
-    except aiohttp.ClientError as ex:
-        LOGGER.exception(ex)
+    except aiohttp.ClientError:
+        LOGGER.exception("Error fetching public IP")
         return False
 
 
@@ -86,10 +86,12 @@ async def warp_cli(*args: str) -> str:
     try:
         stdout, stderr = await asyncio.wait_for(proc.communicate(), 30)
     except (asyncio.exceptions.TimeoutError, OSError) as ex:
-        raise WarpError("Failed to run command") from ex
+        msg = "Failed to run command"
+        raise WarpError(msg) from ex
 
     if proc.returncode != 0:
-        raise WarpError(stderr.decode().strip())
+        msg = stderr.decode().strip()
+        raise WarpError(msg)
 
     return stdout.decode().strip()
 
@@ -103,7 +105,8 @@ async def warp_cli_connect() -> None:
     LOGGER.info("Connect: %s", response)
     await asyncio.sleep(CONFIG_DELAY)
     if not await is_dns_ready(host_to_test_dns=DOMAIN_TO_TEST_DNS):
-        raise WarpError("Failed to resolve DNS")
+        msg = "Failed to resolve DNS"
+        raise WarpError(msg)
 
     LOGGER.info("Connected. Status: %s", await warp_cli_status())
 
@@ -121,7 +124,8 @@ async def warp_cli_get_virtual_network_id(vnet_name: str) -> str:
         await warp_cli("vnet"),
     )
     if not vnet_id_match:
-        raise WarpError(f"Failed to find virtual network {vnet_name}")
+        msg = f"Failed to find virtual network {vnet_name}"
+        raise WarpError(msg)
 
     return vnet_id_match.groups()[0]
 
@@ -159,10 +163,12 @@ async def _ip_route_get(host: str) -> tuple[bytes, bytes]:
     try:
         stdout, stderr = await asyncio.wait_for(proc.communicate(), 5)
     except asyncio.exceptions.TimeoutError as ex:
-        raise WarpError("Timeout - Failed to retrieve route") from ex
+        msg = "Timeout - Failed to retrieve route"
+        raise WarpError(msg) from ex
 
     if proc.returncode != 0:
-        raise WarpError(stderr.decode())
+        msg = stderr.decode()
+        raise WarpError(msg)
 
     return stdout, stderr
 
@@ -171,8 +177,8 @@ async def is_using_split_tunnel(host: str) -> bool:
     try:
         stdout, _ = await _ip_route_get(host)
         LOGGER.info("Route command for '%s': %s", host, stdout.decode().replace("\n", " "))
-    except WarpError as ex:
-        LOGGER.exception(ex)
+    except WarpError:
+        LOGGER.exception("Error getting IP route in split tunnel")
         return False
     else:
         return b"CloudflareWARP" in stdout

{fluidattacks_core-2.15.7 → fluidattacks_core-2.16.0}/fluidattacks_core/http/client.py

@@ -39,7 +39,7 @@ def get_secure_connector(
     return SecureTCPConnector
 
 
-async def request(
+async def request(  # noqa: PLR0913
     url: str,
     *,
     method: Literal["GET", "POST", "PUT", "PATCH", "DELETE"],
@@ -49,10 +49,10 @@ async def request(
     dns_rebind_protection: bool = True,
     enforce_sanitization: bool = False,
     headers: dict[str, str] | None = None,
-    json: Any | None = None,
+    json: Any | None = None,  # noqa: ANN401
     ports: list[int] | None = None,
     schemes: list[str] | None = None,
-    timeout: int = 10,
+    timeout: int = 10,  # noqa: ASYNC109
 ) -> aiohttp.ClientResponse:
     validate_url(
         url,
@@ -73,16 +73,18 @@ async def request(
         ssl=ssl.create_default_context(cafile=certifi.where()),
     )
 
-    async with aiohttp.ClientSession(
-        connector=connection,
-        headers=headers,
-    ) as session:
-        async with session.request(
+    async with (
+        aiohttp.ClientSession(
+            connector=connection,
+            headers=headers,
+        ) as session,
+        session.request(
             method,
             url,
             allow_redirects=not dns_rebind_protection,
             json=json,
             timeout=aiohttp.ClientTimeout(total=timeout),
-        ) as response:
-            await response.read()
-            return response
+        ) as response,
+    ):
+        await response.read()
+        return response

{fluidattacks_core-2.15.7 → fluidattacks_core-2.16.0}/fluidattacks_core/http/validations.py

@@ -11,14 +11,14 @@ class HTTPValidationError(Exception):
 
 def validate_scheme(scheme: str | None, schemes: list[str]) -> None:
     if scheme and scheme not in schemes:
-        raise HTTPValidationError(f"Only allowed schemes are {', '.join(schemes)}")
+        msg = f"Only allowed schemes are {', '.join(schemes)}"
+        raise HTTPValidationError(msg)
 
 
 def validate_port(port: int | None, ports: list[int]) -> None:
     if port and port < 1024 and port not in ports:
-        raise HTTPValidationError(
-            f"Only allowed ports are {', '.join(map(str, ports))}, and any over 1024",
-        )
+        msg = f"Only allowed ports are {', '.join(map(str, ports))}, and any over 1024"
+        raise HTTPValidationError(msg)
 
 
 def validate_host(host: str | None) -> None:
@@ -31,20 +31,23 @@ def validate_host(host: str | None) -> None:
             return
     else:
         return
-    raise HTTPValidationError("Hostname or IP address invalid")
+    msg = "Hostname or IP address invalid"
+    raise HTTPValidationError(msg)
 
 
 def validate_unicode_restriction(uri: Url) -> None:
     uri_str = str(uri)
     if not uri_str.isascii():
-        raise HTTPValidationError(f"URI must be ascii only {uri_str}")
+        msg = f"URI must be ascii only {uri_str}"
+        raise HTTPValidationError(msg)
 
 
 def validate_html_tags(uri: Url) -> None:
     uri_str = str(uri)
     sanitized_uri = html.escape(uri_str)
     if sanitized_uri != uri_str:
-        raise HTTPValidationError("HTML/CSS/JS tags are not allowed")
+        msg = "HTML/CSS/JS tags are not allowed"
+        raise HTTPValidationError(msg)
 
 
 def validate_url(
@@ -58,7 +61,8 @@ def validate_url(
     try:
         uri = parse_url(url)
     except LocationParseError as exc:
-        raise HTTPValidationError(f"Invalid URL {url}") from exc
+        msg = f"Invalid URL {url}"
+        raise HTTPValidationError(msg) from exc
     validate_host(uri.host)
 
     if ascii_only:
@@ -75,21 +79,24 @@ def validate_loopback(
     ips: list[ipaddress.IPv4Address | ipaddress.IPv6Address],
 ) -> None:
     if any(ip.is_loopback for ip in ips):
-        raise HTTPValidationError("Requests to loopback addresses are not allowed")
+        msg = "Requests to loopback addresses are not allowed"
+        raise HTTPValidationError(msg)
 
 
 def validate_local_network(
     ips: list[ipaddress.IPv4Address | ipaddress.IPv6Address],
 ) -> None:
     if any(ip.is_private for ip in ips):
-        raise HTTPValidationError("Requests to the local network are not allowed")
+        msg = "Requests to the local network are not allowed"
+        raise HTTPValidationError(msg)
 
 
 def validate_link_local(
     ips: list[ipaddress.IPv4Address | ipaddress.IPv6Address],
 ) -> None:
     if any(ip.is_link_local for ip in ips):
-        raise HTTPValidationError("Requests to the link local network are not allowed")
+        msg = "Requests to the link local network are not allowed"
+        raise HTTPValidationError(msg)
 
 
 def validate_shared_address(
@@ -97,7 +104,8 @@ def validate_shared_address(
 ) -> None:
     shared_address_space = ipaddress.ip_network("100.64.0.0/10")
     if any(ip in shared_address_space for ip in ips):
-        raise HTTPValidationError("Requests to the shared address space are not allowed")
+        msg = "Requests to the shared address space are not allowed"
+        raise HTTPValidationError(msg)
 
 
 def validate_limited_broadcast_address(
@@ -105,7 +113,8 @@ def validate_limited_broadcast_address(
 ) -> None:
     limited_broadcast_address = ipaddress.ip_address("255.255.255.255")
     if any(ip == limited_broadcast_address for ip in ips):
-        raise HTTPValidationError("Requests to the limited broadcast address are not allowed")
+        msg = "Requests to the limited broadcast address are not allowed"
+        raise HTTPValidationError(msg)
 
 
 def validate_local_request(

{fluidattacks_core-2.15.7 → fluidattacks_core-2.16.0}/fluidattacks_core/logging/formatters.py

@@ -48,8 +48,8 @@ class ColorfulFormatter(logging.Formatter):
 
 
 class CustomJsonFormatter(JsonFormatter):
-    def __init__(self, *args: Any, **kwargs: Any) -> None:
-        def json_default(object_: object) -> Any:
+    def __init__(self, *args: Any, **kwargs: Any) -> None:  # noqa: ANN401
+        def json_default(object_: object) -> Any:  # noqa: ANN401
             if isinstance(object_, set):
                 return list(object_)
             if isinstance(object_, datetime):