fluidattacks_core_models 14.0.0__tar.gz → 14.2.0__tar.gz

{fluidattacks_core_models-14.0.0 → fluidattacks_core_models-14.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: fluidattacks_core_models
-Version: 14.0.0
+Version: 14.2.0
 Summary: Fluid Attacks Core Models Library
 Author-email: Development <development@fluidattacks.com>
 License: MPL-2.0

{fluidattacks_core_models-14.0.0 → fluidattacks_core_models-14.2.0}/fluidattacks_core/models/scanners/__init__.py

@@ -20,6 +20,7 @@ from fluidattacks_core.models.scanners.dast_config import (
     DastUrl,
 )
 from fluidattacks_core.models.scanners.loader import build_config, load_yaml_mapping
+from fluidattacks_core.models.scanners.resolves_config import ResolvesConfig
 from fluidattacks_core.models.scanners.sast_config import SastConfig
 from fluidattacks_core.models.scanners.sbom_config import (
     SbomAwsCredentials,
@@ -32,6 +33,7 @@ from fluidattacks_core.models.scanners.sbom_config import (
 from fluidattacks_core.models.scanners.sca_config import ScaConfig
 from fluidattacks_core.models.scanners.scan_config import ScanConfig
 from fluidattacks_core.models.scanners.sniffs_config import SniffsConfig
+from fluidattacks_core.models.scanners.sspm_config import GithubApp, GithubPat, SspmConfig
 
 __all__ = [
     "ApkConfig",
@@ -49,9 +51,12 @@ __all__ = [
     "DockerCredentialsConfig",
     "EcrCredentialsConfig",
     "FalsePositivesConfig",
+    "GithubApp",
+    "GithubPat",
     "LocalesEnum",
     "OutputConfig",
     "OutputFormat",
+    "ResolvesConfig",
     "SastConfig",
     "SbomAwsCredentials",
     "SbomConfig",
@@ -62,6 +67,7 @@ __all__ = [
     "ScanConfig",
     "SniffsConfig",
     "SourceType",
+    "SspmConfig",
     "build_config",
     "load_yaml_mapping",
 ]

fluidattacks_core_models-14.2.0/fluidattacks_core/models/scanners/resolves_config.py

@@ -0,0 +1,6 @@
+from pydantic import BaseModel
+
+
+class ResolvesConfig(BaseModel):
+    model_config = {"extra": "forbid"}
+    hosts: list[str] = []

{fluidattacks_core_models-14.0.0 → fluidattacks_core_models-14.2.0}/fluidattacks_core/models/scanners/scan_config.py

@@ -9,10 +9,12 @@ from fluidattacks_core.models.scanners.common_config import (
 from fluidattacks_core.models.scanners.containers_sca_config import ContainersScaConfig
 from fluidattacks_core.models.scanners.cspm_config import CspmConfig
 from fluidattacks_core.models.scanners.dast_config import DastConfig
+from fluidattacks_core.models.scanners.resolves_config import ResolvesConfig
 from fluidattacks_core.models.scanners.sast_config import SastConfig
 from fluidattacks_core.models.scanners.sbom_config import SbomConfig
 from fluidattacks_core.models.scanners.sca_config import ScaConfig
 from fluidattacks_core.models.scanners.sniffs_config import SniffsConfig
+from fluidattacks_core.models.scanners.sspm_config import SspmConfig
 
 
 class ScanConfig(BaseModel):
@@ -34,6 +36,8 @@ class ScanConfig(BaseModel):
     sbom: SbomConfig | None = None
     dast: DastConfig | None = None
     cspm: CspmConfig | None = None
+    sspm: SspmConfig | None = None
     apk: ApkConfig | None = None
     false_positives_identified: FalsePositivesConfig | None = None
     ss: SniffsConfig | None = None
+    resolves: ResolvesConfig | None = None

fluidattacks_core_models-14.2.0/fluidattacks_core/models/scanners/sspm_config.py

@@ -0,0 +1,34 @@
+from pydantic import BaseModel, Field, field_validator
+
+from fluidattacks_core.models.scanners.loader import LoaderValidationInfo, resolve_env_var
+
+
+class GithubPat(BaseModel):
+    model_config = {"extra": "forbid"}
+    organization: str
+    pat_token: str = Field(repr=False)
+    environment_id: str | None = None
+
+    @field_validator("pat_token", mode="before")
+    @classmethod
+    def _resolve_credentials(cls, v: object, info: LoaderValidationInfo) -> object:
+        return resolve_env_var(v, info)
+
+
+class GithubApp(BaseModel):
+    model_config = {"extra": "forbid"}
+    organization: str
+    app_id: str
+    installation_id: str
+    private_key: str = Field(repr=False)
+    environment_id: str | None = None
+
+    @field_validator("private_key", mode="before")
+    @classmethod
+    def _resolve_credentials(cls, v: object, info: LoaderValidationInfo) -> object:
+        return resolve_env_var(v, info)
+
+
+class SspmConfig(BaseModel):
+    model_config = {"extra": "forbid"}
+    github_credentials: list[GithubPat | GithubApp] = []

{fluidattacks_core_models-14.0.0 → fluidattacks_core_models-14.2.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "fluidattacks_core_models"
-version = "14.0.0"
+version = "14.2.0"
 description = "Fluid Attacks Core Models Library"
 authors = [{ name = "Development", email = "development@fluidattacks.com" }]
 license = { text = "MPL-2.0" }

{fluidattacks_core_models-14.0.0 → fluidattacks_core_models-14.2.0}/tests/test_model_scanner.py

@@ -22,6 +22,7 @@ from fluidattacks_core.models.scanners import (
     LocalesEnum,
     OutputConfig,
     OutputFormat,
+    ResolvesConfig,
     SastConfig,
     SbomAwsCredentials,
     SbomConfig,
@@ -98,6 +99,11 @@ cspm:
     - role: arn:aws:iam::123456789012:role/ScanRole
       external_id: ext-123
       environment_id: prod
+sspm:
+  github_credentials:
+    - organization: octo-org
+      pat_token: ghp-token
+      environment_id: scm
 apk:
   environments:
     - apk_file_path: app.apk
@@ -229,6 +235,19 @@ def test_build_config_cspm(yaml_file: Path) -> None:
     assert role.environment_id == "prod"
 
 
+def test_build_config_sspm(yaml_file: Path) -> None:
+    config = build_config(str(yaml_file), ScanConfig)
+    assert config.sspm is not None
+    assert config.sspm.github_credentials[0].organization == "octo-org"
+
+
+def test_unknown_nested_key_sspm(tmp_path: Path) -> None:
+    f = tmp_path / "config.yaml"
+    f.write_text("sspm:\n  github_credentals: []\n")
+    with pytest.raises(ValidationError):
+        build_config(str(f), ScanConfig)
+
+
 def test_build_config_apk(yaml_file: Path) -> None:
     config = build_config(str(yaml_file), ScanConfig)
     assert config.apk is not None
@@ -258,6 +277,7 @@ def test_scan_config_defaults() -> None:
     assert config.checks is None
     assert config.sast is None
     assert config.dast is None
+    assert config.resolves is None
     assert config.cspm is None
     assert config.apk is None
 
@@ -517,6 +537,10 @@ def test_scan_config_ss_defaults() -> None:
     assert config.ss is None
 
 
+def test_resolves_config_defaults() -> None:
+    assert ResolvesConfig.model_validate({}).hosts == []
+
+
 def test_unknown_nested_key_sast(tmp_path: Path) -> None:
     f = tmp_path / "config.yaml"
     f.write_text("sast:\n  incldue:\n    - .\n")

{fluidattacks_core_models-14.0.0 → fluidattacks_core_models-14.2.0}/uv.lock

@@ -187,7 +187,7 @@ wheels = [
 
 [[package]]
 name = "fluidattacks-core-models"
-version = "14.0.0"
+version = "14.1.0"
 source = { editable = "." }
 dependencies = [
     { name = "pydantic" },

fluidattacks_core_models-14.0.0/build/default.nix

@@ -1,19 +0,0 @@
-{ src, workspace_root }:
-{
-  inherit src workspace_root;
-  root_path = "develops/fluidattacks-core/python/models";
-  module_name = "fluidattacks_core";
-  pypi_token = {
-    method = "oidc";
-  };
-  override = {
-    checks = {
-      basedpyright = false;
-    };
-    configs = {
-      import_linter = ../import-linter.cfg;
-      mypy = ../mypy.ini;
-      ruff = ../ruff.toml;
-    };
-  };
-}

fluidattacks_core_models-14.0.0/build/filter.nix

@@ -1,13 +0,0 @@
-path_filter: src:
-path_filter {
-  root = src;
-  include = [
-    "fluidattacks_core"
-    "tests"
-    "import-linter.cfg"
-    "mypy.ini"
-    "pyproject.toml"
-    "ruff.toml"
-    "uv.lock"
-  ];
-}

fluidattacks_core_models-14.0.0/flake.lock

@@ -1,303 +0,0 @@
-{
-  "nodes": {
-    "flake-parts": {
-      "inputs": {
-        "nixpkgs-lib": "nixpkgs-lib"
-      },
-      "locked": {
-        "lastModified": 1762810396,
-        "narHash": "sha256-dxFVgQPG+R72dkhXTtqUm7KpxElw3u6E+YlQ2WaDgt8=",
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "rev": "0bdadb1b265fb4143a75bd1ec7d8c915898a9923",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "type": "github"
-      }
-    },
-    "nix_filter": {
-      "locked": {
-        "lastModified": 1757882181,
-        "narHash": "sha256-+cCxYIh2UNalTz364p+QYmWHs0P+6wDhiWR4jDIKQIU=",
-        "owner": "numtide",
-        "repo": "nix-filter",
-        "rev": "59c44d1909c72441144b93cf0f054be7fe764de5",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "nix-filter",
-        "type": "github"
-      }
-    },
-    "nixpkgs": {
-      "locked": {
-        "lastModified": 1758690382,
-        "narHash": "sha256-NY3kSorgqE5LMm1LqNwGne3ZLMF2/ILgLpFr1fS4X3o=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "e643668fd71b949c53f8626614b21ff71a07379d",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs-lib": {
-      "locked": {
-        "lastModified": 1761765539,
-        "narHash": "sha256-b0yj6kfvO8ApcSE+QmA6mUfu8IYG6/uU28OFn4PaC8M=",
-        "owner": "nix-community",
-        "repo": "nixpkgs.lib",
-        "rev": "719359f4562934ae99f5443f20aa06c2ffff91fc",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "nixpkgs.lib",
-        "type": "github"
-      }
-    },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1758690382,
-        "narHash": "sha256-NY3kSorgqE5LMm1LqNwGne3ZLMF2/ILgLpFr1fS4X3o=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "e643668fd71b949c53f8626614b21ff71a07379d",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_3": {
-      "locked": {
-        "lastModified": 1761373498,
-        "narHash": "sha256-Q/uhWNvd7V7k1H1ZPMy/vkx3F8C13ZcdrKjO7Jv7v0c=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "6a08e6bb4e46ff7fcbb53d409b253f6bad8a28ce",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_flake": {
-      "locked": {
-        "lastModified": 1778253243,
-        "narHash": "sha256-KkH2QvU6iRLDTGGEwH5jnMqHWj4zMTuHxi1S1zdr01w=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "4fcda7103530b23c5ca44286344912082aad4220",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "pyproject-build-systems": {
-      "inputs": {
-        "nixpkgs": "nixpkgs",
-        "pyproject-nix": "pyproject-nix",
-        "uv2nix": "uv2nix"
-      },
-      "locked": {
-        "lastModified": 1761781027,
-        "narHash": "sha256-YDvxPAm2WnxrznRqWwHLjryBGG5Ey1ATEJXrON+TWt8=",
-        "owner": "pyproject-nix",
-        "repo": "build-system-pkgs",
-        "rev": "795a980d25301e5133eca37adae37283ec3c8e66",
-        "type": "github"
-      },
-      "original": {
-        "owner": "pyproject-nix",
-        "repo": "build-system-pkgs",
-        "type": "github"
-      }
-    },
-    "pyproject-nix": {
-      "inputs": {
-        "nixpkgs": [
-          "python_builder",
-          "pyproject-build-systems",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1758265079,
-        "narHash": "sha256-amLaLNwKSZPShQHzfgmc/9o76dU8xzN0743dWgvYlr8=",
-        "owner": "nix-community",
-        "repo": "pyproject.nix",
-        "rev": "02e9418fd4af638447dca4b17b1280da95527fc9",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "pyproject.nix",
-        "type": "github"
-      }
-    },
-    "pyproject-nix_2": {
-      "inputs": {
-        "nixpkgs": "nixpkgs_2"
-      },
-      "locked": {
-        "lastModified": 1762427963,
-        "narHash": "sha256-CkPlAbIQ87wmjy5qHibfzk4DmMGBNqFer+lLfXjpP5M=",
-        "owner": "pyproject-nix",
-        "repo": "pyproject.nix",
-        "rev": "4540ea004e04fcd12dd2738d51383d10f956f7b9",
-        "type": "github"
-      },
-      "original": {
-        "owner": "pyproject-nix",
-        "repo": "pyproject.nix",
-        "type": "github"
-      }
-    },
-    "pyproject-nix_3": {
-      "inputs": {
-        "nixpkgs": [
-          "python_builder",
-          "uv2nix",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1760402624,
-        "narHash": "sha256-jF6UKLs2uGc2rtved8Vrt58oTWjTQoAssuYs/0578Z4=",
-        "owner": "pyproject-nix",
-        "repo": "pyproject.nix",
-        "rev": "84c4ea102127c77058ea1ed7be7300261fafc7d2",
-        "type": "github"
-      },
-      "original": {
-        "owner": "pyproject-nix",
-        "repo": "pyproject.nix",
-        "type": "github"
-      }
-    },
-    "python_builder": {
-      "inputs": {
-        "nix_filter": "nix_filter",
-        "nixpkgs_flake": "nixpkgs_flake",
-        "pyproject-build-systems": "pyproject-build-systems",
-        "pyproject-nix": "pyproject-nix_2",
-        "shell-helpers": "shell-helpers",
-        "uv2nix": "uv2nix_2"
-      },
-      "locked": {
-        "dir": "common/utils/python-builder",
-        "lastModified": 1787078362,
-        "narHash": "sha256-HYL7Rn6SuNjYxkt/PwFLksZjsauCiY+ENbOWryLsIlw=",
-        "ref": "refs/heads/trunk",
-        "rev": "09fd25a13309eb5e3b5b2a061bb340df3ae5d281",
-        "shallow": true,
-        "type": "git",
-        "url": "ssh://git@gitlab.com/fluidattacks/universe"
-      },
-      "original": {
-        "dir": "common/utils/python-builder",
-        "rev": "09fd25a13309eb5e3b5b2a061bb340df3ae5d281",
-        "shallow": true,
-        "type": "git",
-        "url": "ssh://git@gitlab.com/fluidattacks/universe"
-      }
-    },
-    "root": {
-      "inputs": {
-        "python_builder": "python_builder"
-      }
-    },
-    "shell-helpers": {
-      "inputs": {
-        "flake-parts": "flake-parts",
-        "nixpkgs": [
-          "python_builder",
-          "nixpkgs_flake"
-        ]
-      },
-      "locked": {
-        "dir": "common/utils/shell-helpers",
-        "lastModified": 1762806066,
-        "narHash": "sha256-Wz99Fl7SpPU1NkTHJ36XOo6DjOEAMXCw3ThRABOS2Hs=",
-        "ref": "refs/heads/trunk",
-        "rev": "d73cfdc7ae9e7f547e22a4481d4c2ccce38b26a8",
-        "shallow": true,
-        "type": "git",
-        "url": "ssh://git@gitlab.com/fluidattacks/universe"
-      },
-      "original": {
-        "dir": "common/utils/shell-helpers",
-        "rev": "d73cfdc7ae9e7f547e22a4481d4c2ccce38b26a8",
-        "shallow": true,
-        "type": "git",
-        "url": "ssh://git@gitlab.com/fluidattacks/universe"
-      }
-    },
-    "uv2nix": {
-      "inputs": {
-        "nixpkgs": [
-          "python_builder",
-          "pyproject-build-systems",
-          "nixpkgs"
-        ],
-        "pyproject-nix": [
-          "python_builder",
-          "pyproject-build-systems",
-          "pyproject-nix"
-        ]
-      },
-      "locked": {
-        "lastModified": 1758933732,
-        "narHash": "sha256-HAmm1GBS1myZCFuog0DC2ZLaynvZtiUI2Crmo+cdQI0=",
-        "owner": "pyproject-nix",
-        "repo": "uv2nix",
-        "rev": "273ce18f913d8559e0d04f820d724308966d7c4d",
-        "type": "github"
-      },
-      "original": {
-        "owner": "pyproject-nix",
-        "repo": "uv2nix",
-        "type": "github"
-      }
-    },
-    "uv2nix_2": {
-      "inputs": {
-        "nixpkgs": "nixpkgs_3",
-        "pyproject-nix": "pyproject-nix_3"
-      },
-      "locked": {
-        "lastModified": 1761872265,
-        "narHash": "sha256-i25GRgp2vUOebY70L3NTAgkd+Pr1hnn5xM3qHxH0ONU=",
-        "owner": "pyproject-nix",
-        "repo": "uv2nix",
-        "rev": "74dfb62871be152ad3673b143b0cc56105a4f3c5",
-        "type": "github"
-      },
-      "original": {
-        "owner": "pyproject-nix",
-        "repo": "uv2nix",
-        "type": "github"
-      }
-    }
-  },
-  "root": "root",
-  "version": 7
-}

fluidattacks_core_models-14.0.0/flake.nix

@@ -1,29 +0,0 @@
-{
-  description = "Fluid Attacks Core models package.";
-
-  inputs = {
-    python_builder = {
-      url = "git+ssh://git@gitlab.com/fluidattacks/universe?shallow=1&rev=09fd25a13309eb5e3b5b2a061bb340df3ae5d281&dir=common/utils/python-builder";
-    };
-  };
-
-  outputs =
-    { self, ... }@inputs:
-    let
-      build_args =
-        {
-          system,
-          python_version,
-          nixpkgs,
-          builders,
-          scripts,
-        }:
-        import ./build {
-          src = import ./build/filter.nix nixpkgs.nix-filter self;
-          workspace_root = ./.;
-        };
-    in
-    {
-      packages = inputs.python_builder.outputs.build build_args;
-    };
-}