Changed some normalizers to include network in every object where it …

…is needed
minvws · Dec 20, 2024 · c4e1470 · c4e1470
1 parent 1fcd593
commit c4e1470
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 8 deletions.
diff --git a/boefjes/boefjes/plugins/kat_binaryedge/containers/normalize.py b/boefjes/boefjes/plugins/kat_binaryedge/containers/normalize.py
@@ -36,12 +36,16 @@ def run(input_ooi: dict, raw: bytes) -> Iterable[NormalizerOutput]:
             yield ip_ooi
             ip_ref = ip_ooi.reference
 
-        ip_port_ooi = IPPort(address=ip_ref, protocol=Protocol(protocol), port=port_nr, state=PortState("open"))
+        ip_port_ooi = IPPort(
+            address=ip_ref, protocol=Protocol(protocol), port=port_nr, state=PortState("open"), network=network
+        )
         yield ip_port_ooi
 
-        software_ooi = Software(name=module.capitalize())
+        software_ooi = Software(name=module.capitalize(), network=network)
         yield software_ooi
-        software_instance_ooi = SoftwareInstance(ooi=ip_port_ooi.reference, software=software_ooi.reference)
+        software_instance_ooi = SoftwareInstance(
+            ooi=ip_port_ooi.reference, software=software_ooi.reference, network=network
+        )
         yield software_instance_ooi
 
         kat_ooi = KATFindingType(id="KAT-VERIFIED-VULNERABILITY")

diff --git a/boefjes/boefjes/plugins/kat_binaryedge/databases/normalize.py b/boefjes/boefjes/plugins/kat_binaryedge/databases/normalize.py
@@ -36,7 +36,9 @@ def run(input_ooi: dict, raw: bytes) -> Iterable[NormalizerOutput]:
             yield ip_ooi
             ip_ref = ip_ooi.reference
 
-        ip_port_ooi = IPPort(address=ip_ref, protocol=Protocol(protocol), port=port_nr, state=PortState("open"))
+        ip_port_ooi = IPPort(
+            address=ip_ref, protocol=Protocol(protocol), port=port_nr, state=PortState("open"), network=network
+        )
         yield ip_port_ooi
 
         software_version = None
@@ -57,9 +59,15 @@ def run(input_ooi: dict, raw: bytes) -> Iterable[NormalizerOutput]:
             software_version = data["redis_version"]
             # TODO: data.gccversion
 
-        software_ooi = Software(name=module, version=software_version) if software_version else Software(name=module)
+        software_ooi = (
+            Software(name=module, version=software_version, network=network)
+            if software_version
+            else Software(name=module, network=network)
+        )
         yield software_ooi
-        software_instance_ooi = SoftwareInstance(ooi=ip_port_ooi.reference, software=software_ooi.reference)
+        software_instance_ooi = SoftwareInstance(
+            ooi=ip_port_ooi.reference, software=software_ooi.reference, network=network
+        )
         yield software_instance_ooi
 
         kat_ooi = KATFindingType(id="KAT-EXPOSED-SOFTWARE")

diff --git a/boefjes/boefjes/plugins/kat_nmap_tcp/normalize.py b/boefjes/boefjes/plugins/kat_nmap_tcp/normalize.py
@@ -28,7 +28,11 @@ def get_ip_ports_and_service(host: NmapHost, network: Network, netblock: Referen
                 continue
 
             ip_port = IPPort(
-                address=ip.reference, protocol=Protocol(protocol), port=port, state=PortState(service.state)
+                address=ip.reference,
+                protocol=Protocol(protocol),
+                port=port,
+                state=PortState(service.state),
+                network=network.reference,
             )
             yield ip_port
 
@@ -39,7 +43,7 @@ def get_ip_ports_and_service(host: NmapHost, network: Network, netblock: Referen
             port_service = Service(name=service_name)
             yield port_service
 
-            ip_service = IPService(ip_port=ip_port.reference, service=port_service.reference)
+            ip_service = IPService(ip_port=ip_port.reference, service=port_service.reference, network=network.reference)
             yield ip_service