fluidattacks_core_models 13.2.0__tar.gz → 14.1.0__tar.gz

{fluidattacks_core_models-13.2.0 → fluidattacks_core_models-14.1.0}/PKG-INFO

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

{fluidattacks_core_models-13.2.0 → fluidattacks_core_models-14.1.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,
@@ -52,6 +53,7 @@ __all__ = [
     "LocalesEnum",
     "OutputConfig",
     "OutputFormat",
+    "ResolvesConfig",
     "SastConfig",
     "SbomAwsCredentials",
     "SbomConfig",

fluidattacks_core_models-14.1.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-13.2.0 → fluidattacks_core_models-14.1.0}/fluidattacks_core/models/scanners/scan_config.py

@@ -9,6 +9,7 @@ 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
@@ -37,3 +38,4 @@ class ScanConfig(BaseModel):
     apk: ApkConfig | None = None
     false_positives_identified: FalsePositivesConfig | None = None
     ss: SniffsConfig | None = None
+    resolves: ResolvesConfig | None = None

{fluidattacks_core_models-13.2.0 → fluidattacks_core_models-14.1.0}/fluidattacks_core/models/state_machines/__init__.py

@@ -2,6 +2,7 @@ from fluidattacks_core.models.state_machines.component_orchestrator import (
     ComponentScanOptions,
     ResolvesScanOptions,
     StateMachineComponentOrchestrator,
+    TracesScanOptions,
 )
 from fluidattacks_core.models.state_machines.root_scanner import (
     ContextualizesScanInput,
@@ -9,8 +10,6 @@ from fluidattacks_core.models.state_machines.root_scanner import (
     PerRootScanOptions,
     StateMachineExecutePerRootInput,
     TJobNameSegment,
-    TracesScanInput,
-    TracesScanOptions,
     TStorageKey,
 )
 from fluidattacks_core.models.state_machines.types import (
@@ -38,6 +37,5 @@ __all__ = [
     "TCloningTrigger",
     "TJobNameSegment",
     "TStorageKey",
-    "TracesScanInput",
     "TracesScanOptions",
 ]

{fluidattacks_core_models-13.2.0 → fluidattacks_core_models-14.1.0}/fluidattacks_core/models/state_machines/component_orchestrator.py

@@ -24,6 +24,10 @@ class ResolvesScanOptions(ComponentScanOptions):
     pass
 
 
+class TracesScanOptions(ComponentScanOptions):
+    group_name: TStorageKey
+
+
 TComponentOptions = TypeVar("TComponentOptions", bound=ComponentScanOptions)
 
 

{fluidattacks_core_models-13.2.0 → fluidattacks_core_models-14.1.0}/fluidattacks_core/models/state_machines/root_scanner.py

@@ -44,10 +44,6 @@ class ContextualizesScanOptions(PerRootScanOptions):
     pass
 
 
-class TracesScanOptions(PerRootScanOptions):
-    pass
-
-
 TOptions = TypeVar("TOptions", bound=PerRootScanOptions)
 
 
@@ -98,7 +94,3 @@ class StateMachineExecutePerRootInput(BaseModel, Generic[TOptions]):
 
 class ContextualizesScanInput(StateMachineExecutePerRootInput[ContextualizesScanOptions]):
     pass
-
-
-class TracesScanInput(StateMachineExecutePerRootInput[TracesScanOptions]):
-    pass

{fluidattacks_core_models-13.2.0 → fluidattacks_core_models-14.1.0}/pyproject.toml

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

{fluidattacks_core_models-13.2.0 → fluidattacks_core_models-14.1.0}/tests/test_component_orchestrator.py

@@ -7,6 +7,7 @@ from fluidattacks_core.models.state_machines.component_orchestrator import (
     ComponentScanOptions,
     ResolvesScanOptions,
     StateMachineComponentOrchestrator,
+    TracesScanOptions,
 )
 from fluidattacks_core.models.state_machines.root_scanner import (
     MACHINE_NAME_DIGEST_LENGTH,
@@ -176,3 +177,31 @@ def test_resolves_options_add_no_fields_of_their_own() -> None:
     )
     with pytest.raises(ValidationError):
         ResolvesScanOptions.model_validate({**options.model_dump(), "seed_domain": "acme.com"})
+
+
+def _traces_options(**overrides: str) -> TracesScanOptions:
+    arguments: dict[str, str] = {
+        "config_id": "123456",
+        "entity_name": "nickname",
+        "group_name": "acme",
+        "user_email": "test@fluidattacks.com",
+    }
+    arguments.update(overrides)
+    return TracesScanOptions(**arguments)
+
+
+def test_traces_options_declare_the_group_the_orchestrator_does_not_carry() -> None:
+    options = _traces_options()
+    assert set(options.model_dump()) == set(ComponentScanOptions.model_fields) | {"group_name"}
+    with pytest.raises(ValidationError):
+        TracesScanOptions.model_validate(_options().model_dump())
+
+
+def test_traces_group_name_is_a_storage_key_and_reaches_the_scanner_on_the_wire() -> None:
+    for value in ("a/b", "..", "acme corp", "_leading", ""):
+        with pytest.raises(ValidationError):
+            _traces_options(group_name=value)
+    machine_input = StateMachineComponentOrchestrator[TracesScanOptions].model_validate(
+        _wire_payload(options=_traces_options(), scanner_name="traces-scan")
+    )
+    assert json.loads(machine_input.execution_options)["group_name"] == "acme"

{fluidattacks_core_models-13.2.0 → fluidattacks_core_models-14.1.0}/tests/test_model_scanner.py

@@ -22,6 +22,7 @@ from fluidattacks_core.models.scanners import (
     LocalesEnum,
     OutputConfig,
     OutputFormat,
+    ResolvesConfig,
     SastConfig,
     SbomAwsCredentials,
     SbomConfig,
@@ -258,6 +259,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 +519,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-13.2.0 → fluidattacks_core_models-14.1.0}/tests/test_root_scanner.py

@@ -11,8 +11,6 @@ from fluidattacks_core.models.state_machines.root_scanner import (
     ContextualizesScanOptions,
     PerRootScanOptions,
     StateMachineExecutePerRootInput,
-    TracesScanInput,
-    TracesScanOptions,
 )
 
 
@@ -267,44 +265,3 @@ def test_execute_per_root_machine_name_is_injective() -> None:
     assert len(names) == 2
     assert len(masked) == 2
     assert len(roots) == 2
-
-
-def _traces_options(**overrides: str) -> TracesScanOptions:
-    arguments: dict[str, str] = {
-        "config_id": "123456",
-        "group_name": "acme",
-        "root_nickname": "nickname",
-        "user_email": "test@fluidattacks.com",
-    }
-    arguments.update(overrides)
-    return TracesScanOptions(**arguments)
-
-
-def _traces_input(options: TracesScanOptions | None = None) -> TracesScanInput:
-    return TracesScanInput.model_validate(
-        {
-            "job_definition": "traces_run",
-            "job_queue": "traces",
-            "scanner_name": "traces-scan-run",
-            "options": options if options is not None else _traces_options(),
-        }
-    )
-
-
-def test_traces_scan_options_are_exactly_the_shared_per_root_fields() -> None:
-    options = _traces_options()
-    assert set(options.model_dump()) == set(PerRootScanOptions.model_fields)
-    assert TracesScanOptions.model_validate_json(options.model_dump_json()) == options
-
-
-def test_traces_scan_input_keeps_the_seven_wire_keys_the_machine_reads() -> None:
-    dumped = _traces_input().to_wire()
-    assert set(dumped) == {
-        "configId",
-        "executionOptions",
-        "groupName",
-        "jobDefinition",
-        "jobQueue",
-        "rootNickname",
-        "scannerName",
-    }

{fluidattacks_core_models-13.2.0 → fluidattacks_core_models-14.1.0}/uv.lock

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