Towards better inference: bits → nibbles

octopoes/bits/ask_disallowed_domains/ask_disallowed_domains.py → octopoes/nibbles/ask_disallowed_domains/ask_disallowed_domains.py

@@ -1,14 +1,13 @@
 import json
 from collections.abc import Iterator
 from pathlib import Path
-from typing import Any
 
 from octopoes.models import OOI
 from octopoes.models.ooi.network import Network
 from octopoes.models.ooi.question import Question
 
 
-def run(input_ooi: Network, additional_oois: list, config: dict[str, Any]) -> Iterator[OOI]:
+def nibble(input_ooi: Network) -> Iterator[OOI]:
     network = input_ooi
 
     with (Path(__file__).parent / "question_schema.json").open() as f:

octopoes/nibbles/ask_disallowed_domains/nibble.py

@@ -0,0 +1,4 @@
+from nibbles.definitions import NibbleDefinition, NibbleParameter
+from octopoes.models.ooi.network import Network
+
+NIBBLE = NibbleDefinition(id="ask-disallowed-domains", signature=[NibbleParameter(object_type=Network)])

octopoes/bits/ask_port_specification/ask_port_specification.py → octopoes/nibbles/ask_port_specification/ask_port_specification.py

@@ -1,14 +1,13 @@
 import json
 from collections.abc import Iterator
 from pathlib import Path
-from typing import Any
 
 from octopoes.models import OOI
 from octopoes.models.ooi.network import Network
 from octopoes.models.ooi.question import Question
 
 
-def run(input_ooi: Network, additional_oois: list, config: dict[str, Any]) -> Iterator[OOI]:
+def nibble(input_ooi: Network) -> Iterator[OOI]:
     network = input_ooi
 
     with (Path(__file__).parent / "question_schema.json").open() as f:

octopoes/nibbles/ask_port_specification/nibble.py

@@ -0,0 +1,4 @@
+from nibbles.definitions import NibbleDefinition, NibbleParameter
+from octopoes.models.ooi.network import Network
+
+NIBBLE = NibbleDefinition(id="ask-port-specification", signature=[NibbleParameter(object_type=Network)])

octopoes/bits/ask_url_params_to_ignore/ask_url_params_to_ignore.py → octopoes/nibbles/ask_url_params_to_ignore/ask_url_params_to_ignore.py

@@ -1,14 +1,13 @@
 import json
 from collections.abc import Iterator
 from pathlib import Path
-from typing import Any
 
 from octopoes.models import OOI
 from octopoes.models.ooi.network import Network
 from octopoes.models.ooi.question import Question
 
 
-def run(input_ooi: Network, additional_oois: list, config: dict[str, Any]) -> Iterator[OOI]:
+def nibble(input_ooi: Network) -> Iterator[OOI]:
     network = input_ooi
 
     with (Path(__file__).parent / "question_schema.json").open() as f:

octopoes/nibbles/ask_url_params_to_ignore/nibble.py

@@ -0,0 +1,4 @@
+from nibbles.definitions import NibbleDefinition, NibbleParameter
+from octopoes.models.ooi.network import Network
+
+NIBBLE = NibbleDefinition(id="ask_url_params_to_ignore", signature=[NibbleParameter(object_type=Network)])

octopoes/bits/check_cve_2021_41773/check_cve_2021_41773.py → octopoes/nibbles/check_cve_2021_41773/check_cve_2021_41773.py

@@ -1,12 +1,11 @@
 from collections.abc import Iterator
-from typing import Any
 
 from octopoes.models import OOI
 from octopoes.models.ooi.findings import CVEFindingType, Finding
 from octopoes.models.ooi.web import HTTPHeader
 
 
-def run(input_ooi: HTTPHeader, additional_oois: list, config: dict[str, Any]) -> Iterator[OOI]:
+def nibble(input_ooi: HTTPHeader) -> Iterator[OOI]:
     header = input_ooi
     if header.key.lower() != "server":
         return

octopoes/nibbles/check_cve_2021_41773/nibble.py

@@ -0,0 +1,4 @@
+from nibbles.definitions import NibbleDefinition, NibbleParameter
+from octopoes.models.types import HTTPHeader
+
+NIBBLE = NibbleDefinition(id="check_cve_2021_41773", signature=[NibbleParameter(object_type=HTTPHeader)])

octopoes/bits/check_hsts_header/check_hsts_header.py → octopoes/nibbles/check_hsts_header/check_hsts_header.py

@@ -1,20 +1,20 @@
 import datetime
 from collections.abc import Iterator
-from typing import Any
 
 from octopoes.models import OOI, Reference
+from octopoes.models.ooi.config import Config
 from octopoes.models.ooi.findings import Finding, KATFindingType
 from octopoes.models.ooi.web import HTTPHeader
 
 
-def run(input_ooi: HTTPHeader, additional_oois: list, config: dict[str, Any]) -> Iterator[OOI]:
+def nibble(input_ooi: HTTPHeader, config: Config | None) -> Iterator[OOI]:
     header = input_ooi
     if header.key.lower() != "strict-transport-security":
         return
 
     one_year = datetime.timedelta(days=365).total_seconds()
 
-    max_age = int(config.get("max-age", one_year)) if config else one_year
+    max_age = int(str(config.config.get("max-age", one_year))) if config and config.config else one_year
     findings: list[str] = []
 
     headervalue = header.value.lower()