additional testing via docker

Author: hollowpointer

core/src/scanner.rs

@@ -60,10 +60,11 @@ trait NetworkExplorer {
 }
 
 pub async fn scan(target_map: TargetMap, cfg: &ZondConfig) -> anyhow::Result<Vec<Host>> {
+    STOP_SIGNAL.store(false, Ordering::Relaxed);
     let use_raw_sockets = preflight_check(cfg);
 
-    // Currently, even if we are root, we use the TCP connect scanner for port scanning
-    // until the privileged SYN scanner is fully implemented.
+    // Currently, even if we are root, we default to the TCP connect scanner for port scanning
+    // until a specialized privileged strategy (e.g. SYN scan) is fully implemented.
     if !use_raw_sockets || true {
         let dispatcher = dispatcher::Dispatcher::new(target_map);
         let rx = dispatcher.run_shuffled();
@@ -85,6 +86,7 @@ pub async fn scan(target_map: TargetMap, cfg: &ZondConfig) -> anyhow::Result<Vec
 /// - **State**: Updates [`FOUND_HOST_COUNT`] and reacts to [`STOP_SIGNAL`].
 /// - **Concurrency**: Spawns multiple Tokio tasks; ensure the caller is within a multi-threaded runtime.
 pub async fn discover(targets: IpSet, cfg: &ZondConfig) -> anyhow::Result<Vec<Host>> {
+    STOP_SIGNAL.store(false, Ordering::Relaxed);
     let use_raw_sockets = preflight_check(cfg);
     if !use_raw_sockets {
         return connect::discover(targets).await;

docker-compose.test.yml

@@ -1,38 +1,50 @@
-# Docker Compose for Zond Integration Testing
-# Simulates a multi-node, mixed-service network environment.
+# Docker Compose for Zond Topological Integration Testing
+# Simulates LAN discovery, multi-NIC usage, and Routed segments.
 
 services:
   scanner:
     build:
       context: .
       dockerfile: docker/scanner/Dockerfile
     container_name: zond-integration-scanner
-    volumes:
-      - .:/app
     cap_add:
       - NET_ADMIN
       - NET_RAW
     networks:
       - lan_network
-      - isolated_network
+      - extra_network
     environment:
       - ZOND_LOG=trace
 
-  target-lan-1:
+  gateway:
+    image: debian:bookworm-slim
+    container_name: zond-gateway
+    cap_add:
+      - NET_ADMIN
+    command: >
+      sh -c "apt-get update && apt-get install -y iproute2 iptables &&
+             echo 1 > /proc/sys/net/ipv4/ip_forward &&
+             iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE &&
+             tail -f /dev/null"
+    networks:
+      - lan_network
+      - isolated_network
+
+  target-lan:
     build:
       context: .
       dockerfile: docker/targets/Dockerfile
-    container_name: zond-target-1
+    container_name: zond-target-lan
     networks:
       - lan_network
 
-  target-lan-2:
+  target-extra:
     build:
       context: .
       dockerfile: docker/targets/Dockerfile
-    container_name: zond-target-2
+    container_name: zond-target-extra
     networks:
-      - lan_network
+      - extra_network
 
   target-isolated:
     build:
@@ -48,6 +60,11 @@ networks:
     ipam:
       config:
         - subnet: 172.20.0.0/24
+  extra_network:
+    driver: bridge
+    ipam:
+      config:
+        - subnet: 172.25.0.0/24
   isolated_network:
     driver: bridge
     ipam:

docker/scanner/Dockerfile

@@ -1,3 +1,12 @@
+# Multi-stage Dockerfile for Zond Scanner
+# Stage 1: Build the binary inside a compatible environment
+FROM rust:1.93-slim-bookworm AS builder
+
+WORKDIR /app
+COPY . .
+RUN cargo build --release
+
+# Stage 2: Runtime image
 FROM debian:bookworm-slim
 
 RUN apt-get update && apt-get install -y \
@@ -13,6 +22,9 @@ RUN apt-get update && apt-get install -y \
 
 WORKDIR /app
 
-ENV PATH="/app:${PATH}"
+# Copy the binary and assets from the builder stage
+COPY --from=builder /app/target/release/zond /app/zond
+COPY --from=builder /app/assets /app/assets
 
+ENV PATH="/app:${PATH}"
 CMD ["tail", "-f", "/dev/null"]

scripts/run_integration_docker.sh

@@ -1,28 +1,61 @@
 #!/bin/bash
-# Zond Docker Integration Test Runner
+# Zond Phase 1: Topological Integration Test Runner
 # 
-# This script builds the Zond binaries, brings up the Docker Compose environment,
-# and executes the integration scanner to verify network-wide discovery.
+# Verifies Multi-NIC discovery, DNS resolution, and Routed segment discovery.
 
 set -e
 
-# 1. Build the project to ensure we have fresh binaries
-echo ">>> Building Zond binaries..."
-cargo build
+# 1. Note: Build is now handled inside the scanner.Dockerfile multi-stage build.
+echo ">>> (Build handled by Docker Compose)"
+# cargo build is no longer necessary on host
 
-# 2. Build and start the Docker environment
+# 2. Start the environment
 echo ">>> Bringing up Docker nodes..."
-docker-compose -f docker-compose.test.yml up --build -d
+docker compose -f docker-compose.test.yml up --build -d
 
-# Give containers a second to start listeners
-sleep 2
+# Give containers a second to start
+sleep 3
 
-# 3. Perform a discovery scan from the scanner node
-echo ">>> Executing Zond discovery scan from scanner node..."
-docker exec zond-integration-scanner ./target/debug/zond discover 172.20.0.0/24 172.30.0.0/24
+# 3. Setup Routes for Discovery
+# We need to tell the scanner how to reach the isolated network (172.30.0.0/24) via the gateway
+# We search all networks for the one in the 172.20.0.0/24 subnet
+echo ">>> Extracting gateway IP..."
+for i in {1..5}; do
+    GATEWAY_IP=$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}} {{end}}' zond-gateway | tr ' ' '\n' | grep '172.20.' | head -n 1)
+    if [ ! -z "$GATEWAY_IP" ]; then
+        break
+    fi
+    echo "Wait for gateway IP... ($i/5)"
+    sleep 2
+done
 
-# 4. Cleanup
+if [ -z "$GATEWAY_IP" ]; then
+    echo "Error: Could not find gateway IP on LAN network."
+    docker compose -f docker-compose.test.yml down
+    exit 1
+fi
+
+echo ">>> Setting up static route to isolated network via gateway at $GATEWAY_IP..."
+docker exec zond-integration-scanner ip route add 172.30.0.0/24 via $GATEWAY_IP
+
+# 4. Perform Phase 1 Tests
+echo ">>> [Phase 1] Executing Topological Discovery Scan..."
+
+# Scan all three target subnets
+# - 172.20.0.0/24 (LAN 1)
+# - 172.25.0.0/24 (LAN 2 - Extra NIC)
+# - 172.30.0.0/24 (Routed Isolated)
+# We turn on trace logging to see what's happening
+EXIT_CODE=0
+docker exec zond-integration-scanner ./zond -vvv discover 172.20.0.0/24 172.25.0.0/24 172.30.0.0/24 || EXIT_CODE=$?
+
+if [ $EXIT_CODE -ne 0 ]; then
+    echo ">>> Scan failed with exit code $EXIT_CODE. Container logs:"
+    docker logs zond-integration-scanner
+fi
+
+# 5. Cleanup
 echo ">>> Tearing down Docker nodes..."
-docker-compose -f docker-compose.test.yml down
+docker compose -f docker-compose.test.yml down
 
-echo ">>> Docker Integration tests completed successfully."
+exit $EXIT_CODE