Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
eb88656c43 |
@@ -7,17 +7,4 @@ ignore = [
|
|||||||
# not a realistic attack surface here. Revisit when mongodb bumps hickory.
|
# not a realistic attack surface here. Revisit when mongodb bumps hickory.
|
||||||
"RUSTSEC-2026-0118", # NSEC3 loop, no fix available upstream
|
"RUSTSEC-2026-0118", # NSEC3 loop, no fix available upstream
|
||||||
"RUSTSEC-2026-0119", # O(n²) name compression, fixed in hickory-proto >=0.26.1
|
"RUSTSEC-2026-0119", # O(n²) name compression, fixed in hickory-proto >=0.26.1
|
||||||
|
|
||||||
# rmcp 0.16.0 — DNS rebinding in Streamable HTTP server transport (missing
|
|
||||||
# Host header validation). Patched in rmcp >= 1.4.0, which is a major API
|
|
||||||
# version jump from our pin; rmcp shipped 0.x → 1.x → 2.x in three months
|
|
||||||
# and the migration touches every tool handler + the auth middleware we
|
|
||||||
# just landed in #92. Threat model in our deployment: the MCP server is
|
|
||||||
# exposed at a public hostname (comp-mcp-dev.meghsakha.com) behind orca's
|
|
||||||
# TLS-terminating ingress with per-tenant bearer auth — the attack model
|
|
||||||
# (browser DNS-rebinding into localhost MCP server) doesn't directly apply.
|
|
||||||
# Defense-in-depth Host-header check is still a worthwhile follow-up.
|
|
||||||
# FOLLOW-UP: bump rmcp to 2.x in a dedicated PR (M7.3 follow-up, sized
|
|
||||||
# multi-hour due to API surface change).
|
|
||||||
"RUSTSEC-2026-0189",
|
|
||||||
]
|
]
|
||||||
|
|||||||
+6
-54
@@ -9,25 +9,10 @@ on:
|
|||||||
env:
|
env:
|
||||||
CARGO_TERM_COLOR: always
|
CARGO_TERM_COLOR: always
|
||||||
RUSTFLAGS: "-D warnings"
|
RUSTFLAGS: "-D warnings"
|
||||||
# Compile cache: sccache -> Hetzner S3 (breakpilot-sccache), runner-independent
|
# sccache caches compilation artifacts within a job so that compiling
|
||||||
# and persistent across CI runs (own key prefix). Reuses the shared cluster S3
|
# both --features server and --features web shares common crate work.
|
||||||
# creds (same bucket as werkpilot). Requires repo secrets HETZNER_S3_ACCESS_KEY
|
|
||||||
# and HETZNER_S3_SECRET_KEY.
|
|
||||||
RUSTC_WRAPPER: /usr/local/bin/sccache
|
RUSTC_WRAPPER: /usr/local/bin/sccache
|
||||||
SCCACHE_BUCKET: breakpilot-sccache
|
SCCACHE_DIR: /tmp/sccache
|
||||||
SCCACHE_ENDPOINT: https://nbg1.your-objectstorage.com
|
|
||||||
SCCACHE_REGION: auto
|
|
||||||
SCCACHE_S3_USE_SSL: "true"
|
|
||||||
SCCACHE_S3_KEY_PREFIX: compliance-scanner
|
|
||||||
AWS_ACCESS_KEY_ID: ${{ secrets.HETZNER_S3_ACCESS_KEY }}
|
|
||||||
AWS_SECRET_ACCESS_KEY: ${{ secrets.HETZNER_S3_SECRET_KEY }}
|
|
||||||
# compliance-agent depends on tramiton-core via git; use the system git so the
|
|
||||||
# credential rewrite below (see "Configure git auth ...") is honored on fetch.
|
|
||||||
CARGO_NET_GIT_FETCH_WITH_CLI: "true"
|
|
||||||
# Throttle cargo so a ~670-crate concurrent download burst doesn't 429 the
|
|
||||||
# Kellnr mirror: fewer concurrent connections (HTTP/1.1) + more retries.
|
|
||||||
CARGO_NET_RETRY: "10"
|
|
||||||
CARGO_HTTP_MULTIPLEXING: "false"
|
|
||||||
|
|
||||||
# Cancel in-progress runs for the same branch/PR
|
# Cancel in-progress runs for the same branch/PR
|
||||||
concurrency:
|
concurrency:
|
||||||
@@ -51,44 +36,16 @@ jobs:
|
|||||||
git remote add origin "${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}.git"
|
git remote add origin "${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}.git"
|
||||||
git fetch --depth=1 origin "${GITHUB_SHA}"
|
git fetch --depth=1 origin "${GITHUB_SHA}"
|
||||||
git checkout FETCH_HEAD
|
git checkout FETCH_HEAD
|
||||||
# Resolve crates.io deps through the self-hosted Kellnr mirror (cached,
|
|
||||||
# crates.io-independent). Git deps (tramiton-core) are unaffected — source
|
|
||||||
# replacement only applies to crates.io-sourced crates.
|
|
||||||
- name: Use Kellnr crates.io mirror
|
|
||||||
run: |
|
|
||||||
: "${CARGO_HOME:=/usr/local/cargo}"
|
|
||||||
mkdir -p "$CARGO_HOME"
|
|
||||||
{
|
|
||||||
echo '[source.crates-io]'
|
|
||||||
echo 'replace-with = "kellnr"'
|
|
||||||
echo '[registries.kellnr]'
|
|
||||||
echo 'index = "sparse+https://crates.meghsakha.com/api/v1/cratesio/"'
|
|
||||||
} >> "$CARGO_HOME/config.toml"
|
|
||||||
env:
|
|
||||||
RUSTC_WRAPPER: ""
|
|
||||||
- name: Install tools
|
- name: Install tools
|
||||||
run: |
|
run: |
|
||||||
rustup component add rustfmt clippy
|
rustup component add rustfmt clippy
|
||||||
curl -fsSL https://github.com/mozilla/sccache/releases/download/v0.10.0/sccache-v0.10.0-x86_64-unknown-linux-musl.tar.gz \
|
curl -fsSL https://github.com/mozilla/sccache/releases/download/v0.9.1/sccache-v0.9.1-x86_64-unknown-linux-musl.tar.gz \
|
||||||
| tar xz --strip-components=1 -C /usr/local/bin/ sccache-v0.10.0-x86_64-unknown-linux-musl/sccache
|
| tar xz --strip-components=1 -C /usr/local/bin/ sccache-v0.9.1-x86_64-unknown-linux-musl/sccache
|
||||||
chmod +x /usr/local/bin/sccache
|
chmod +x /usr/local/bin/sccache
|
||||||
cargo install cargo-audit --locked
|
cargo install cargo-audit --locked
|
||||||
env:
|
env:
|
||||||
RUSTC_WRAPPER: ""
|
RUSTC_WRAPPER: ""
|
||||||
|
|
||||||
# compliance-agent has a git dependency on tramiton-core (a private repo on
|
|
||||||
# this Gitea instance). Rewrite its SSH URL to HTTPS + a PAT so the runner
|
|
||||||
# can fetch it. Requires the repo secret TRAMITON_FETCH_TOKEN (a Gitea PAT
|
|
||||||
# with read:repository, owned by a user with access to sharang/tramiton).
|
|
||||||
# (Honored on fetch because CARGO_NET_GIT_FETCH_WITH_CLI=true uses system git.)
|
|
||||||
- name: Configure git auth for private tramiton dependency
|
|
||||||
run: |
|
|
||||||
git config --global \
|
|
||||||
url."https://sharang:${{ secrets.TRAMITON_FETCH_TOKEN }}@gitea.meghsakha.com/".insteadOf \
|
|
||||||
"ssh://git@gitea.meghsakha.com:22222/"
|
|
||||||
env:
|
|
||||||
RUSTC_WRAPPER: ""
|
|
||||||
|
|
||||||
# Format (no compilation needed)
|
# Format (no compilation needed)
|
||||||
- name: Format
|
- name: Format
|
||||||
run: cargo fmt --all --check
|
run: cargo fmt --all --check
|
||||||
@@ -191,18 +148,13 @@ jobs:
|
|||||||
image: docker:27-cli
|
image: docker:27-cli
|
||||||
steps:
|
steps:
|
||||||
- name: Build, push and trigger orca redeploy
|
- name: Build, push and trigger orca redeploy
|
||||||
env:
|
|
||||||
# PAT for fetching the private tramiton-core git dependency during the
|
|
||||||
# image build (injected as a BuildKit secret, never baked into a layer).
|
|
||||||
TRAMITON_FETCH_TOKEN: ${{ secrets.TRAMITON_FETCH_TOKEN }}
|
|
||||||
run: |
|
run: |
|
||||||
apk add --no-cache git curl openssl
|
apk add --no-cache git curl openssl
|
||||||
git init && git remote add origin "${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}.git"
|
git init && git remote add origin "${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}.git"
|
||||||
git fetch --depth=1 origin "${GITHUB_SHA}" && git checkout FETCH_HEAD
|
git fetch --depth=1 origin "${GITHUB_SHA}" && git checkout FETCH_HEAD
|
||||||
IMAGE=registry.meghsakha.com/compliance-agent
|
IMAGE=registry.meghsakha.com/compliance-agent
|
||||||
echo "${{ secrets.REGISTRY_PASSWORD }}" | docker login registry.meghsakha.com -u "${{ secrets.REGISTRY_USERNAME }}" --password-stdin
|
echo "${{ secrets.REGISTRY_PASSWORD }}" | docker login registry.meghsakha.com -u "${{ secrets.REGISTRY_USERNAME }}" --password-stdin
|
||||||
DOCKER_BUILDKIT=1 docker build --secret id=tramiton_token,env=TRAMITON_FETCH_TOKEN \
|
docker build -f Dockerfile.agent -t "$IMAGE:latest" -t "$IMAGE:${GITHUB_SHA}" .
|
||||||
-f Dockerfile.agent -t "$IMAGE:latest" -t "$IMAGE:${GITHUB_SHA}" .
|
|
||||||
docker push "$IMAGE:latest" && docker push "$IMAGE:${GITHUB_SHA}"
|
docker push "$IMAGE:latest" && docker push "$IMAGE:${GITHUB_SHA}"
|
||||||
PAYLOAD=$(printf '{"ref":"refs/heads/main","repository":{"full_name":"sharang/compliance-scanner-agent"},"head_commit":{"id":"%s","message":"deploy agent"}}' "${GITHUB_SHA}")
|
PAYLOAD=$(printf '{"ref":"refs/heads/main","repository":{"full_name":"sharang/compliance-scanner-agent"},"head_commit":{"id":"%s","message":"deploy agent"}}' "${GITHUB_SHA}")
|
||||||
SIG=$(printf '%s' "$PAYLOAD" | openssl dgst -sha256 -hmac "${{ secrets.ORCA_WEBHOOK_SECRET }}" | awk '{print $2}')
|
SIG=$(printf '%s' "$PAYLOAD" | openssl dgst -sha256 -hmac "${{ secrets.ORCA_WEBHOOK_SECRET }}" | awk '{print $2}')
|
||||||
|
|||||||
Generated
+6
-69
@@ -692,7 +692,6 @@ dependencies = [
|
|||||||
"tower-http",
|
"tower-http",
|
||||||
"tracing",
|
"tracing",
|
||||||
"tracing-subscriber",
|
"tracing-subscriber",
|
||||||
"tramiton-core",
|
|
||||||
"urlencoding",
|
"urlencoding",
|
||||||
"uuid",
|
"uuid",
|
||||||
"walkdir",
|
"walkdir",
|
||||||
@@ -1119,9 +1118,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "crossbeam-epoch"
|
name = "crossbeam-epoch"
|
||||||
version = "0.9.20"
|
version = "0.9.18"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "2d6914041f254d6e9176c01941b21115dcfb7089e55135a35411081bd106ef3f"
|
checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"crossbeam-utils",
|
"crossbeam-utils",
|
||||||
]
|
]
|
||||||
@@ -4198,7 +4197,7 @@ version = "3.4.0"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "219cb19e96be00ab2e37d6e299658a0cfa83e52429179969b0f0121b4ac46983"
|
checksum = "219cb19e96be00ab2e37d6e299658a0cfa83e52429179969b0f0121b4ac46983"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"toml_edit 0.23.10+spec-1.0.0",
|
"toml_edit",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@@ -4283,9 +4282,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "quinn-proto"
|
name = "quinn-proto"
|
||||||
version = "0.11.15"
|
version = "0.11.14"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "4fcb935c5bec503c2f0e306bdd3e58bb9029dcb14fa8d9ac76e3a5256ac0763e"
|
checksum = "434b42fec591c96ef50e21e886936e66d3cc3f737104fdb9b737c40ffb94c098"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bytes",
|
"bytes",
|
||||||
"getrandom 0.3.4",
|
"getrandom 0.3.4",
|
||||||
@@ -4997,15 +4996,6 @@ dependencies = [
|
|||||||
"syn",
|
"syn",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "serde_spanned"
|
|
||||||
version = "0.6.9"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "bf41e0cfaf7226dca15e8197172c295a782857fcb97fad1808a166870dee75a3"
|
|
||||||
dependencies = [
|
|
||||||
"serde",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "serde_urlencoded"
|
name = "serde_urlencoded"
|
||||||
version = "0.7.1"
|
version = "0.7.1"
|
||||||
@@ -5820,27 +5810,6 @@ dependencies = [
|
|||||||
"tokio",
|
"tokio",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "toml"
|
|
||||||
version = "0.8.23"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "dc1beb996b9d83529a9e75c17a1686767d148d70663143c7854d8b4a09ced362"
|
|
||||||
dependencies = [
|
|
||||||
"serde",
|
|
||||||
"serde_spanned",
|
|
||||||
"toml_datetime 0.6.11",
|
|
||||||
"toml_edit 0.22.27",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "toml_datetime"
|
|
||||||
version = "0.6.11"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "22cddaf88f4fbc13c51aebbf5f8eceb5c7c5a9da2ac40a13519eb5b0a0e8f11c"
|
|
||||||
dependencies = [
|
|
||||||
"serde",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "toml_datetime"
|
name = "toml_datetime"
|
||||||
version = "0.7.5+spec-1.1.0"
|
version = "0.7.5+spec-1.1.0"
|
||||||
@@ -5850,20 +5819,6 @@ dependencies = [
|
|||||||
"serde_core",
|
"serde_core",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "toml_edit"
|
|
||||||
version = "0.22.27"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "41fe8c660ae4257887cf66394862d21dbca4a6ddd26f04a3560410406a2f819a"
|
|
||||||
dependencies = [
|
|
||||||
"indexmap 2.13.0",
|
|
||||||
"serde",
|
|
||||||
"serde_spanned",
|
|
||||||
"toml_datetime 0.6.11",
|
|
||||||
"toml_write",
|
|
||||||
"winnow",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "toml_edit"
|
name = "toml_edit"
|
||||||
version = "0.23.10+spec-1.0.0"
|
version = "0.23.10+spec-1.0.0"
|
||||||
@@ -5871,7 +5826,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||||||
checksum = "84c8b9f757e028cee9fa244aea147aab2a9ec09d5325a9b01e0a49730c2b5269"
|
checksum = "84c8b9f757e028cee9fa244aea147aab2a9ec09d5325a9b01e0a49730c2b5269"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"indexmap 2.13.0",
|
"indexmap 2.13.0",
|
||||||
"toml_datetime 0.7.5+spec-1.1.0",
|
"toml_datetime",
|
||||||
"toml_parser",
|
"toml_parser",
|
||||||
"winnow",
|
"winnow",
|
||||||
]
|
]
|
||||||
@@ -5885,12 +5840,6 @@ dependencies = [
|
|||||||
"winnow",
|
"winnow",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "toml_write"
|
|
||||||
version = "0.1.2"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "5d99f8c9a7727884afe522e9bd5edbfc91a3312b36a77b5fb8926e4c31a41801"
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tonic"
|
name = "tonic"
|
||||||
version = "0.12.3"
|
version = "0.12.3"
|
||||||
@@ -6137,18 +6086,6 @@ dependencies = [
|
|||||||
"wasm-bindgen",
|
"wasm-bindgen",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "tramiton-core"
|
|
||||||
version = "0.4.0"
|
|
||||||
source = "git+ssh://git@gitea.meghsakha.com:22222/sharang/tramiton.git?tag=v0.4.0#e3dc1bf7027a2f6d7b1fe43043d6dfa887ce4af3"
|
|
||||||
dependencies = [
|
|
||||||
"serde",
|
|
||||||
"tempfile",
|
|
||||||
"thiserror 1.0.69",
|
|
||||||
"toml",
|
|
||||||
"walkdir",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tree-sitter"
|
name = "tree-sitter"
|
||||||
version = "0.24.7"
|
version = "0.24.7"
|
||||||
|
|||||||
+1
-10
@@ -2,16 +2,7 @@ FROM rust:1.94-bookworm AS builder
|
|||||||
|
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
COPY . .
|
COPY . .
|
||||||
# compliance-agent depends on the private tramiton-core git repo. Authenticate
|
RUN cargo build --release -p compliance-agent
|
||||||
# the fetch with a PAT passed as a BuildKit secret (never baked into a layer).
|
|
||||||
# Build with: DOCKER_BUILDKIT=1 docker build --secret id=tramiton_token,env=TRAMITON_FETCH_TOKEN ...
|
|
||||||
RUN --mount=type=secret,id=tramiton_token \
|
|
||||||
if [ -s /run/secrets/tramiton_token ]; then \
|
|
||||||
git config --global \
|
|
||||||
url."https://sharang:$(cat /run/secrets/tramiton_token)@gitea.meghsakha.com/".insteadOf \
|
|
||||||
"ssh://git@gitea.meghsakha.com:22222/"; \
|
|
||||||
fi && \
|
|
||||||
CARGO_NET_GIT_FETCH_WITH_CLI=true cargo build --release -p compliance-agent
|
|
||||||
|
|
||||||
FROM debian:bookworm-slim
|
FROM debian:bookworm-slim
|
||||||
RUN apt-get update && apt-get install -y ca-certificates libssl3 git curl python3 python3-pip npm golang-go php-cli && rm -rf /var/lib/apt/lists/*
|
RUN apt-get update && apt-get install -y ca-certificates libssl3 git curl python3 python3-pip npm golang-go php-cli && rm -rf /var/lib/apt/lists/*
|
||||||
|
|||||||
@@ -10,11 +10,6 @@ workspace = true
|
|||||||
compliance-core = { workspace = true, features = ["mongodb", "telemetry", "axum"] }
|
compliance-core = { workspace = true, features = ["mongodb", "telemetry", "axum"] }
|
||||||
compliance-graph = { path = "../compliance-graph" }
|
compliance-graph = { path = "../compliance-graph" }
|
||||||
compliance-dast = { path = "../compliance-dast" }
|
compliance-dast = { path = "../compliance-dast" }
|
||||||
# Native firmware build/target detection for bare-metal & RTOS artifacts.
|
|
||||||
# Same-company IP, used directly (not via CLI) so the whole tramiton suite is
|
|
||||||
# available to the onboarding classifier. NOTE: CI must be able to fetch this
|
|
||||||
# private repo (see the git-auth step in .gitea/workflows/ci.yml).
|
|
||||||
tramiton-core = { git = "ssh://git@gitea.meghsakha.com:22222/sharang/tramiton.git", tag = "v0.4.0" }
|
|
||||||
serde = { workspace = true }
|
serde = { workspace = true }
|
||||||
serde_json = { workspace = true }
|
serde_json = { workspace = true }
|
||||||
tokio = { workspace = true }
|
tokio = { workspace = true }
|
||||||
|
|||||||
@@ -9,7 +9,6 @@ pub mod help_chat;
|
|||||||
pub mod issues;
|
pub mod issues;
|
||||||
pub mod mcp_tokens;
|
pub mod mcp_tokens;
|
||||||
pub mod notifications;
|
pub mod notifications;
|
||||||
pub mod onboarding;
|
|
||||||
pub mod pentest_handlers;
|
pub mod pentest_handlers;
|
||||||
pub use pentest_handlers as pentest;
|
pub use pentest_handlers as pentest;
|
||||||
pub mod repos;
|
pub mod repos;
|
||||||
|
|||||||
@@ -1,350 +0,0 @@
|
|||||||
//! Onboarding API — CRUD for unified targets, artifact add, classification, and
|
|
||||||
//! the scan-applicability matrix. The wizard (and future integrations) drive
|
|
||||||
//! onboarding through these endpoints.
|
|
||||||
|
|
||||||
use std::collections::HashMap;
|
|
||||||
use std::sync::Arc;
|
|
||||||
|
|
||||||
use axum::extract::{Extension, Path, Query};
|
|
||||||
use axum::http::StatusCode;
|
|
||||||
use axum::Json;
|
|
||||||
use mongodb::bson::{doc, oid::ObjectId, to_bson};
|
|
||||||
use serde::{Deserialize, Serialize};
|
|
||||||
|
|
||||||
use compliance_core::models::{
|
|
||||||
Artifact, ArtifactKind, ComplianceProfile, OnboardedTarget, PlcFormat, TargetScanConfig,
|
|
||||||
TargetType,
|
|
||||||
};
|
|
||||||
use compliance_core::scan_matrix::{applicable_scans, supports_pentest};
|
|
||||||
use compliance_core::tenant_ctx::TenantCtx;
|
|
||||||
|
|
||||||
use crate::agent::ComplianceAgent;
|
|
||||||
use crate::classify::{classify_target, MockFirmwareDetector};
|
|
||||||
|
|
||||||
use super::dto::tenant_db;
|
|
||||||
use super::{collect_cursor_async, ApiResponse, PaginationParams};
|
|
||||||
|
|
||||||
type AgentExt = Extension<Arc<ComplianceAgent>>;
|
|
||||||
|
|
||||||
/// A client-supplied artifact spec. The server builds the [`Artifact`] (and its
|
|
||||||
/// id) from it, so clients never set internal fields.
|
|
||||||
#[derive(Deserialize)]
|
|
||||||
pub struct ArtifactInput {
|
|
||||||
pub kind: ArtifactKind,
|
|
||||||
pub source_ref: String,
|
|
||||||
#[serde(default)]
|
|
||||||
pub branch: Option<String>,
|
|
||||||
#[serde(default)]
|
|
||||||
pub plc_format: Option<PlcFormat>,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl ArtifactInput {
|
|
||||||
fn build(&self) -> Artifact {
|
|
||||||
let s = self.source_ref.clone();
|
|
||||||
match self.kind {
|
|
||||||
ArtifactKind::GitRepo => {
|
|
||||||
Artifact::git_repo(s, self.branch.clone().unwrap_or_else(|| "main".to_string()))
|
|
||||||
}
|
|
||||||
ArtifactKind::LiveUrl => Artifact::live_url(s),
|
|
||||||
ArtifactKind::FirmwareImage => Artifact::firmware_image(s),
|
|
||||||
ArtifactKind::SourceArchive => Artifact::source_archive(s),
|
|
||||||
ArtifactKind::MobilePackage => Artifact::mobile_package(s),
|
|
||||||
ArtifactKind::ContainerImage => Artifact::container_image(s),
|
|
||||||
ArtifactKind::PlcProject => {
|
|
||||||
Artifact::plc_project(s, self.plc_format.unwrap_or(PlcFormat::PlcopenXml))
|
|
||||||
}
|
|
||||||
ArtifactKind::PlaintextDescription => Artifact::plaintext(s),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Deserialize)]
|
|
||||||
pub struct CreateTargetRequest {
|
|
||||||
pub name: String,
|
|
||||||
pub target_type: TargetType,
|
|
||||||
#[serde(default)]
|
|
||||||
pub description: Option<String>,
|
|
||||||
#[serde(default)]
|
|
||||||
pub artifacts: Vec<ArtifactInput>,
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Deserialize)]
|
|
||||||
pub struct UpdateTargetRequest {
|
|
||||||
pub name: Option<String>,
|
|
||||||
pub target_type: Option<TargetType>,
|
|
||||||
pub scan_config: Option<TargetScanConfig>,
|
|
||||||
pub compliance_profile: Option<ComplianceProfile>,
|
|
||||||
pub scan_schedule: Option<String>,
|
|
||||||
}
|
|
||||||
|
|
||||||
/// One applicable-scan option, serialized for the wizard.
|
|
||||||
#[derive(Serialize)]
|
|
||||||
pub struct ScanOptionDto {
|
|
||||||
pub scan: String,
|
|
||||||
pub default_on: bool,
|
|
||||||
pub rationale: String,
|
|
||||||
pub required_artifact: Option<String>,
|
|
||||||
pub blocked_reason: Option<String>,
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Serialize)]
|
|
||||||
pub struct ApplicableScansResponse {
|
|
||||||
pub scans: Vec<ScanOptionDto>,
|
|
||||||
pub pentest_supported: bool,
|
|
||||||
}
|
|
||||||
|
|
||||||
fn parse_oid(id: &str) -> Result<ObjectId, StatusCode> {
|
|
||||||
ObjectId::parse_str(id).map_err(|_| StatusCode::BAD_REQUEST)
|
|
||||||
}
|
|
||||||
|
|
||||||
/// GET /api/v1/targets — list onboarded targets (paginated).
|
|
||||||
#[tracing::instrument(skip_all)]
|
|
||||||
pub async fn list_targets(
|
|
||||||
Extension(agent): AgentExt,
|
|
||||||
tenant: TenantCtx,
|
|
||||||
Query(params): Query<PaginationParams>,
|
|
||||||
) -> Result<Json<ApiResponse<Vec<OnboardedTarget>>>, StatusCode> {
|
|
||||||
let db = tenant_db(&agent, &tenant).await?;
|
|
||||||
let skip = (params.page.saturating_sub(1)) * params.limit as u64;
|
|
||||||
let total = db
|
|
||||||
.onboarded_targets()
|
|
||||||
.count_documents(doc! {})
|
|
||||||
.await
|
|
||||||
.unwrap_or(0);
|
|
||||||
let targets = match db
|
|
||||||
.onboarded_targets()
|
|
||||||
.find(doc! {})
|
|
||||||
.skip(skip)
|
|
||||||
.limit(params.limit)
|
|
||||||
.await
|
|
||||||
{
|
|
||||||
Ok(cursor) => collect_cursor_async(cursor).await,
|
|
||||||
Err(e) => {
|
|
||||||
tracing::warn!("Failed to fetch onboarded targets: {e}");
|
|
||||||
Vec::new()
|
|
||||||
}
|
|
||||||
};
|
|
||||||
Ok(Json(ApiResponse {
|
|
||||||
data: targets,
|
|
||||||
total: Some(total),
|
|
||||||
page: Some(params.page),
|
|
||||||
}))
|
|
||||||
}
|
|
||||||
|
|
||||||
/// POST /api/v1/targets — create an onboarded target.
|
|
||||||
#[tracing::instrument(skip_all)]
|
|
||||||
pub async fn create_target(
|
|
||||||
Extension(agent): AgentExt,
|
|
||||||
tenant: TenantCtx,
|
|
||||||
Json(req): Json<CreateTargetRequest>,
|
|
||||||
) -> Result<Json<ApiResponse<OnboardedTarget>>, StatusCode> {
|
|
||||||
let mut target = OnboardedTarget::new(req.name, req.target_type);
|
|
||||||
target.description = req.description;
|
|
||||||
target.artifacts = req.artifacts.iter().map(ArtifactInput::build).collect();
|
|
||||||
|
|
||||||
let db = tenant_db(&agent, &tenant).await?;
|
|
||||||
let res = db
|
|
||||||
.onboarded_targets()
|
|
||||||
.insert_one(&target)
|
|
||||||
.await
|
|
||||||
.map_err(|_| StatusCode::INTERNAL_SERVER_ERROR)?;
|
|
||||||
target.id = res.inserted_id.as_object_id();
|
|
||||||
Ok(Json(ApiResponse {
|
|
||||||
data: target,
|
|
||||||
total: None,
|
|
||||||
page: None,
|
|
||||||
}))
|
|
||||||
}
|
|
||||||
|
|
||||||
/// GET /api/v1/targets/{id} — fetch one target.
|
|
||||||
#[tracing::instrument(skip_all, fields(target_id = %id))]
|
|
||||||
pub async fn get_target(
|
|
||||||
Extension(agent): AgentExt,
|
|
||||||
tenant: TenantCtx,
|
|
||||||
Path(id): Path<String>,
|
|
||||||
) -> Result<Json<ApiResponse<OnboardedTarget>>, StatusCode> {
|
|
||||||
let oid = parse_oid(&id)?;
|
|
||||||
let db = tenant_db(&agent, &tenant).await?;
|
|
||||||
let target = db
|
|
||||||
.onboarded_targets()
|
|
||||||
.find_one(doc! { "_id": oid })
|
|
||||||
.await
|
|
||||||
.map_err(|_| StatusCode::INTERNAL_SERVER_ERROR)?
|
|
||||||
.ok_or(StatusCode::NOT_FOUND)?;
|
|
||||||
Ok(Json(ApiResponse {
|
|
||||||
data: target,
|
|
||||||
total: None,
|
|
||||||
page: None,
|
|
||||||
}))
|
|
||||||
}
|
|
||||||
|
|
||||||
/// PATCH /api/v1/targets/{id} — update mutable fields.
|
|
||||||
#[tracing::instrument(skip_all, fields(target_id = %id))]
|
|
||||||
pub async fn update_target(
|
|
||||||
Extension(agent): AgentExt,
|
|
||||||
tenant: TenantCtx,
|
|
||||||
Path(id): Path<String>,
|
|
||||||
Json(req): Json<UpdateTargetRequest>,
|
|
||||||
) -> Result<Json<ApiResponse<OnboardedTarget>>, StatusCode> {
|
|
||||||
let oid = parse_oid(&id)?;
|
|
||||||
let db = tenant_db(&agent, &tenant).await?;
|
|
||||||
|
|
||||||
let mut set = doc! { "updated_at": mongodb::bson::DateTime::now() };
|
|
||||||
if let Some(name) = req.name {
|
|
||||||
set.insert("name", name);
|
|
||||||
}
|
|
||||||
if let Some(tt) = req.target_type {
|
|
||||||
set.insert(
|
|
||||||
"target_type",
|
|
||||||
to_bson(&tt).map_err(|_| StatusCode::BAD_REQUEST)?,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
if let Some(sc) = req.scan_config {
|
|
||||||
set.insert(
|
|
||||||
"scan_config",
|
|
||||||
to_bson(&sc).map_err(|_| StatusCode::BAD_REQUEST)?,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
if let Some(cp) = req.compliance_profile {
|
|
||||||
set.insert(
|
|
||||||
"compliance_profile",
|
|
||||||
to_bson(&cp).map_err(|_| StatusCode::BAD_REQUEST)?,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
if let Some(ss) = req.scan_schedule {
|
|
||||||
set.insert("scan_schedule", ss);
|
|
||||||
}
|
|
||||||
|
|
||||||
db.onboarded_targets()
|
|
||||||
.update_one(doc! { "_id": oid }, doc! { "$set": set })
|
|
||||||
.await
|
|
||||||
.map_err(|_| StatusCode::INTERNAL_SERVER_ERROR)?;
|
|
||||||
|
|
||||||
get_target(Extension(agent), tenant, Path(id)).await
|
|
||||||
}
|
|
||||||
|
|
||||||
/// DELETE /api/v1/targets/{id} — remove the target and its findings/scans.
|
|
||||||
#[tracing::instrument(skip_all, fields(target_id = %id))]
|
|
||||||
pub async fn delete_target(
|
|
||||||
Extension(agent): AgentExt,
|
|
||||||
tenant: TenantCtx,
|
|
||||||
Path(id): Path<String>,
|
|
||||||
) -> Result<Json<serde_json::Value>, StatusCode> {
|
|
||||||
let oid = parse_oid(&id)?;
|
|
||||||
let db = tenant_db(&agent, &tenant).await?;
|
|
||||||
db.onboarded_targets()
|
|
||||||
.delete_one(doc! { "_id": oid })
|
|
||||||
.await
|
|
||||||
.map_err(|_| StatusCode::INTERNAL_SERVER_ERROR)?;
|
|
||||||
// Cascade the collections keyed by repo_id == target id (best-effort).
|
|
||||||
let by_repo = doc! { "repo_id": &id };
|
|
||||||
let _ = db.findings().delete_many(by_repo.clone()).await;
|
|
||||||
let _ = db.scan_runs().delete_many(by_repo.clone()).await;
|
|
||||||
let _ = db.sbom_entries().delete_many(by_repo.clone()).await;
|
|
||||||
let _ = db.cve_alerts().delete_many(by_repo).await;
|
|
||||||
Ok(Json(serde_json::json!({ "status": "deleted" })))
|
|
||||||
}
|
|
||||||
|
|
||||||
/// POST /api/v1/targets/{id}/artifacts — attach an artifact (by reference).
|
|
||||||
#[tracing::instrument(skip_all, fields(target_id = %id))]
|
|
||||||
pub async fn add_artifact(
|
|
||||||
Extension(agent): AgentExt,
|
|
||||||
tenant: TenantCtx,
|
|
||||||
Path(id): Path<String>,
|
|
||||||
Json(input): Json<ArtifactInput>,
|
|
||||||
) -> Result<Json<ApiResponse<OnboardedTarget>>, StatusCode> {
|
|
||||||
let oid = parse_oid(&id)?;
|
|
||||||
let db = tenant_db(&agent, &tenant).await?;
|
|
||||||
let artifact = to_bson(&input.build()).map_err(|_| StatusCode::BAD_REQUEST)?;
|
|
||||||
db.onboarded_targets()
|
|
||||||
.update_one(
|
|
||||||
doc! { "_id": oid },
|
|
||||||
doc! { "$push": { "artifacts": artifact }, "$set": { "updated_at": mongodb::bson::DateTime::now() } },
|
|
||||||
)
|
|
||||||
.await
|
|
||||||
.map_err(|_| StatusCode::INTERNAL_SERVER_ERROR)?;
|
|
||||||
get_target(Extension(agent), tenant, Path(id)).await
|
|
||||||
}
|
|
||||||
|
|
||||||
/// GET /api/v1/targets/{id}/applicable-scans — the scan-applicability matrix.
|
|
||||||
#[tracing::instrument(skip_all, fields(target_id = %id))]
|
|
||||||
pub async fn applicable_scans_for_target(
|
|
||||||
Extension(agent): AgentExt,
|
|
||||||
tenant: TenantCtx,
|
|
||||||
Path(id): Path<String>,
|
|
||||||
) -> Result<Json<ApiResponse<ApplicableScansResponse>>, StatusCode> {
|
|
||||||
let oid = parse_oid(&id)?;
|
|
||||||
let db = tenant_db(&agent, &tenant).await?;
|
|
||||||
let target = db
|
|
||||||
.onboarded_targets()
|
|
||||||
.find_one(doc! { "_id": oid })
|
|
||||||
.await
|
|
||||||
.map_err(|_| StatusCode::INTERNAL_SERVER_ERROR)?
|
|
||||||
.ok_or(StatusCode::NOT_FOUND)?;
|
|
||||||
|
|
||||||
let scans = applicable_scans(&target)
|
|
||||||
.into_iter()
|
|
||||||
.map(|o| ScanOptionDto {
|
|
||||||
scan: o.scan.to_string(),
|
|
||||||
default_on: o.default_on,
|
|
||||||
rationale: o.rationale,
|
|
||||||
required_artifact: o.required_artifact.map(|k| k.to_string()),
|
|
||||||
blocked_reason: o.blocked_reason,
|
|
||||||
})
|
|
||||||
.collect();
|
|
||||||
|
|
||||||
Ok(Json(ApiResponse {
|
|
||||||
data: ApplicableScansResponse {
|
|
||||||
scans,
|
|
||||||
pentest_supported: supports_pentest(target.target_type),
|
|
||||||
},
|
|
||||||
total: None,
|
|
||||||
page: None,
|
|
||||||
}))
|
|
||||||
}
|
|
||||||
|
|
||||||
/// POST /api/v1/targets/{id}/detect — classify the target from its artifacts.
|
|
||||||
///
|
|
||||||
/// This is the lightweight pass: it classifies from artifact kinds without
|
|
||||||
/// ingesting (cloning) sources, so it returns immediately. Deep detection (after
|
|
||||||
/// ingest, with tramiton firmware analysis) is a follow-up background step.
|
|
||||||
#[tracing::instrument(skip_all, fields(target_id = %id))]
|
|
||||||
pub async fn detect_target(
|
|
||||||
Extension(agent): AgentExt,
|
|
||||||
tenant: TenantCtx,
|
|
||||||
Path(id): Path<String>,
|
|
||||||
) -> Result<Json<ApiResponse<OnboardedTarget>>, StatusCode> {
|
|
||||||
let oid = parse_oid(&id)?;
|
|
||||||
let db = tenant_db(&agent, &tenant).await?;
|
|
||||||
let mut target = db
|
|
||||||
.onboarded_targets()
|
|
||||||
.find_one(doc! { "_id": oid })
|
|
||||||
.await
|
|
||||||
.map_err(|_| StatusCode::INTERNAL_SERVER_ERROR)?
|
|
||||||
.ok_or(StatusCode::NOT_FOUND)?;
|
|
||||||
|
|
||||||
// No ingested working paths here → kind-based classification only; the mock
|
|
||||||
// firmware detector is never invoked (no firmware working path present).
|
|
||||||
let empty = HashMap::new();
|
|
||||||
let detector = MockFirmwareDetector { detection: None };
|
|
||||||
let classification = classify_target(&target, &empty, &detector)
|
|
||||||
.await
|
|
||||||
.map_err(|_| StatusCode::INTERNAL_SERVER_ERROR)?;
|
|
||||||
|
|
||||||
let classification_bson =
|
|
||||||
to_bson(&classification).map_err(|_| StatusCode::INTERNAL_SERVER_ERROR)?;
|
|
||||||
db.onboarded_targets()
|
|
||||||
.update_one(
|
|
||||||
doc! { "_id": oid },
|
|
||||||
doc! { "$set": { "classification": classification_bson, "updated_at": mongodb::bson::DateTime::now() } },
|
|
||||||
)
|
|
||||||
.await
|
|
||||||
.map_err(|_| StatusCode::INTERNAL_SERVER_ERROR)?;
|
|
||||||
target.classification = Some(classification);
|
|
||||||
|
|
||||||
Ok(Json(ApiResponse {
|
|
||||||
data: target,
|
|
||||||
total: None,
|
|
||||||
page: None,
|
|
||||||
}))
|
|
||||||
}
|
|
||||||
@@ -25,29 +25,6 @@ pub fn build_router() -> Router {
|
|||||||
"/api/v1/repositories/{id}/webhook-config",
|
"/api/v1/repositories/{id}/webhook-config",
|
||||||
get(handlers::get_webhook_config),
|
get(handlers::get_webhook_config),
|
||||||
)
|
)
|
||||||
// Unified onboarding targets (#131).
|
|
||||||
.route(
|
|
||||||
"/api/v1/targets",
|
|
||||||
get(handlers::onboarding::list_targets).post(handlers::onboarding::create_target),
|
|
||||||
)
|
|
||||||
.route(
|
|
||||||
"/api/v1/targets/{id}",
|
|
||||||
get(handlers::onboarding::get_target)
|
|
||||||
.patch(handlers::onboarding::update_target)
|
|
||||||
.delete(handlers::onboarding::delete_target),
|
|
||||||
)
|
|
||||||
.route(
|
|
||||||
"/api/v1/targets/{id}/artifacts",
|
|
||||||
post(handlers::onboarding::add_artifact),
|
|
||||||
)
|
|
||||||
.route(
|
|
||||||
"/api/v1/targets/{id}/applicable-scans",
|
|
||||||
get(handlers::onboarding::applicable_scans_for_target),
|
|
||||||
)
|
|
||||||
.route(
|
|
||||||
"/api/v1/targets/{id}/detect",
|
|
||||||
post(handlers::onboarding::detect_target),
|
|
||||||
)
|
|
||||||
.route("/api/v1/findings", get(handlers::list_findings))
|
.route("/api/v1/findings", get(handlers::list_findings))
|
||||||
.route("/api/v1/findings/{id}", get(handlers::get_finding))
|
.route("/api/v1/findings/{id}", get(handlers::get_finding))
|
||||||
.route(
|
.route(
|
||||||
|
|||||||
@@ -1,217 +0,0 @@
|
|||||||
//! Firmware classification via tramiton.
|
|
||||||
//!
|
|
||||||
//! tramiton is the company's firmware build/repro engine; we do not re-implement
|
|
||||||
//! its detection. We depend on `tramiton-core` directly (same-company IP) and run
|
|
||||||
//! its provider analysis in-process behind a [`FirmwareDetector`] port, mapping
|
|
||||||
//! tramiton's `BuildPlan` onto a [`TargetType`]. A deterministic
|
|
||||||
//! [`MockFirmwareDetector`] backs the tests so CI unit tests need neither the
|
|
||||||
//! tramiton sources nor a real firmware tree.
|
|
||||||
|
|
||||||
use std::path::Path;
|
|
||||||
|
|
||||||
use compliance_core::error::CoreError;
|
|
||||||
use compliance_core::models::{DetectedFact, TargetType};
|
|
||||||
use compliance_core::traits::ClassifierVerdict;
|
|
||||||
|
|
||||||
/// A minimal firmware-detection summary, mapped from tramiton's `BuildPlan`.
|
|
||||||
/// Kept small and tramiton-independent so the classifier and the test mock don't
|
|
||||||
/// need to construct a full tramiton plan.
|
|
||||||
#[derive(Debug, Clone, Default)]
|
|
||||||
pub struct FirmwareDetection {
|
|
||||||
/// The detecting provider (e.g. `zephyr`, `cmake`, `source-archaeology`).
|
|
||||||
pub provider: String,
|
|
||||||
/// Detection confidence: `low` | `medium` | `high`.
|
|
||||||
pub confidence: String,
|
|
||||||
/// Build-system label (e.g. `Zephyr`, `ESP-IDF`, `CMake`).
|
|
||||||
pub build_system: String,
|
|
||||||
/// Framework, when known (`zephyr`, `esp-idf`, `bare-metal`, ...).
|
|
||||||
pub framework: Option<String>,
|
|
||||||
/// Target board / MCU / arch.
|
|
||||||
pub target: FirmwareTarget,
|
|
||||||
/// Unresolved gaps in the plan.
|
|
||||||
pub gaps: Vec<String>,
|
|
||||||
}
|
|
||||||
|
|
||||||
/// The detected firmware target (board / MCU / arch).
|
|
||||||
#[derive(Debug, Clone, Default)]
|
|
||||||
pub struct FirmwareTarget {
|
|
||||||
/// Board name.
|
|
||||||
pub board: Option<String>,
|
|
||||||
/// MCU part.
|
|
||||||
pub mcu: Option<String>,
|
|
||||||
/// Architecture.
|
|
||||||
pub arch: Option<String>,
|
|
||||||
}
|
|
||||||
|
|
||||||
/// A source of tramiton firmware detection.
|
|
||||||
#[allow(async_fn_in_trait)]
|
|
||||||
pub trait FirmwareDetector: Send + Sync {
|
|
||||||
/// Run detection over a path, returning a firmware detection if tramiton
|
|
||||||
/// could form a build plan.
|
|
||||||
async fn detect(&self, path: &Path) -> Result<Option<FirmwareDetection>, CoreError>;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Uses `tramiton-core` in-process. The analysis is blocking (filesystem walk),
|
|
||||||
/// so it runs on a blocking thread to avoid stalling the async runtime. A path
|
|
||||||
/// with no recognizable build system yields `Ok(None)`.
|
|
||||||
pub struct TramitonNative;
|
|
||||||
|
|
||||||
impl FirmwareDetector for TramitonNative {
|
|
||||||
async fn detect(&self, path: &Path) -> Result<Option<FirmwareDetection>, CoreError> {
|
|
||||||
let path = path.to_path_buf();
|
|
||||||
let plan = tokio::task::spawn_blocking(move || {
|
|
||||||
let repo = tramiton_core::Repo::new(&path);
|
|
||||||
tramiton_core::provider::analyze(&repo)
|
|
||||||
})
|
|
||||||
.await
|
|
||||||
.map_err(|e| CoreError::Other(format!("tramiton detect task join error: {e}")))?
|
|
||||||
.map_err(|e| CoreError::Other(format!("tramiton analyze error: {e}")))?;
|
|
||||||
Ok(plan.map(|bp| detection_from_build_plan(&bp)))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Map tramiton's `BuildPlan` onto our minimal detection summary.
|
|
||||||
fn detection_from_build_plan(bp: &tramiton_core::BuildPlan) -> FirmwareDetection {
|
|
||||||
FirmwareDetection {
|
|
||||||
provider: bp.provider.clone(),
|
|
||||||
confidence: bp.confidence.to_string(),
|
|
||||||
build_system: bp.build_system.label().to_string(),
|
|
||||||
framework: bp.framework.clone(),
|
|
||||||
target: FirmwareTarget {
|
|
||||||
board: bp.target.board.clone(),
|
|
||||||
mcu: bp.target.mcu.clone(),
|
|
||||||
arch: bp.target.arch.clone(),
|
|
||||||
},
|
|
||||||
gaps: bp.gaps.clone(),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Map a firmware detection to a target type. Framework/build-system signals
|
|
||||||
/// distinguish RTOS from bare-metal from Yocto.
|
|
||||||
pub fn detection_to_target_type(det: &FirmwareDetection) -> TargetType {
|
|
||||||
let framework = det.framework.as_deref().unwrap_or("").to_lowercase();
|
|
||||||
let build_system = det.build_system.to_lowercase();
|
|
||||||
let signal = format!("{framework} {build_system} {}", det.provider.to_lowercase());
|
|
||||||
|
|
||||||
const RTOS: [&str; 6] = ["zephyr", "esp-idf", "freertos", "nuttx", "riot", "chibios"];
|
|
||||||
if signal.contains("bitbake") || signal.contains("yocto") || signal.contains("openembedded") {
|
|
||||||
TargetType::EmbeddedLinuxYocto
|
|
||||||
} else if RTOS.iter().any(|k| signal.contains(k)) {
|
|
||||||
TargetType::FirmwareRtos
|
|
||||||
} else {
|
|
||||||
TargetType::FirmwareBareMetal
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Map tramiton's confidence label to a `[0,1]` score.
|
|
||||||
fn confidence_score(label: &str) -> f32 {
|
|
||||||
match label.to_lowercase().as_str() {
|
|
||||||
"high" => 0.9,
|
|
||||||
"medium" => 0.6,
|
|
||||||
"low" => 0.3,
|
|
||||||
_ => 0.4,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Turn a firmware detection into a classifier verdict, carrying the MCU / board
|
|
||||||
/// / build-system as facts.
|
|
||||||
pub fn detection_to_verdict(det: &FirmwareDetection) -> ClassifierVerdict {
|
|
||||||
let target_type = detection_to_target_type(det);
|
|
||||||
let mut facts = vec![DetectedFact::new(
|
|
||||||
"build_system",
|
|
||||||
det.build_system.clone(),
|
|
||||||
"tramiton",
|
|
||||||
)];
|
|
||||||
if let Some(fw) = &det.framework {
|
|
||||||
facts.push(DetectedFact::new("framework", fw.clone(), "tramiton"));
|
|
||||||
}
|
|
||||||
if let Some(mcu) = &det.target.mcu {
|
|
||||||
facts.push(DetectedFact::new("mcu", mcu.clone(), "tramiton"));
|
|
||||||
}
|
|
||||||
if let Some(board) = &det.target.board {
|
|
||||||
facts.push(DetectedFact::new("board", board.clone(), "tramiton"));
|
|
||||||
}
|
|
||||||
if let Some(arch) = &det.target.arch {
|
|
||||||
facts.push(DetectedFact::new("arch", arch.clone(), "tramiton"));
|
|
||||||
}
|
|
||||||
ClassifierVerdict {
|
|
||||||
target_type,
|
|
||||||
confidence: confidence_score(&det.confidence),
|
|
||||||
facts,
|
|
||||||
rationale: format!(
|
|
||||||
"tramiton detected build system '{}'{}",
|
|
||||||
det.build_system,
|
|
||||||
det.framework
|
|
||||||
.as_ref()
|
|
||||||
.map(|f| format!(" (framework {f})"))
|
|
||||||
.unwrap_or_default()
|
|
||||||
),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// A deterministic [`FirmwareDetector`] for tests — returns a preset detection.
|
|
||||||
pub struct MockFirmwareDetector {
|
|
||||||
/// The detection to return (or `None` for "no detection").
|
|
||||||
pub detection: Option<FirmwareDetection>,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl FirmwareDetector for MockFirmwareDetector {
|
|
||||||
async fn detect(&self, _path: &Path) -> Result<Option<FirmwareDetection>, CoreError> {
|
|
||||||
Ok(self.detection.clone())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[cfg(test)]
|
|
||||||
#[allow(clippy::expect_used, clippy::unwrap_used)]
|
|
||||||
mod tests {
|
|
||||||
use super::*;
|
|
||||||
|
|
||||||
fn detection(build_system: &str, framework: Option<&str>) -> FirmwareDetection {
|
|
||||||
FirmwareDetection {
|
|
||||||
provider: build_system.to_string(),
|
|
||||||
confidence: "high".to_string(),
|
|
||||||
build_system: build_system.to_string(),
|
|
||||||
framework: framework.map(|s| s.to_string()),
|
|
||||||
target: FirmwareTarget {
|
|
||||||
mcu: Some("stm32f429".to_string()),
|
|
||||||
..Default::default()
|
|
||||||
},
|
|
||||||
gaps: Vec::new(),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn zephyr_maps_to_rtos() {
|
|
||||||
assert_eq!(
|
|
||||||
detection_to_target_type(&detection("zephyr", Some("zephyr"))),
|
|
||||||
TargetType::FirmwareRtos
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn bare_cmake_maps_to_bare_metal() {
|
|
||||||
assert_eq!(
|
|
||||||
detection_to_target_type(&detection("cmake", Some("bare-metal"))),
|
|
||||||
TargetType::FirmwareBareMetal
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn bitbake_maps_to_yocto() {
|
|
||||||
assert_eq!(
|
|
||||||
detection_to_target_type(&detection("bitbake", None)),
|
|
||||||
TargetType::EmbeddedLinuxYocto
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn verdict_carries_mcu_fact_and_confidence() {
|
|
||||||
let v = detection_to_verdict(&detection("esp-idf", Some("esp-idf")));
|
|
||||||
assert_eq!(v.target_type, TargetType::FirmwareRtos);
|
|
||||||
assert!((v.confidence - 0.9).abs() < f32::EPSILON);
|
|
||||||
assert!(v
|
|
||||||
.facts
|
|
||||||
.iter()
|
|
||||||
.any(|f| f.key == "mcu" && f.value == "stm32f429"));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,357 +0,0 @@
|
|||||||
//! Heuristic target-type classification from artifact kinds and source markers.
|
|
||||||
//!
|
|
||||||
//! Complements the tramiton firmware detector: this handles web / backend /
|
|
||||||
//! mobile / desktop / PLC by sniffing manifest files and file extensions in the
|
|
||||||
//! ingested code trees, plus strong priors from the artifact kinds themselves
|
|
||||||
//! (a PLC-project artifact is a PLC target; an `.ipa` is an iOS app).
|
|
||||||
|
|
||||||
use std::collections::HashSet;
|
|
||||||
use std::fs;
|
|
||||||
use std::path::Path;
|
|
||||||
|
|
||||||
use compliance_core::error::CoreError;
|
|
||||||
use compliance_core::models::{ArtifactKind, DetectedFact, TargetType};
|
|
||||||
use compliance_core::traits::{ClassificationInput, ClassifierVerdict, TargetClassifier};
|
|
||||||
|
|
||||||
/// Max directory depth scanned for marker files.
|
|
||||||
const SCAN_DEPTH: usize = 2;
|
|
||||||
|
|
||||||
/// Markers collected from a code tree.
|
|
||||||
#[derive(Default)]
|
|
||||||
struct Markers {
|
|
||||||
files: HashSet<String>,
|
|
||||||
dirs: HashSet<String>,
|
|
||||||
exts: HashSet<String>,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl Markers {
|
|
||||||
fn has_file(&self, name: &str) -> bool {
|
|
||||||
self.files.contains(name)
|
|
||||||
}
|
|
||||||
fn has_ext(&self, ext: &str) -> bool {
|
|
||||||
self.exts.contains(ext)
|
|
||||||
}
|
|
||||||
fn any_dir_ends_with(&self, suffix: &str) -> bool {
|
|
||||||
self.dirs.iter().any(|d| d.ends_with(suffix))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Recursively collect marker file/dir/extension names up to [`SCAN_DEPTH`].
|
|
||||||
fn collect_markers(root: &Path) -> Markers {
|
|
||||||
let mut m = Markers::default();
|
|
||||||
scan_dir(root, 0, &mut m);
|
|
||||||
m
|
|
||||||
}
|
|
||||||
|
|
||||||
fn scan_dir(dir: &Path, depth: usize, m: &mut Markers) {
|
|
||||||
let Ok(entries) = fs::read_dir(dir) else {
|
|
||||||
return;
|
|
||||||
};
|
|
||||||
for entry in entries.flatten() {
|
|
||||||
let path = entry.path();
|
|
||||||
let name = entry.file_name().to_string_lossy().to_lowercase();
|
|
||||||
if path.is_dir() {
|
|
||||||
m.dirs.insert(name);
|
|
||||||
if depth < SCAN_DEPTH {
|
|
||||||
scan_dir(&path, depth + 1, m);
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
if let Some(ext) = path.extension() {
|
|
||||||
m.exts.insert(ext.to_string_lossy().to_lowercase());
|
|
||||||
}
|
|
||||||
m.files.insert(name);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Whether a `package.json` at `root` looks like a front-end app.
|
|
||||||
fn package_json_is_frontend(root: &Path) -> bool {
|
|
||||||
let Ok(content) = fs::read_to_string(root.join("package.json")) else {
|
|
||||||
return false;
|
|
||||||
};
|
|
||||||
let c = content.to_lowercase();
|
|
||||||
["react", "next", "vue", "@angular", "svelte", "vite"]
|
|
||||||
.iter()
|
|
||||||
.any(|f| c.contains(f))
|
|
||||||
}
|
|
||||||
|
|
||||||
/// The heuristic classifier: artifact-kind priors + source-tree markers.
|
|
||||||
pub struct HeuristicClassifier;
|
|
||||||
|
|
||||||
impl HeuristicClassifier {
|
|
||||||
/// Verdicts from the artifact kinds alone (no filesystem needed).
|
|
||||||
fn kind_priors(&self, input: &ClassificationInput<'_>) -> Vec<ClassifierVerdict> {
|
|
||||||
let mut out = Vec::new();
|
|
||||||
for a in input.artifacts {
|
|
||||||
let lower = a.source_ref.to_lowercase();
|
|
||||||
match a.kind {
|
|
||||||
ArtifactKind::PlcProject => out.push(verdict(
|
|
||||||
TargetType::PlcSps,
|
|
||||||
0.85,
|
|
||||||
"PLC project artifact",
|
|
||||||
vec![],
|
|
||||||
)),
|
|
||||||
ArtifactKind::MobilePackage => {
|
|
||||||
let (tt, why) = if lower.ends_with(".ipa") {
|
|
||||||
(TargetType::IosApp, "iOS package (.ipa)")
|
|
||||||
} else {
|
|
||||||
(TargetType::AndroidApp, "Android package (.apk/.aab)")
|
|
||||||
};
|
|
||||||
out.push(verdict(tt, 0.85, why, vec![]));
|
|
||||||
}
|
|
||||||
ArtifactKind::ContainerImage => out.push(verdict(
|
|
||||||
TargetType::BackendService,
|
|
||||||
0.4,
|
|
||||||
"container image",
|
|
||||||
vec![],
|
|
||||||
)),
|
|
||||||
ArtifactKind::FirmwareImage => out.push(verdict(
|
|
||||||
TargetType::FirmwareBareMetal,
|
|
||||||
0.35,
|
|
||||||
"firmware image (pending tramiton detection)",
|
|
||||||
vec![],
|
|
||||||
)),
|
|
||||||
ArtifactKind::LiveUrl if input.artifacts.len() == 1 => {
|
|
||||||
out.push(verdict(TargetType::WebApp, 0.3, "live URL only", vec![]))
|
|
||||||
}
|
|
||||||
_ => {}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
out
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Verdicts from scanning the ingested code trees for manifest markers.
|
|
||||||
fn source_verdicts(&self, input: &ClassificationInput<'_>) -> Vec<ClassifierVerdict> {
|
|
||||||
let mut out = Vec::new();
|
|
||||||
for a in input.artifacts {
|
|
||||||
if !matches!(a.kind, ArtifactKind::GitRepo | ArtifactKind::SourceArchive) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
let Some(path) = input.working_paths.get(&a.id) else {
|
|
||||||
continue;
|
|
||||||
};
|
|
||||||
let m = collect_markers(path);
|
|
||||||
|
|
||||||
// Mobile (checked first — strongest signal).
|
|
||||||
if m.has_file("androidmanifest.xml") || m.has_ext("apk") || m.has_ext("aab") {
|
|
||||||
out.push(verdict(
|
|
||||||
TargetType::AndroidApp,
|
|
||||||
0.8,
|
|
||||||
"Android manifest / gradle",
|
|
||||||
facts_lang("kotlin/java"),
|
|
||||||
));
|
|
||||||
}
|
|
||||||
if m.any_dir_ends_with(".xcodeproj")
|
|
||||||
|| m.has_file("info.plist")
|
|
||||||
|| m.has_file("podfile")
|
|
||||||
|| m.has_ext("ipa")
|
|
||||||
{
|
|
||||||
out.push(verdict(
|
|
||||||
TargetType::IosApp,
|
|
||||||
0.8,
|
|
||||||
"Xcode project / Info.plist",
|
|
||||||
facts_lang("swift/objc"),
|
|
||||||
));
|
|
||||||
}
|
|
||||||
// Desktop.
|
|
||||||
if m.has_ext("sln")
|
|
||||||
|| m.has_ext("csproj")
|
|
||||||
|| m.has_ext("vcxproj")
|
|
||||||
|| m.has_ext("desktop")
|
|
||||||
{
|
|
||||||
out.push(verdict(
|
|
||||||
TargetType::DesktopApp,
|
|
||||||
0.7,
|
|
||||||
"desktop project files",
|
|
||||||
facts_lang("dotnet/native"),
|
|
||||||
));
|
|
||||||
}
|
|
||||||
// PLC.
|
|
||||||
if m.has_ext("st") {
|
|
||||||
out.push(verdict(
|
|
||||||
TargetType::PlcSps,
|
|
||||||
0.8,
|
|
||||||
"Structured Text sources",
|
|
||||||
facts_lang("iec-61131-3"),
|
|
||||||
));
|
|
||||||
}
|
|
||||||
// Web vs backend from package.json.
|
|
||||||
if m.has_file("package.json") {
|
|
||||||
if package_json_is_frontend(path) {
|
|
||||||
out.push(verdict(
|
|
||||||
TargetType::WebApp,
|
|
||||||
0.65,
|
|
||||||
"package.json with a front-end framework",
|
|
||||||
facts_lang("javascript"),
|
|
||||||
));
|
|
||||||
} else {
|
|
||||||
out.push(verdict(
|
|
||||||
TargetType::BackendService,
|
|
||||||
0.55,
|
|
||||||
"package.json (no front-end framework)",
|
|
||||||
facts_lang("javascript"),
|
|
||||||
));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
// Backend languages.
|
|
||||||
for (file, lang) in [
|
|
||||||
("cargo.toml", "rust"),
|
|
||||||
("go.mod", "go"),
|
|
||||||
("pom.xml", "java"),
|
|
||||||
("requirements.txt", "python"),
|
|
||||||
("pyproject.toml", "python"),
|
|
||||||
] {
|
|
||||||
if m.has_file(file) {
|
|
||||||
out.push(verdict(
|
|
||||||
TargetType::BackendService,
|
|
||||||
0.6,
|
|
||||||
"backend build manifest",
|
|
||||||
facts_lang(lang),
|
|
||||||
));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
// Container-only.
|
|
||||||
if m.has_file("dockerfile") && out.is_empty() {
|
|
||||||
out.push(verdict(
|
|
||||||
TargetType::BackendService,
|
|
||||||
0.4,
|
|
||||||
"Dockerfile",
|
|
||||||
facts_lang("container"),
|
|
||||||
));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
out
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
impl TargetClassifier for HeuristicClassifier {
|
|
||||||
fn name(&self) -> &str {
|
|
||||||
"heuristic"
|
|
||||||
}
|
|
||||||
|
|
||||||
async fn classify(
|
|
||||||
&self,
|
|
||||||
input: &ClassificationInput<'_>,
|
|
||||||
) -> Result<Vec<ClassifierVerdict>, CoreError> {
|
|
||||||
let mut out = self.kind_priors(input);
|
|
||||||
out.extend(self.source_verdicts(input));
|
|
||||||
Ok(out)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fn verdict(
|
|
||||||
target_type: TargetType,
|
|
||||||
confidence: f32,
|
|
||||||
rationale: &str,
|
|
||||||
facts: Vec<DetectedFact>,
|
|
||||||
) -> ClassifierVerdict {
|
|
||||||
ClassifierVerdict {
|
|
||||||
target_type,
|
|
||||||
confidence,
|
|
||||||
facts,
|
|
||||||
rationale: rationale.to_string(),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fn facts_lang(lang: &str) -> Vec<DetectedFact> {
|
|
||||||
vec![DetectedFact::new("language", lang, "heuristic")]
|
|
||||||
}
|
|
||||||
|
|
||||||
#[cfg(test)]
|
|
||||||
#[allow(clippy::expect_used, clippy::unwrap_used)]
|
|
||||||
mod tests {
|
|
||||||
use super::*;
|
|
||||||
use compliance_core::models::Artifact;
|
|
||||||
use std::collections::HashMap;
|
|
||||||
use std::path::PathBuf;
|
|
||||||
|
|
||||||
struct Scratch(PathBuf);
|
|
||||||
impl Scratch {
|
|
||||||
fn new() -> Self {
|
|
||||||
let p = std::env::temp_dir().join(format!("cs-classify-{}", uuid::Uuid::new_v4()));
|
|
||||||
fs::create_dir_all(&p).expect("mkdir");
|
|
||||||
Self(p)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
impl Drop for Scratch {
|
|
||||||
fn drop(&mut self) {
|
|
||||||
let _ = fs::remove_dir_all(&self.0);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async fn classify_tree(setup: impl FnOnce(&Path)) -> Vec<ClassifierVerdict> {
|
|
||||||
let scratch = Scratch::new();
|
|
||||||
setup(&scratch.0);
|
|
||||||
let artifact = Artifact::git_repo("https://git/x", "main");
|
|
||||||
let mut wp = HashMap::new();
|
|
||||||
wp.insert(artifact.id.clone(), scratch.0.clone());
|
|
||||||
let artifacts = vec![artifact];
|
|
||||||
let input = ClassificationInput {
|
|
||||||
artifacts: &artifacts,
|
|
||||||
working_paths: &wp,
|
|
||||||
description: None,
|
|
||||||
};
|
|
||||||
HeuristicClassifier
|
|
||||||
.classify(&input)
|
|
||||||
.await
|
|
||||||
.expect("classify")
|
|
||||||
}
|
|
||||||
|
|
||||||
#[tokio::test]
|
|
||||||
async fn frontend_package_json_is_webapp() {
|
|
||||||
let v = classify_tree(|root| {
|
|
||||||
fs::write(
|
|
||||||
root.join("package.json"),
|
|
||||||
r#"{"dependencies":{"react":"18"}}"#,
|
|
||||||
)
|
|
||||||
.unwrap();
|
|
||||||
})
|
|
||||||
.await;
|
|
||||||
assert!(v.iter().any(|x| x.target_type == TargetType::WebApp));
|
|
||||||
}
|
|
||||||
|
|
||||||
#[tokio::test]
|
|
||||||
async fn cargo_toml_is_backend() {
|
|
||||||
let v = classify_tree(|root| {
|
|
||||||
fs::write(root.join("Cargo.toml"), "[package]\nname='x'").unwrap();
|
|
||||||
})
|
|
||||||
.await;
|
|
||||||
assert!(v
|
|
||||||
.iter()
|
|
||||||
.any(|x| x.target_type == TargetType::BackendService));
|
|
||||||
}
|
|
||||||
|
|
||||||
#[tokio::test]
|
|
||||||
async fn android_manifest_is_android() {
|
|
||||||
let v = classify_tree(|root| {
|
|
||||||
fs::write(root.join("AndroidManifest.xml"), "<manifest/>").unwrap();
|
|
||||||
})
|
|
||||||
.await;
|
|
||||||
assert!(v.iter().any(|x| x.target_type == TargetType::AndroidApp));
|
|
||||||
}
|
|
||||||
|
|
||||||
#[tokio::test]
|
|
||||||
async fn structured_text_is_plc() {
|
|
||||||
let v = classify_tree(|root| {
|
|
||||||
fs::write(root.join("main.st"), "PROGRAM main END_PROGRAM").unwrap();
|
|
||||||
})
|
|
||||||
.await;
|
|
||||||
assert!(v.iter().any(|x| x.target_type == TargetType::PlcSps));
|
|
||||||
}
|
|
||||||
|
|
||||||
#[tokio::test]
|
|
||||||
async fn ipa_artifact_prior_is_ios() {
|
|
||||||
let artifacts = vec![Artifact::mobile_package("app.ipa")];
|
|
||||||
let wp = HashMap::new();
|
|
||||||
let input = ClassificationInput {
|
|
||||||
artifacts: &artifacts,
|
|
||||||
working_paths: &wp,
|
|
||||||
description: None,
|
|
||||||
};
|
|
||||||
let v = HeuristicClassifier
|
|
||||||
.classify(&input)
|
|
||||||
.await
|
|
||||||
.expect("classify");
|
|
||||||
assert!(v.iter().any(|x| x.target_type == TargetType::IosApp));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,226 +0,0 @@
|
|||||||
//! Target classification.
|
|
||||||
//!
|
|
||||||
//! Runs the classifier registry over a target's artifacts and their ingested
|
|
||||||
//! working paths, then merges and ranks the verdicts into a [`Classification`].
|
|
||||||
//! The registry is the heuristic classifier (artifact kinds + source markers)
|
|
||||||
//! plus the tramiton firmware detector (behind a [`FirmwareDetector`] port).
|
|
||||||
|
|
||||||
mod firmware;
|
|
||||||
mod language;
|
|
||||||
|
|
||||||
pub use firmware::{
|
|
||||||
FirmwareDetection, FirmwareDetector, FirmwareTarget, MockFirmwareDetector, TramitonNative,
|
|
||||||
};
|
|
||||||
pub use language::HeuristicClassifier;
|
|
||||||
|
|
||||||
use std::collections::HashMap;
|
|
||||||
use std::path::PathBuf;
|
|
||||||
|
|
||||||
use compliance_core::error::CoreError;
|
|
||||||
use compliance_core::models::{
|
|
||||||
ArtifactKind, Classification, DetectedFact, OnboardedTarget, TargetType, TargetTypeCandidate,
|
|
||||||
};
|
|
||||||
use compliance_core::traits::{ClassificationInput, ClassifierVerdict, TargetClassifier};
|
|
||||||
|
|
||||||
use firmware::detection_to_verdict;
|
|
||||||
|
|
||||||
/// Classify a target from its artifacts and their ingested working paths, using
|
|
||||||
/// the heuristic classifier plus the tramiton firmware detector. Verdicts are
|
|
||||||
/// merged (max confidence per target type) and ranked into a [`Classification`].
|
|
||||||
pub async fn classify_target<D: FirmwareDetector>(
|
|
||||||
target: &OnboardedTarget,
|
|
||||||
working_paths: &HashMap<String, PathBuf>,
|
|
||||||
firmware_detector: &D,
|
|
||||||
) -> Result<Classification, CoreError> {
|
|
||||||
let input = ClassificationInput {
|
|
||||||
artifacts: &target.artifacts,
|
|
||||||
working_paths,
|
|
||||||
description: target.description.as_deref(),
|
|
||||||
};
|
|
||||||
|
|
||||||
let mut verdicts = Vec::new();
|
|
||||||
let mut detected_by = Vec::new();
|
|
||||||
|
|
||||||
let heuristic = HeuristicClassifier.classify(&input).await?;
|
|
||||||
if !heuristic.is_empty() {
|
|
||||||
detected_by.push("heuristic".to_string());
|
|
||||||
}
|
|
||||||
verdicts.extend(heuristic);
|
|
||||||
|
|
||||||
// Tramiton firmware detection over firmware / code working paths.
|
|
||||||
let mut tramiton_used = false;
|
|
||||||
for artifact in &target.artifacts {
|
|
||||||
if !matches!(
|
|
||||||
artifact.kind,
|
|
||||||
ArtifactKind::FirmwareImage | ArtifactKind::GitRepo | ArtifactKind::SourceArchive
|
|
||||||
) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
let Some(path) = working_paths.get(&artifact.id) else {
|
|
||||||
continue;
|
|
||||||
};
|
|
||||||
if let Some(detection) = firmware_detector.detect(path).await? {
|
|
||||||
verdicts.push(detection_to_verdict(&detection));
|
|
||||||
tramiton_used = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if tramiton_used {
|
|
||||||
detected_by.push("tramiton".to_string());
|
|
||||||
}
|
|
||||||
|
|
||||||
Ok(rank(verdicts, detected_by, target.target_type))
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Merge verdicts by target type (keeping the max confidence and its rationale),
|
|
||||||
/// dedupe facts, rank by descending confidence, and assemble a [`Classification`].
|
|
||||||
/// Falls back to the declared type when no verdict is produced.
|
|
||||||
fn rank(
|
|
||||||
verdicts: Vec<ClassifierVerdict>,
|
|
||||||
detected_by: Vec<String>,
|
|
||||||
fallback: TargetType,
|
|
||||||
) -> Classification {
|
|
||||||
let mut best: HashMap<TargetType, (f32, String)> = HashMap::new();
|
|
||||||
let mut facts: Vec<DetectedFact> = Vec::new();
|
|
||||||
for verdict in verdicts {
|
|
||||||
for fact in verdict.facts {
|
|
||||||
if !facts
|
|
||||||
.iter()
|
|
||||||
.any(|e| e.key == fact.key && e.value == fact.value)
|
|
||||||
{
|
|
||||||
facts.push(fact);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
let entry = best
|
|
||||||
.entry(verdict.target_type)
|
|
||||||
.or_insert((0.0, String::new()));
|
|
||||||
if verdict.confidence > entry.0 {
|
|
||||||
*entry = (verdict.confidence, verdict.rationale);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
let mut candidates: Vec<TargetTypeCandidate> = best
|
|
||||||
.into_iter()
|
|
||||||
.map(
|
|
||||||
|(target_type, (confidence, rationale))| TargetTypeCandidate {
|
|
||||||
target_type,
|
|
||||||
confidence,
|
|
||||||
rationale,
|
|
||||||
},
|
|
||||||
)
|
|
||||||
.collect();
|
|
||||||
// Descending confidence; ties broken by type name for deterministic ordering.
|
|
||||||
candidates.sort_by(|a, b| {
|
|
||||||
b.confidence
|
|
||||||
.partial_cmp(&a.confidence)
|
|
||||||
.unwrap_or(std::cmp::Ordering::Equal)
|
|
||||||
.then_with(|| a.target_type.to_string().cmp(&b.target_type.to_string()))
|
|
||||||
});
|
|
||||||
|
|
||||||
let suggested = candidates
|
|
||||||
.first()
|
|
||||||
.map(|c| c.target_type)
|
|
||||||
.unwrap_or(fallback);
|
|
||||||
|
|
||||||
Classification {
|
|
||||||
suggested,
|
|
||||||
candidates,
|
|
||||||
facts,
|
|
||||||
detected_by,
|
|
||||||
detected_at: chrono::Utc::now(),
|
|
||||||
confirmed: false,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[cfg(test)]
|
|
||||||
#[allow(clippy::expect_used, clippy::unwrap_used)]
|
|
||||||
mod tests {
|
|
||||||
use super::*;
|
|
||||||
use compliance_core::models::Artifact;
|
|
||||||
use std::fs;
|
|
||||||
use std::path::Path;
|
|
||||||
|
|
||||||
struct Scratch(PathBuf);
|
|
||||||
impl Scratch {
|
|
||||||
fn new() -> Self {
|
|
||||||
let p = std::env::temp_dir().join(format!("cs-classify-mod-{}", uuid::Uuid::new_v4()));
|
|
||||||
fs::create_dir_all(&p).expect("mkdir");
|
|
||||||
Self(p)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
impl Drop for Scratch {
|
|
||||||
fn drop(&mut self) {
|
|
||||||
let _ = fs::remove_dir_all(&self.0);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fn no_firmware() -> MockFirmwareDetector {
|
|
||||||
MockFirmwareDetector { detection: None }
|
|
||||||
}
|
|
||||||
|
|
||||||
#[tokio::test]
|
|
||||||
async fn backend_repo_classifies_as_backend() {
|
|
||||||
let scratch = Scratch::new();
|
|
||||||
fs::write(scratch.0.join("go.mod"), "module x").unwrap();
|
|
||||||
|
|
||||||
let artifact = Artifact::git_repo("https://git/x", "main");
|
|
||||||
let mut wp = HashMap::new();
|
|
||||||
wp.insert(artifact.id.clone(), scratch.0.clone());
|
|
||||||
let mut target = OnboardedTarget::new("x".to_string(), TargetType::WebApp);
|
|
||||||
target.artifacts.push(artifact);
|
|
||||||
|
|
||||||
let c = classify_target(&target, &wp, &no_firmware())
|
|
||||||
.await
|
|
||||||
.expect("classify");
|
|
||||||
assert_eq!(c.suggested, TargetType::BackendService);
|
|
||||||
assert!(c.detected_by.contains(&"heuristic".to_string()));
|
|
||||||
assert!(!c.confirmed);
|
|
||||||
}
|
|
||||||
|
|
||||||
#[tokio::test]
|
|
||||||
async fn firmware_detector_verdict_ranks_top() {
|
|
||||||
let scratch = Scratch::new();
|
|
||||||
fs::write(scratch.0.join("fw.bin"), b"x").unwrap();
|
|
||||||
|
|
||||||
let artifact =
|
|
||||||
Artifact::firmware_image(scratch.0.join("fw.bin").to_string_lossy().to_string());
|
|
||||||
let mut wp = HashMap::new();
|
|
||||||
wp.insert(artifact.id.clone(), scratch.0.clone());
|
|
||||||
let mut target = OnboardedTarget::new("fw".to_string(), TargetType::FirmwareBareMetal);
|
|
||||||
target.artifacts.push(artifact);
|
|
||||||
|
|
||||||
let detector = MockFirmwareDetector {
|
|
||||||
detection: Some(FirmwareDetection {
|
|
||||||
provider: "zephyr".to_string(),
|
|
||||||
confidence: "high".to_string(),
|
|
||||||
build_system: "zephyr".to_string(),
|
|
||||||
framework: Some("zephyr".to_string()),
|
|
||||||
target: FirmwareTarget {
|
|
||||||
mcu: Some("nrf52840".to_string()),
|
|
||||||
..Default::default()
|
|
||||||
},
|
|
||||||
gaps: vec![],
|
|
||||||
}),
|
|
||||||
};
|
|
||||||
|
|
||||||
let c = classify_target(&target, &wp, &detector)
|
|
||||||
.await
|
|
||||||
.expect("classify");
|
|
||||||
// tramiton's high-confidence RTOS verdict beats the weak firmware prior.
|
|
||||||
assert_eq!(c.suggested, TargetType::FirmwareRtos);
|
|
||||||
assert!(c.detected_by.contains(&"tramiton".to_string()));
|
|
||||||
assert!(c.facts.iter().any(|f| f.key == "mcu"));
|
|
||||||
}
|
|
||||||
|
|
||||||
#[tokio::test]
|
|
||||||
async fn no_signal_falls_back_to_declared_type() {
|
|
||||||
let scratch = Scratch::new();
|
|
||||||
let _ = Path::new(&scratch.0);
|
|
||||||
let target = OnboardedTarget::new("empty".to_string(), TargetType::DesktopApp);
|
|
||||||
let wp = HashMap::new();
|
|
||||||
let c = classify_target(&target, &wp, &no_firmware())
|
|
||||||
.await
|
|
||||||
.expect("classify");
|
|
||||||
assert_eq!(c.suggested, TargetType::DesktopApp);
|
|
||||||
assert!(c.candidates.is_empty());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -45,8 +45,6 @@ pub fn load_config() -> Result<AgentConfig, AgentError> {
|
|||||||
.unwrap_or_else(|| "0 0 * * * *".to_string()),
|
.unwrap_or_else(|| "0 0 * * * *".to_string()),
|
||||||
git_clone_base_path: env_var_opt("GIT_CLONE_BASE_PATH")
|
git_clone_base_path: env_var_opt("GIT_CLONE_BASE_PATH")
|
||||||
.unwrap_or_else(|| "/tmp/compliance-scanner/repos".to_string()),
|
.unwrap_or_else(|| "/tmp/compliance-scanner/repos".to_string()),
|
||||||
artifact_store_base_path: env_var_opt("ARTIFACT_STORE_BASE_PATH")
|
|
||||||
.unwrap_or_else(|| "/data/compliance-scanner/artifacts".to_string()),
|
|
||||||
ssh_key_path: env_var_opt("SSH_KEY_PATH")
|
ssh_key_path: env_var_opt("SSH_KEY_PATH")
|
||||||
.unwrap_or_else(|| "/data/compliance-scanner/ssh/id_ed25519".to_string()),
|
.unwrap_or_else(|| "/data/compliance-scanner/ssh/id_ed25519".to_string()),
|
||||||
keycloak_url: env_var_opt("KEYCLOAK_URL"),
|
keycloak_url: env_var_opt("KEYCLOAK_URL"),
|
||||||
|
|||||||
@@ -179,23 +179,6 @@ impl DatabasePool {
|
|||||||
.collect())
|
.collect())
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Tenant ids for every provisioned tenant database, derived by stripping
|
|
||||||
/// the `<prefix>_` from the database names. Skips the admin database
|
|
||||||
/// (`<prefix>__admin`). Hash-fallback names (very long tenant_ids) are lost
|
|
||||||
/// at the cluster level and cannot be recovered here — in practice tenant
|
|
||||||
/// ids are UUIDs and never hit that path. Used by the migration CLI's
|
|
||||||
/// `--all` mode.
|
|
||||||
pub async fn list_tenant_ids(&self) -> Result<Vec<String>, AgentError> {
|
|
||||||
let prefix = format!("{}_", self.db_prefix);
|
|
||||||
Ok(self
|
|
||||||
.list_tenant_db_names()
|
|
||||||
.await?
|
|
||||||
.into_iter()
|
|
||||||
.filter_map(|n| n.strip_prefix(&prefix).map(str::to_string))
|
|
||||||
.filter(|id| !id.starts_with('_'))
|
|
||||||
.collect())
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Drop the database for a specific tenant. Used by GDPR delete
|
/// Drop the database for a specific tenant. Used by GDPR delete
|
||||||
/// and tenant offboarding. Idempotent — dropping a non-existent
|
/// and tenant offboarding. Idempotent — dropping a non-existent
|
||||||
/// database is a no-op at the driver level.
|
/// database is a no-op at the driver level.
|
||||||
@@ -445,36 +428,6 @@ impl Database {
|
|||||||
)
|
)
|
||||||
.await?;
|
.await?;
|
||||||
|
|
||||||
// onboarded_targets: multikey on artifact source ref (webhook + dedupe
|
|
||||||
// lookup). Non-unique — "one git URL per tenant" is enforced in the
|
|
||||||
// create handler, since a unique multikey index on an array field has
|
|
||||||
// null-collision caveats.
|
|
||||||
self.onboarded_targets()
|
|
||||||
.create_index(
|
|
||||||
IndexModel::builder()
|
|
||||||
.keys(doc! { "artifacts.source_ref": 1 })
|
|
||||||
.build(),
|
|
||||||
)
|
|
||||||
.await?;
|
|
||||||
|
|
||||||
// onboarded_targets: multikey on artifact kind
|
|
||||||
self.onboarded_targets()
|
|
||||||
.create_index(
|
|
||||||
IndexModel::builder()
|
|
||||||
.keys(doc! { "artifacts.kind": 1 })
|
|
||||||
.build(),
|
|
||||||
)
|
|
||||||
.await?;
|
|
||||||
|
|
||||||
// onboarded_targets: target_type filter
|
|
||||||
self.onboarded_targets()
|
|
||||||
.create_index(
|
|
||||||
IndexModel::builder()
|
|
||||||
.keys(doc! { "target_type": 1 })
|
|
||||||
.build(),
|
|
||||||
)
|
|
||||||
.await?;
|
|
||||||
|
|
||||||
tracing::info!("Database indexes ensured");
|
tracing::info!("Database indexes ensured");
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
@@ -531,20 +484,6 @@ impl Database {
|
|||||||
self.inner.collection("dast_targets")
|
self.inner.collection("dast_targets")
|
||||||
}
|
}
|
||||||
|
|
||||||
/// The unified onboarding targets that replace `repositories` and
|
|
||||||
/// `dast_targets`. Ids are preserved from the legacy collections during
|
|
||||||
/// migration so downstream `repo_id` / `target_id` references keep resolving.
|
|
||||||
pub fn onboarded_targets(&self) -> Collection<OnboardedTarget> {
|
|
||||||
self.inner.collection("onboarded_targets")
|
|
||||||
}
|
|
||||||
|
|
||||||
/// A typed handle to an arbitrary collection by name. For bookkeeping
|
|
||||||
/// collections without a dedicated model (e.g. `schema_migrations`,
|
|
||||||
/// `onboarding_migration_log`).
|
|
||||||
pub fn collection_named<T: Send + Sync>(&self, name: &str) -> Collection<T> {
|
|
||||||
self.inner.collection(name)
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn dast_scan_runs(&self) -> Collection<DastScanRun> {
|
pub fn dast_scan_runs(&self) -> Collection<DastScanRun> {
|
||||||
self.inner.collection("dast_scan_runs")
|
self.inner.collection("dast_scan_runs")
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,154 +0,0 @@
|
|||||||
//! Content-addressed blob storage and archive extraction for ingest.
|
|
||||||
//!
|
|
||||||
//! Blobs are stored at `<base>/blobs/<sha[0:2]>/<sha>` and deduplicated by
|
|
||||||
//! digest; per-run working directories live under `<base>/work/`.
|
|
||||||
|
|
||||||
use std::fs::{self, File};
|
|
||||||
use std::io::{self, Read};
|
|
||||||
use std::path::{Path, PathBuf};
|
|
||||||
|
|
||||||
use sha2::{Digest, Sha256};
|
|
||||||
|
|
||||||
use crate::error::AgentError;
|
|
||||||
|
|
||||||
/// Read buffer size for streaming hashes/copies (64 KiB).
|
|
||||||
const BUF_LEN: usize = 64 * 1024;
|
|
||||||
|
|
||||||
/// Stream-hash a file with SHA-256, returning the lowercase-hex digest and the
|
|
||||||
/// byte length. Streams so large firmware images never load fully into memory.
|
|
||||||
pub fn hash_file(path: &Path) -> Result<(String, u64), AgentError> {
|
|
||||||
let mut file = File::open(path)?;
|
|
||||||
let mut hasher = Sha256::new();
|
|
||||||
let mut buf = [0u8; BUF_LEN];
|
|
||||||
let mut total: u64 = 0;
|
|
||||||
loop {
|
|
||||||
let n = file.read(&mut buf)?;
|
|
||||||
if n == 0 {
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
hasher.update(&buf[..n]);
|
|
||||||
total += n as u64;
|
|
||||||
}
|
|
||||||
Ok((hex::encode(hasher.finalize()), total))
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Copy `src` into the content-addressed blob store under `base`, returning the
|
|
||||||
/// stored path. Idempotent: an already-present blob is not rewritten.
|
|
||||||
pub fn store_file(base: &Path, src: &Path, sha: &str) -> Result<PathBuf, AgentError> {
|
|
||||||
if sha.len() < 2 {
|
|
||||||
return Err(AgentError::Other(format!("invalid content hash '{sha}'")));
|
|
||||||
}
|
|
||||||
let dir = base.join("blobs").join(&sha[0..2]);
|
|
||||||
fs::create_dir_all(&dir)?;
|
|
||||||
let dest = dir.join(sha);
|
|
||||||
if !dest.exists() {
|
|
||||||
fs::copy(src, &dest)?;
|
|
||||||
}
|
|
||||||
Ok(dest)
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Extract a zip archive into `dest` (created if needed). `enclosed_name`
|
|
||||||
/// sanitizes each entry path, so this is safe against zip-slip traversal.
|
|
||||||
pub fn extract_zip(archive: &Path, dest: &Path) -> Result<(), AgentError> {
|
|
||||||
let file = File::open(archive)?;
|
|
||||||
let mut zip =
|
|
||||||
zip::ZipArchive::new(file).map_err(|e| AgentError::Other(format!("open zip: {e}")))?;
|
|
||||||
fs::create_dir_all(dest)?;
|
|
||||||
for i in 0..zip.len() {
|
|
||||||
let mut entry = zip
|
|
||||||
.by_index(i)
|
|
||||||
.map_err(|e| AgentError::Other(format!("read zip entry: {e}")))?;
|
|
||||||
// `enclosed_name` returns `None` for traversal-unsafe paths — skip them.
|
|
||||||
let Some(rel) = entry.enclosed_name() else {
|
|
||||||
continue;
|
|
||||||
};
|
|
||||||
let out = dest.join(rel);
|
|
||||||
if entry.is_dir() {
|
|
||||||
fs::create_dir_all(&out)?;
|
|
||||||
} else {
|
|
||||||
if let Some(parent) = out.parent() {
|
|
||||||
fs::create_dir_all(parent)?;
|
|
||||||
}
|
|
||||||
let mut outfile = File::create(&out)?;
|
|
||||||
io::copy(&mut entry, &mut outfile)?;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
|
|
||||||
/// The working directory for one artifact of a target: `<base>/work/<target>/<artifact>`.
|
|
||||||
pub fn work_dir(base: &Path, target_id: &str, artifact_id: &str) -> PathBuf {
|
|
||||||
base.join("work").join(target_id).join(artifact_id)
|
|
||||||
}
|
|
||||||
|
|
||||||
#[cfg(test)]
|
|
||||||
#[allow(clippy::expect_used, clippy::unwrap_used)]
|
|
||||||
mod tests {
|
|
||||||
use super::*;
|
|
||||||
|
|
||||||
/// A unique scratch directory, removed on drop.
|
|
||||||
struct Scratch(PathBuf);
|
|
||||||
impl Scratch {
|
|
||||||
fn new() -> Self {
|
|
||||||
let p = std::env::temp_dir().join(format!("cs-ingest-{}", uuid::Uuid::new_v4()));
|
|
||||||
fs::create_dir_all(&p).expect("mkdir scratch");
|
|
||||||
Self(p)
|
|
||||||
}
|
|
||||||
fn path(&self) -> &Path {
|
|
||||||
&self.0
|
|
||||||
}
|
|
||||||
}
|
|
||||||
impl Drop for Scratch {
|
|
||||||
fn drop(&mut self) {
|
|
||||||
let _ = fs::remove_dir_all(&self.0);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn hash_is_stable_and_reports_size() {
|
|
||||||
let dir = Scratch::new();
|
|
||||||
let f = dir.path().join("a.bin");
|
|
||||||
fs::write(&f, b"hello world").expect("write");
|
|
||||||
let (sha, size) = hash_file(&f).expect("hash");
|
|
||||||
assert_eq!(size, 11);
|
|
||||||
// Known SHA-256 of "hello world".
|
|
||||||
assert_eq!(
|
|
||||||
sha,
|
|
||||||
"b94d27b9934d3e08a52e52d7da7dabfac484efe37a5380ee9088f7ace2efcde9"
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn store_is_content_addressed_and_idempotent() {
|
|
||||||
let base = Scratch::new();
|
|
||||||
let src = base.path().join("src.bin");
|
|
||||||
fs::write(&src, b"payload").expect("write");
|
|
||||||
let (sha, _) = hash_file(&src).expect("hash");
|
|
||||||
let p1 = store_file(base.path(), &src, &sha).expect("store");
|
|
||||||
let p2 = store_file(base.path(), &src, &sha).expect("store again");
|
|
||||||
assert_eq!(p1, p2);
|
|
||||||
assert!(p1.ends_with(&sha));
|
|
||||||
assert!(p1.starts_with(base.path().join("blobs").join(&sha[0..2])));
|
|
||||||
assert_eq!(fs::read(&p1).expect("read"), b"payload");
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn extract_zip_writes_entries() {
|
|
||||||
let base = Scratch::new();
|
|
||||||
let archive = base.path().join("a.zip");
|
|
||||||
{
|
|
||||||
let file = File::create(&archive).expect("create");
|
|
||||||
let mut w = zip::ZipWriter::new(file);
|
|
||||||
let opts: zip::write::SimpleFileOptions = Default::default();
|
|
||||||
w.start_file("dir/hello.txt", opts).expect("start");
|
|
||||||
io::Write::write_all(&mut w, b"hi").expect("write");
|
|
||||||
w.finish().expect("finish");
|
|
||||||
}
|
|
||||||
let dest = base.path().join("out");
|
|
||||||
extract_zip(&archive, &dest).expect("extract");
|
|
||||||
assert_eq!(
|
|
||||||
fs::read_to_string(dest.join("dir/hello.txt")).expect("read"),
|
|
||||||
"hi"
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,334 +0,0 @@
|
|||||||
//! Artifact ingest.
|
|
||||||
//!
|
|
||||||
//! Normalizes each [`Artifact`] on an [`OnboardedTarget`] into a local working
|
|
||||||
//! path plus recorded metadata (content hash, size, discovered facts) that the
|
|
||||||
//! classifier and scanners consume. Every blob is SHA-256 hashed — that digest
|
|
||||||
//! is also the reconciliation key against sibling products (a firmware sha256
|
|
||||||
//! matches tramiton's `Artifact.sha256`).
|
|
||||||
|
|
||||||
mod blob;
|
|
||||||
|
|
||||||
use std::collections::HashMap;
|
|
||||||
use std::path::{Path, PathBuf};
|
|
||||||
|
|
||||||
use compliance_core::models::{Artifact, ArtifactKind, DetectedFact, OnboardedTarget};
|
|
||||||
use compliance_core::AgentConfig;
|
|
||||||
|
|
||||||
use crate::error::AgentError;
|
|
||||||
use crate::pipeline::git::{GitOps, RepoCredentials};
|
|
||||||
|
|
||||||
/// The paths and identifiers an ingest needs. Decoupled from the full
|
|
||||||
/// [`AgentConfig`] so ingest is testable without a complete config.
|
|
||||||
pub struct IngestContext<'a> {
|
|
||||||
/// Base directory for content-addressed blobs and working dirs.
|
|
||||||
pub artifact_store_base: &'a Path,
|
|
||||||
/// Base directory for git clones.
|
|
||||||
pub git_clone_base: &'a str,
|
|
||||||
/// Default SSH key path (used when an artifact provides none).
|
|
||||||
pub ssh_key_path: &'a str,
|
|
||||||
/// The id of the target these artifacts belong to (namespaces working dirs).
|
|
||||||
pub target_id: &'a str,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl<'a> IngestContext<'a> {
|
|
||||||
/// Build an ingest context from the agent config for a given target.
|
|
||||||
pub fn from_config(config: &'a AgentConfig, target_id: &'a str) -> Self {
|
|
||||||
Self {
|
|
||||||
artifact_store_base: Path::new(&config.artifact_store_base_path),
|
|
||||||
git_clone_base: &config.git_clone_base_path,
|
|
||||||
ssh_key_path: &config.ssh_key_path,
|
|
||||||
target_id,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// The result of ingesting one artifact.
|
|
||||||
pub struct IngestedArtifact {
|
|
||||||
/// The artifact this corresponds to ([`Artifact::id`]).
|
|
||||||
pub artifact_id: String,
|
|
||||||
/// The artifact kind.
|
|
||||||
pub kind: ArtifactKind,
|
|
||||||
/// Local working path (clone dir, extracted dir, or blob file). `None` for
|
|
||||||
/// artifacts with no on-disk form (live URL, plaintext, container ref).
|
|
||||||
pub working_path: Option<PathBuf>,
|
|
||||||
/// SHA-256 of the content (blobs) or git head SHA (git repos).
|
|
||||||
pub content_hash: Option<String>,
|
|
||||||
/// Stored blob size in bytes, when applicable.
|
|
||||||
pub size_bytes: Option<u64>,
|
|
||||||
/// Facts discovered during ingest.
|
|
||||||
pub facts: Vec<DetectedFact>,
|
|
||||||
}
|
|
||||||
|
|
||||||
/// All ingested artifacts for a target, keyed by artifact id.
|
|
||||||
pub struct IngestSet {
|
|
||||||
/// The ingested artifacts, keyed by [`Artifact::id`].
|
|
||||||
pub by_artifact: HashMap<String, IngestedArtifact>,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl IngestSet {
|
|
||||||
/// The working paths of every ingested artifact that has one — the input the
|
|
||||||
/// classifier expects.
|
|
||||||
pub fn working_paths(&self) -> HashMap<String, PathBuf> {
|
|
||||||
self.by_artifact
|
|
||||||
.iter()
|
|
||||||
.filter_map(|(id, a)| a.working_path.clone().map(|p| (id.clone(), p)))
|
|
||||||
.collect()
|
|
||||||
}
|
|
||||||
|
|
||||||
/// The ingest result for a specific artifact.
|
|
||||||
pub fn get(&self, artifact_id: &str) -> Option<&IngestedArtifact> {
|
|
||||||
self.by_artifact.get(artifact_id)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Ingest every artifact on a target.
|
|
||||||
pub fn ingest_all(
|
|
||||||
target: &OnboardedTarget,
|
|
||||||
ctx: &IngestContext<'_>,
|
|
||||||
) -> Result<IngestSet, AgentError> {
|
|
||||||
let mut by_artifact = HashMap::new();
|
|
||||||
for artifact in &target.artifacts {
|
|
||||||
let ingested = ingest_artifact(artifact, ctx)?;
|
|
||||||
by_artifact.insert(artifact.id.clone(), ingested);
|
|
||||||
}
|
|
||||||
Ok(IngestSet { by_artifact })
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Ingest a single artifact, dispatching on its kind.
|
|
||||||
pub fn ingest_artifact(
|
|
||||||
artifact: &Artifact,
|
|
||||||
ctx: &IngestContext<'_>,
|
|
||||||
) -> Result<IngestedArtifact, AgentError> {
|
|
||||||
match artifact.kind {
|
|
||||||
ArtifactKind::GitRepo => ingest_git(artifact, ctx),
|
|
||||||
ArtifactKind::SourceArchive | ArtifactKind::MobilePackage | ArtifactKind::PlcProject => {
|
|
||||||
ingest_blob(artifact, ctx, true)
|
|
||||||
}
|
|
||||||
ArtifactKind::FirmwareImage => ingest_blob(artifact, ctx, false),
|
|
||||||
ArtifactKind::ContainerImage => Ok(metadata_only(
|
|
||||||
artifact,
|
|
||||||
DetectedFact::new("container_ref", artifact.source_ref.as_str(), "ingest"),
|
|
||||||
)),
|
|
||||||
ArtifactKind::LiveUrl => Ok(metadata_only(
|
|
||||||
artifact,
|
|
||||||
DetectedFact::new("live_url", artifact.source_ref.as_str(), "ingest"),
|
|
||||||
)),
|
|
||||||
ArtifactKind::PlaintextDescription => Ok(metadata_only(
|
|
||||||
artifact,
|
|
||||||
DetectedFact::new(
|
|
||||||
"description_len",
|
|
||||||
artifact.source_ref.len().to_string(),
|
|
||||||
"ingest",
|
|
||||||
),
|
|
||||||
)),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Clone (or fetch) a git artifact, recording the head SHA as the content hash.
|
|
||||||
fn ingest_git(
|
|
||||||
artifact: &Artifact,
|
|
||||||
ctx: &IngestContext<'_>,
|
|
||||||
) -> Result<IngestedArtifact, AgentError> {
|
|
||||||
let creds = credentials_for(artifact, ctx.ssh_key_path);
|
|
||||||
let git_ops = GitOps::new(ctx.git_clone_base, creds);
|
|
||||||
let repo_path = git_ops.clone_or_fetch(&artifact.source_ref, &artifact.id)?;
|
|
||||||
let head = GitOps::get_head_sha(&repo_path).ok();
|
|
||||||
Ok(IngestedArtifact {
|
|
||||||
artifact_id: artifact.id.clone(),
|
|
||||||
kind: artifact.kind,
|
|
||||||
working_path: Some(repo_path),
|
|
||||||
content_hash: head,
|
|
||||||
size_bytes: None,
|
|
||||||
facts: Vec::new(),
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Store a blob artifact content-addressed. When `extract` is set and the blob
|
|
||||||
/// is a zip container (source archive, APK/AAB/IPA), also unpack it into a
|
|
||||||
/// working directory; otherwise the working path is the stored blob.
|
|
||||||
fn ingest_blob(
|
|
||||||
artifact: &Artifact,
|
|
||||||
ctx: &IngestContext<'_>,
|
|
||||||
extract: bool,
|
|
||||||
) -> Result<IngestedArtifact, AgentError> {
|
|
||||||
let base = ctx.artifact_store_base;
|
|
||||||
let src = local_source(artifact)?;
|
|
||||||
let (sha, size) = blob::hash_file(&src)?;
|
|
||||||
let stored = blob::store_file(base, &src, &sha)?;
|
|
||||||
|
|
||||||
let mut facts = Vec::new();
|
|
||||||
let working_path = if extract {
|
|
||||||
let dest = blob::work_dir(base, ctx.target_id, &artifact.id);
|
|
||||||
match blob::extract_zip(&stored, &dest) {
|
|
||||||
Ok(()) => dest,
|
|
||||||
Err(e) => {
|
|
||||||
// Not a zip (e.g. a tar.gz source archive) — keep the blob and
|
|
||||||
// note it so later stages can decide what to do.
|
|
||||||
facts.push(DetectedFact::new(
|
|
||||||
"archive_unextracted",
|
|
||||||
e.to_string(),
|
|
||||||
"ingest",
|
|
||||||
));
|
|
||||||
stored.clone()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
stored.clone()
|
|
||||||
};
|
|
||||||
|
|
||||||
Ok(IngestedArtifact {
|
|
||||||
artifact_id: artifact.id.clone(),
|
|
||||||
kind: artifact.kind,
|
|
||||||
working_path: Some(working_path),
|
|
||||||
content_hash: Some(sha),
|
|
||||||
size_bytes: Some(size),
|
|
||||||
facts,
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
/// An artifact with no on-disk form: record a single fact, no hash/path.
|
|
||||||
fn metadata_only(artifact: &Artifact, fact: DetectedFact) -> IngestedArtifact {
|
|
||||||
IngestedArtifact {
|
|
||||||
artifact_id: artifact.id.clone(),
|
|
||||||
kind: artifact.kind,
|
|
||||||
working_path: None,
|
|
||||||
content_hash: None,
|
|
||||||
size_bytes: None,
|
|
||||||
facts: vec![fact],
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// The local file backing a blob artifact: its `stored_path` if already
|
|
||||||
/// uploaded, else its `source_ref` interpreted as a filesystem path.
|
|
||||||
fn local_source(artifact: &Artifact) -> Result<PathBuf, AgentError> {
|
|
||||||
let path = artifact
|
|
||||||
.stored_path
|
|
||||||
.as_deref()
|
|
||||||
.unwrap_or(artifact.source_ref.as_str());
|
|
||||||
let path = PathBuf::from(path);
|
|
||||||
if !path.exists() {
|
|
||||||
return Err(AgentError::Other(format!(
|
|
||||||
"artifact {} source not found at {}",
|
|
||||||
artifact.id,
|
|
||||||
path.display()
|
|
||||||
)));
|
|
||||||
}
|
|
||||||
Ok(path)
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Build git credentials from an artifact's auth plus a default SSH key path.
|
|
||||||
fn credentials_for(artifact: &Artifact, default_ssh_key_path: &str) -> RepoCredentials {
|
|
||||||
let auth = artifact.auth.as_ref();
|
|
||||||
RepoCredentials {
|
|
||||||
ssh_key_path: auth
|
|
||||||
.and_then(|a| a.ssh_key_path.clone())
|
|
||||||
.or_else(|| Some(default_ssh_key_path.to_string())),
|
|
||||||
auth_token: auth.and_then(|a| a.secret.clone()),
|
|
||||||
auth_username: auth.and_then(|a| a.username.clone()),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[cfg(test)]
|
|
||||||
#[allow(clippy::expect_used, clippy::unwrap_used)]
|
|
||||||
mod tests {
|
|
||||||
use super::*;
|
|
||||||
use compliance_core::models::{ArtifactAuth, TargetType};
|
|
||||||
|
|
||||||
/// A unique scratch directory, removed on drop.
|
|
||||||
struct Scratch(PathBuf);
|
|
||||||
impl Scratch {
|
|
||||||
fn new() -> Self {
|
|
||||||
let p = std::env::temp_dir().join(format!("cs-ingest-mod-{}", uuid::Uuid::new_v4()));
|
|
||||||
std::fs::create_dir_all(&p).expect("mkdir scratch");
|
|
||||||
Self(p)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
impl Drop for Scratch {
|
|
||||||
fn drop(&mut self) {
|
|
||||||
let _ = std::fs::remove_dir_all(&self.0);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fn ctx_for<'a>(store: &'a Path, target_id: &'a str) -> IngestContext<'a> {
|
|
||||||
IngestContext {
|
|
||||||
artifact_store_base: store,
|
|
||||||
git_clone_base: "/tmp/cs-ingest-test-repos",
|
|
||||||
ssh_key_path: "/tmp/cs-ingest-test-ssh",
|
|
||||||
target_id,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn firmware_blob_is_hashed_and_stored() {
|
|
||||||
let scratch = Scratch::new();
|
|
||||||
let store = scratch.0.join("store");
|
|
||||||
let fw = scratch.0.join("fw.bin");
|
|
||||||
std::fs::write(&fw, b"firmware-bytes").expect("write");
|
|
||||||
|
|
||||||
let ctx = ctx_for(&store, "t1");
|
|
||||||
let artifact = Artifact::firmware_image(fw.to_string_lossy().to_string());
|
|
||||||
let out = ingest_artifact(&artifact, &ctx).expect("ingest");
|
|
||||||
|
|
||||||
assert_eq!(out.kind, ArtifactKind::FirmwareImage);
|
|
||||||
assert_eq!(out.size_bytes, Some(14));
|
|
||||||
let sha = out.content_hash.expect("hash");
|
|
||||||
assert_eq!(sha.len(), 64);
|
|
||||||
// working path is the content-addressed blob
|
|
||||||
let wp = out.working_path.expect("working path");
|
|
||||||
assert!(wp.starts_with(store.join("blobs")));
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn live_url_has_no_blob() {
|
|
||||||
let scratch = Scratch::new();
|
|
||||||
let store = scratch.0.join("store");
|
|
||||||
let ctx = ctx_for(&store, "t1");
|
|
||||||
let artifact = Artifact::live_url("https://example.com");
|
|
||||||
let out = ingest_artifact(&artifact, &ctx).expect("ingest");
|
|
||||||
assert!(out.working_path.is_none());
|
|
||||||
assert!(out.content_hash.is_none());
|
|
||||||
assert!(out.facts.iter().any(|f| f.key == "live_url"));
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn ingest_all_collects_working_paths() {
|
|
||||||
let scratch = Scratch::new();
|
|
||||||
let store = scratch.0.join("store");
|
|
||||||
let fw = scratch.0.join("fw.bin");
|
|
||||||
std::fs::write(&fw, b"abc").expect("write");
|
|
||||||
let ctx = ctx_for(&store, "t1");
|
|
||||||
|
|
||||||
let mut target = OnboardedTarget::new("t".to_string(), TargetType::FirmwareBareMetal);
|
|
||||||
target
|
|
||||||
.artifacts
|
|
||||||
.push(Artifact::firmware_image(fw.to_string_lossy().to_string()));
|
|
||||||
target.artifacts.push(Artifact::live_url("https://x"));
|
|
||||||
|
|
||||||
let set = ingest_all(&target, &ctx).expect("ingest all");
|
|
||||||
assert_eq!(set.by_artifact.len(), 2);
|
|
||||||
// Only the firmware artifact yields a working path.
|
|
||||||
assert_eq!(set.working_paths().len(), 1);
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn credentials_prefer_artifact_auth() {
|
|
||||||
let mut artifact = Artifact::git_repo("https://git/x", "main");
|
|
||||||
artifact.auth = Some(ArtifactAuth {
|
|
||||||
method: "token".to_string(),
|
|
||||||
username: Some("bob".to_string()),
|
|
||||||
secret: Some("pat".to_string()),
|
|
||||||
..Default::default()
|
|
||||||
});
|
|
||||||
let creds = credentials_for(&artifact, "/default/ssh/key");
|
|
||||||
assert_eq!(creds.auth_token.as_deref(), Some("pat"));
|
|
||||||
assert_eq!(creds.auth_username.as_deref(), Some("bob"));
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn credentials_fall_back_to_default_ssh_key() {
|
|
||||||
let artifact = Artifact::git_repo("git@host:x.git", "main");
|
|
||||||
let creds = credentials_for(&artifact, "/default/ssh/key");
|
|
||||||
assert_eq!(creds.ssh_key_path.as_deref(), Some("/default/ssh/key"));
|
|
||||||
assert!(creds.auth_token.is_none());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -2,13 +2,10 @@
|
|||||||
|
|
||||||
pub mod agent;
|
pub mod agent;
|
||||||
pub mod api;
|
pub mod api;
|
||||||
pub mod classify;
|
|
||||||
pub mod config;
|
pub mod config;
|
||||||
pub mod database;
|
pub mod database;
|
||||||
pub mod error;
|
pub mod error;
|
||||||
pub mod ingest;
|
|
||||||
pub mod llm;
|
pub mod llm;
|
||||||
pub mod migrate;
|
|
||||||
pub mod pentest;
|
pub mod pentest;
|
||||||
pub mod pipeline;
|
pub mod pipeline;
|
||||||
pub mod rag;
|
pub mod rag;
|
||||||
|
|||||||
@@ -1,50 +1,4 @@
|
|||||||
use compliance_agent::{agent, api, config, database, migrate, scheduler, ssh, webhooks};
|
use compliance_agent::{agent, api, config, database, scheduler, ssh, webhooks};
|
||||||
|
|
||||||
/// Run the `migrate onboarding` subcommand and exit. Backfills (or reverts) the
|
|
||||||
/// unified `onboarded_targets` collection per tenant.
|
|
||||||
///
|
|
||||||
/// Usage: `compliance-agent migrate onboarding [--all | --tenant <id>] [--dry-run] [--revert]`
|
|
||||||
async fn run_migration(
|
|
||||||
args: &[String],
|
|
||||||
pool: &database::DatabasePool,
|
|
||||||
) -> Result<(), compliance_agent::error::AgentError> {
|
|
||||||
if args.get(2).map(String::as_str) != Some("onboarding") {
|
|
||||||
eprintln!(
|
|
||||||
"usage: compliance-agent migrate onboarding [--all | --tenant <id>] [--dry-run] [--revert]"
|
|
||||||
);
|
|
||||||
std::process::exit(2);
|
|
||||||
}
|
|
||||||
let has = |flag: &str| args.iter().any(|a| a == flag);
|
|
||||||
let dry_run = has("--dry-run");
|
|
||||||
let revert = has("--revert");
|
|
||||||
let tenant = args
|
|
||||||
.iter()
|
|
||||||
.position(|a| a == "--tenant")
|
|
||||||
.and_then(|i| args.get(i + 1))
|
|
||||||
.cloned();
|
|
||||||
|
|
||||||
let tenants: Vec<String> = if has("--all") {
|
|
||||||
pool.list_tenant_ids().await?
|
|
||||||
} else if let Some(t) = tenant {
|
|
||||||
vec![t]
|
|
||||||
} else {
|
|
||||||
eprintln!("specify --all or --tenant <id>");
|
|
||||||
std::process::exit(2);
|
|
||||||
};
|
|
||||||
|
|
||||||
for tenant_id in tenants {
|
|
||||||
let db = pool.for_tenant_id(&tenant_id).await?;
|
|
||||||
if revert {
|
|
||||||
migrate::onboarding::revert(&db).await?;
|
|
||||||
println!("[{tenant_id}] reverted onboarding backfill");
|
|
||||||
} else {
|
|
||||||
let report = migrate::onboarding::backfill_onboarded_targets(&db, dry_run).await?;
|
|
||||||
let prefix = if dry_run { "(dry-run) " } else { "" };
|
|
||||||
println!("[{tenant_id}] {prefix}{report:?}");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
|
|
||||||
#[tokio::main]
|
#[tokio::main]
|
||||||
async fn main() -> Result<(), Box<dyn std::error::Error>> {
|
async fn main() -> Result<(), Box<dyn std::error::Error>> {
|
||||||
@@ -77,13 +31,6 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
|
|||||||
let db_pool =
|
let db_pool =
|
||||||
database::DatabasePool::connect(&config.mongodb_uri, &config.mongodb_database).await?;
|
database::DatabasePool::connect(&config.mongodb_uri, &config.mongodb_database).await?;
|
||||||
|
|
||||||
// One-shot subcommands run and exit without starting the servers.
|
|
||||||
let args: Vec<String> = std::env::args().collect();
|
|
||||||
if args.get(1).map(String::as_str) == Some("migrate") {
|
|
||||||
run_migration(&args, &db_pool).await?;
|
|
||||||
return Ok(());
|
|
||||||
}
|
|
||||||
|
|
||||||
let agent = agent::ComplianceAgent::new(config.clone(), db_pool);
|
let agent = agent::ComplianceAgent::new(config.clone(), db_pool);
|
||||||
|
|
||||||
tracing::info!("Starting scheduler...");
|
tracing::info!("Starting scheduler...");
|
||||||
|
|||||||
@@ -1,8 +0,0 @@
|
|||||||
//! One-time data migrations.
|
|
||||||
//!
|
|
||||||
//! Currently just the onboarding backfill ([`onboarding`]), which folds the
|
|
||||||
//! legacy `repositories` and `dast_targets` collections into the unified
|
|
||||||
//! `onboarded_targets` collection, preserving `_id` so every downstream record
|
|
||||||
//! keyed by `repo_id` / `target_id` keeps resolving.
|
|
||||||
|
|
||||||
pub mod onboarding;
|
|
||||||
@@ -1,406 +0,0 @@
|
|||||||
//! Backfill: legacy `repositories` + `dast_targets` → `onboarded_targets`.
|
|
||||||
//!
|
|
||||||
//! The transforms here are **id-preserving**: an [`OnboardedTarget`] keeps the
|
|
||||||
//! same `_id` as the `TrackedRepository` / `DastTarget` it came from, so every
|
|
||||||
//! downstream collection keyed by that hex id (findings, sbom, scan_runs,
|
|
||||||
//! graph, dast_*, pentest_*) keeps resolving with zero row rewrites, and
|
|
||||||
//! existing webhook URLs keep working. The mapping functions are pure and unit
|
|
||||||
//! tested; the DB orchestration (idempotent per-tenant backfill + revert) is a
|
|
||||||
//! thin driver over them.
|
|
||||||
|
|
||||||
use compliance_core::models::{
|
|
||||||
Artifact, ArtifactKind, DastTarget, DastTargetType, GitArtifactConfig, IssueTrackerConfig,
|
|
||||||
OnboardedTarget, TargetType, TrackedRepository, WebArtifactConfig,
|
|
||||||
};
|
|
||||||
use futures_util::TryStreamExt;
|
|
||||||
use mongodb::bson::{doc, Document};
|
|
||||||
|
|
||||||
use crate::database::Database;
|
|
||||||
use crate::error::AgentError;
|
|
||||||
|
|
||||||
/// Marker id in `schema_migrations` recording that the backfill has run.
|
|
||||||
const MIGRATION_MARKER: &str = "onboarding_backfill_v1";
|
|
||||||
|
|
||||||
/// Summary of a backfill run.
|
|
||||||
#[derive(Debug, Clone, Default, PartialEq, Eq)]
|
|
||||||
pub struct MigrationReport {
|
|
||||||
/// Repositories turned into onboarded targets.
|
|
||||||
pub repos_migrated: u64,
|
|
||||||
/// DAST targets folded into an existing (repo-linked) target as a LiveUrl.
|
|
||||||
pub dast_targets_folded: u64,
|
|
||||||
/// DAST targets with no repo link, migrated as standalone targets.
|
|
||||||
pub dast_targets_standalone: u64,
|
|
||||||
/// Records skipped because a target with that `_id` already existed.
|
|
||||||
pub skipped_existing: u64,
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Map a legacy `DastTargetType` to a unified [`TargetType`]. REST/GraphQL APIs
|
|
||||||
/// are backend services; a browser app is a web app.
|
|
||||||
fn target_type_for_dast(kind: &DastTargetType) -> TargetType {
|
|
||||||
match kind {
|
|
||||||
DastTargetType::WebApp => TargetType::WebApp,
|
|
||||||
DastTargetType::RestApi | DastTargetType::GraphQl => TargetType::BackendService,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Build the LiveUrl artifact for a DAST target (its base URL + crawl config +
|
|
||||||
/// auth). Shared by fold-in and standalone migration.
|
|
||||||
pub fn dast_to_artifact(dast: &DastTarget) -> Artifact {
|
|
||||||
let mut artifact = Artifact::live_url(dast.base_url.clone());
|
|
||||||
artifact.web = Some(WebArtifactConfig {
|
|
||||||
target_kind: dast.target_type.clone(),
|
|
||||||
excluded_paths: dast.excluded_paths.clone(),
|
|
||||||
max_crawl_depth: dast.max_crawl_depth,
|
|
||||||
rate_limit: dast.rate_limit,
|
|
||||||
allow_destructive: dast.allow_destructive,
|
|
||||||
});
|
|
||||||
artifact.auth = dast.auth_config.clone().map(Into::into);
|
|
||||||
artifact
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Map a `TrackedRepository` to an onboarded target, preserving `_id`. The git
|
|
||||||
/// remote becomes a `GitRepo` artifact carrying the repo's branch, watermark,
|
|
||||||
/// and auth; tracker config folds into `scan_config`.
|
|
||||||
///
|
|
||||||
/// `target_type` is a safe default (`BackendService`) — the classifier can
|
|
||||||
/// refine it later; `classification` is left `None` (unconfirmed).
|
|
||||||
pub fn repo_to_target(repo: &TrackedRepository) -> OnboardedTarget {
|
|
||||||
let mut target = OnboardedTarget::new(repo.name.clone(), TargetType::BackendService);
|
|
||||||
target.id = repo.id;
|
|
||||||
|
|
||||||
let mut artifact = Artifact::git_repo(repo.git_url.clone(), repo.default_branch.clone());
|
|
||||||
artifact.git = Some(GitArtifactConfig {
|
|
||||||
default_branch: repo.default_branch.clone(),
|
|
||||||
last_scanned_commit: repo.last_scanned_commit.clone(),
|
|
||||||
local_path: repo.local_path.clone(),
|
|
||||||
});
|
|
||||||
if repo.auth_token.is_some() || repo.auth_username.is_some() {
|
|
||||||
artifact.auth = Some(compliance_core::models::ArtifactAuth {
|
|
||||||
method: "token".to_string(),
|
|
||||||
username: repo.auth_username.clone(),
|
|
||||||
secret: repo.auth_token.clone(),
|
|
||||||
..Default::default()
|
|
||||||
});
|
|
||||||
}
|
|
||||||
target.artifacts.push(artifact);
|
|
||||||
|
|
||||||
if repo.tracker_type.is_some() {
|
|
||||||
target.scan_config.issue_tracker = Some(IssueTrackerConfig {
|
|
||||||
tracker_type: repo.tracker_type.clone(),
|
|
||||||
owner: repo.tracker_owner.clone(),
|
|
||||||
repo: repo.tracker_repo.clone(),
|
|
||||||
token: repo.tracker_token.clone(),
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
target.scan_schedule = repo.scan_schedule.clone();
|
|
||||||
target.webhook_enabled = repo.webhook_enabled;
|
|
||||||
target.webhook_secret = repo.webhook_secret.clone();
|
|
||||||
target.findings_count = repo.findings_count;
|
|
||||||
target.created_at = repo.created_at;
|
|
||||||
target.updated_at = repo.updated_at;
|
|
||||||
target
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Append a DAST target's LiveUrl artifact onto an existing (repo-derived)
|
|
||||||
/// target. If the repo default was `BackendService` but the DAST target is a
|
|
||||||
/// browser web app, promote the type to `WebApp`.
|
|
||||||
pub fn fold_dast_into_target(target: &mut OnboardedTarget, dast: &DastTarget) {
|
|
||||||
if matches!(dast.target_type, DastTargetType::WebApp)
|
|
||||||
&& target.target_type == TargetType::BackendService
|
|
||||||
{
|
|
||||||
target.target_type = TargetType::WebApp;
|
|
||||||
}
|
|
||||||
if !target.has(ArtifactKind::LiveUrl) {
|
|
||||||
target.artifacts.push(dast_to_artifact(dast));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Map a repo-less DAST target to a standalone onboarded target, preserving `_id`.
|
|
||||||
pub fn dast_to_standalone_target(dast: &DastTarget) -> OnboardedTarget {
|
|
||||||
let mut target =
|
|
||||||
OnboardedTarget::new(dast.name.clone(), target_type_for_dast(&dast.target_type));
|
|
||||||
target.id = dast.id;
|
|
||||||
target.artifacts.push(dast_to_artifact(dast));
|
|
||||||
target.created_at = dast.created_at;
|
|
||||||
target.updated_at = dast.updated_at;
|
|
||||||
target
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Whether the onboarding backfill has already been applied to this database.
|
|
||||||
pub async fn already_applied(db: &Database) -> Result<bool, AgentError> {
|
|
||||||
let found = db
|
|
||||||
.collection_named::<Document>("schema_migrations")
|
|
||||||
.find_one(doc! { "_id": MIGRATION_MARKER })
|
|
||||||
.await?;
|
|
||||||
Ok(found.is_some())
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Backfill `onboarded_targets` from `repositories` + `dast_targets` for one
|
|
||||||
/// tenant database.
|
|
||||||
///
|
|
||||||
/// Id-preserving and **idempotent**: targets that already exist (by `_id`) are
|
|
||||||
/// skipped, so re-running is safe. With `dry_run`, computes the report without
|
|
||||||
/// writing. The legacy collections are never deleted; the only mutation outside
|
|
||||||
/// `onboarded_targets` is the history relink of folded DAST targets, which is
|
|
||||||
/// logged so [`revert`] can undo it.
|
|
||||||
pub async fn backfill_onboarded_targets(
|
|
||||||
db: &Database,
|
|
||||||
dry_run: bool,
|
|
||||||
) -> Result<MigrationReport, AgentError> {
|
|
||||||
let mut report = MigrationReport::default();
|
|
||||||
|
|
||||||
// 1. repositories -> onboarded_targets (preserve _id, skip existing).
|
|
||||||
let mut repos = db.repositories().find(doc! {}).await?;
|
|
||||||
while let Some(repo) = repos.try_next().await? {
|
|
||||||
let Some(id) = repo.id else { continue };
|
|
||||||
if db
|
|
||||||
.onboarded_targets()
|
|
||||||
.find_one(doc! { "_id": id })
|
|
||||||
.await?
|
|
||||||
.is_some()
|
|
||||||
{
|
|
||||||
report.skipped_existing += 1;
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
if !dry_run {
|
|
||||||
db.onboarded_targets()
|
|
||||||
.insert_one(repo_to_target(&repo))
|
|
||||||
.await?;
|
|
||||||
}
|
|
||||||
report.repos_migrated += 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
// 2. dast_targets -> fold into the linked repo target, or migrate standalone.
|
|
||||||
let mut dasts = db.dast_targets().find(doc! {}).await?;
|
|
||||||
while let Some(dast) = dasts.try_next().await? {
|
|
||||||
let Some(dast_id) = dast.id else { continue };
|
|
||||||
let repo_oid = dast
|
|
||||||
.repo_id
|
|
||||||
.as_deref()
|
|
||||||
.and_then(|r| mongodb::bson::oid::ObjectId::parse_str(r).ok());
|
|
||||||
let linked = match repo_oid {
|
|
||||||
Some(oid) => db.onboarded_targets().find_one(doc! { "_id": oid }).await?,
|
|
||||||
None => None,
|
|
||||||
};
|
|
||||||
|
|
||||||
match (linked, repo_oid) {
|
|
||||||
// Fold into an existing repo-derived target.
|
|
||||||
(Some(mut target), Some(oid)) => {
|
|
||||||
if target.has(ArtifactKind::LiveUrl) {
|
|
||||||
report.skipped_existing += 1; // already folded on a prior run
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
fold_dast_into_target(&mut target, &dast);
|
|
||||||
if !dry_run {
|
|
||||||
db.onboarded_targets()
|
|
||||||
.replace_one(doc! { "_id": oid }, &target)
|
|
||||||
.await?;
|
|
||||||
relink_history(db, &dast_id.to_hex(), &oid.to_hex()).await?;
|
|
||||||
}
|
|
||||||
report.dast_targets_folded += 1;
|
|
||||||
}
|
|
||||||
// No linked repo target: migrate as a standalone target (keeps _id).
|
|
||||||
_ => {
|
|
||||||
if db
|
|
||||||
.onboarded_targets()
|
|
||||||
.find_one(doc! { "_id": dast_id })
|
|
||||||
.await?
|
|
||||||
.is_some()
|
|
||||||
{
|
|
||||||
report.skipped_existing += 1;
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
if !dry_run {
|
|
||||||
db.onboarded_targets()
|
|
||||||
.insert_one(dast_to_standalone_target(&dast))
|
|
||||||
.await?;
|
|
||||||
}
|
|
||||||
report.dast_targets_standalone += 1;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if !dry_run {
|
|
||||||
db.collection_named::<Document>("schema_migrations")
|
|
||||||
.update_one(
|
|
||||||
doc! { "_id": MIGRATION_MARKER },
|
|
||||||
doc! { "$set": { "applied_at": mongodb::bson::DateTime::now() } },
|
|
||||||
)
|
|
||||||
.upsert(true)
|
|
||||||
.await?;
|
|
||||||
}
|
|
||||||
Ok(report)
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Relink DAST scan runs and pentest sessions from the old DAST target id to the
|
|
||||||
/// unified target id, logging each move so [`revert`] can undo it.
|
|
||||||
///
|
|
||||||
/// Note: if multiple DAST targets fold into the same repo target, revert
|
|
||||||
/// restores only the last-logged mapping — a rare edge. The source collections
|
|
||||||
/// (`repositories`, `dast_targets`) are never deleted, so no data is lost.
|
|
||||||
async fn relink_history(db: &Database, old_id: &str, new_id: &str) -> Result<(), AgentError> {
|
|
||||||
db.dast_scan_runs()
|
|
||||||
.update_many(
|
|
||||||
doc! { "target_id": old_id },
|
|
||||||
doc! { "$set": { "target_id": new_id } },
|
|
||||||
)
|
|
||||||
.await?;
|
|
||||||
db.pentest_sessions()
|
|
||||||
.update_many(
|
|
||||||
doc! { "target_id": old_id },
|
|
||||||
doc! { "$set": { "target_id": new_id } },
|
|
||||||
)
|
|
||||||
.await?;
|
|
||||||
db.collection_named::<Document>("onboarding_migration_log")
|
|
||||||
.insert_one(doc! { "old_target_id": old_id, "new_target_id": new_id })
|
|
||||||
.await?;
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Undo the backfill: replay the relink log in reverse, drop `onboarded_targets`
|
|
||||||
/// and the log, and clear the marker. The legacy collections are untouched, so
|
|
||||||
/// this restores the pre-migration state.
|
|
||||||
pub async fn revert(db: &Database) -> Result<(), AgentError> {
|
|
||||||
let log = db.collection_named::<Document>("onboarding_migration_log");
|
|
||||||
let mut cursor = log.find(doc! {}).await?;
|
|
||||||
while let Some(entry) = cursor.try_next().await? {
|
|
||||||
if let (Ok(old), Ok(new)) = (
|
|
||||||
entry.get_str("old_target_id"),
|
|
||||||
entry.get_str("new_target_id"),
|
|
||||||
) {
|
|
||||||
db.dast_scan_runs()
|
|
||||||
.update_many(
|
|
||||||
doc! { "target_id": new },
|
|
||||||
doc! { "$set": { "target_id": old } },
|
|
||||||
)
|
|
||||||
.await?;
|
|
||||||
db.pentest_sessions()
|
|
||||||
.update_many(
|
|
||||||
doc! { "target_id": new },
|
|
||||||
doc! { "$set": { "target_id": old } },
|
|
||||||
)
|
|
||||||
.await?;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
db.onboarded_targets().drop().await?;
|
|
||||||
log.drop().await?;
|
|
||||||
db.collection_named::<Document>("schema_migrations")
|
|
||||||
.delete_one(doc! { "_id": MIGRATION_MARKER })
|
|
||||||
.await?;
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
|
|
||||||
#[cfg(test)]
|
|
||||||
#[allow(clippy::expect_used, clippy::unwrap_used)]
|
|
||||||
mod tests {
|
|
||||||
use super::*;
|
|
||||||
use compliance_core::models::{DastAuthConfig, TrackerType};
|
|
||||||
|
|
||||||
fn repo() -> TrackedRepository {
|
|
||||||
let mut r = TrackedRepository::new("acme".to_string(), "https://git/acme.git".to_string());
|
|
||||||
r.id = Some(mongodb::bson::oid::ObjectId::new());
|
|
||||||
r.default_branch = "develop".to_string();
|
|
||||||
r.last_scanned_commit = Some("abc123".to_string());
|
|
||||||
r.auth_token = Some("pat".to_string());
|
|
||||||
r.auth_username = Some("bob".to_string());
|
|
||||||
r.tracker_type = Some(TrackerType::Gitea);
|
|
||||||
r.tracker_owner = Some("acme".to_string());
|
|
||||||
r.findings_count = 7;
|
|
||||||
r
|
|
||||||
}
|
|
||||||
|
|
||||||
fn dast(repo_id: Option<String>, kind: DastTargetType) -> DastTarget {
|
|
||||||
let mut d = DastTarget::new(
|
|
||||||
"acme-web".to_string(),
|
|
||||||
"https://acme.example.com".to_string(),
|
|
||||||
kind,
|
|
||||||
);
|
|
||||||
d.id = Some(mongodb::bson::oid::ObjectId::new());
|
|
||||||
d.repo_id = repo_id;
|
|
||||||
d.max_crawl_depth = 5;
|
|
||||||
d.auth_config = Some(DastAuthConfig {
|
|
||||||
method: "bearer".to_string(),
|
|
||||||
login_url: None,
|
|
||||||
username: None,
|
|
||||||
password: None,
|
|
||||||
token: Some("tok".to_string()),
|
|
||||||
headers: None,
|
|
||||||
});
|
|
||||||
d
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn repo_maps_preserving_id_and_git_artifact() {
|
|
||||||
let r = repo();
|
|
||||||
let t = repo_to_target(&r);
|
|
||||||
assert_eq!(t.id, r.id); // id preserved
|
|
||||||
assert_eq!(t.findings_count, 7);
|
|
||||||
assert_eq!(t.scan_schedule, r.scan_schedule);
|
|
||||||
let git = t.code_artifact().expect("git artifact");
|
|
||||||
assert_eq!(git.kind, ArtifactKind::GitRepo);
|
|
||||||
assert_eq!(git.source_ref, "https://git/acme.git");
|
|
||||||
let gc = git.git.as_ref().expect("git config");
|
|
||||||
assert_eq!(gc.default_branch, "develop");
|
|
||||||
assert_eq!(gc.last_scanned_commit.as_deref(), Some("abc123"));
|
|
||||||
let auth = git.auth.as_ref().expect("auth");
|
|
||||||
assert_eq!(auth.secret.as_deref(), Some("pat"));
|
|
||||||
assert_eq!(auth.username.as_deref(), Some("bob"));
|
|
||||||
assert_eq!(
|
|
||||||
t.scan_config
|
|
||||||
.issue_tracker
|
|
||||||
.as_ref()
|
|
||||||
.and_then(|it| it.tracker_type.clone()),
|
|
||||||
Some(TrackerType::Gitea)
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn standalone_dast_maps_preserving_id_and_live_url() {
|
|
||||||
let d = dast(None, DastTargetType::WebApp);
|
|
||||||
let t = dast_to_standalone_target(&d);
|
|
||||||
assert_eq!(t.id, d.id);
|
|
||||||
assert_eq!(t.target_type, TargetType::WebApp);
|
|
||||||
let url = t.live_url().expect("live url");
|
|
||||||
assert_eq!(url.source_ref, "https://acme.example.com");
|
|
||||||
let web = url.web.as_ref().expect("web config");
|
|
||||||
assert_eq!(web.max_crawl_depth, 5);
|
|
||||||
assert_eq!(
|
|
||||||
url.auth.as_ref().and_then(|a| a.secret.clone()),
|
|
||||||
Some("tok".to_string())
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn rest_api_dast_maps_to_backend_service() {
|
|
||||||
let d = dast(None, DastTargetType::RestApi);
|
|
||||||
assert_eq!(
|
|
||||||
dast_to_standalone_target(&d).target_type,
|
|
||||||
TargetType::BackendService
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn fold_adds_live_url_and_promotes_webapp() {
|
|
||||||
let mut t = repo_to_target(&repo());
|
|
||||||
assert_eq!(t.target_type, TargetType::BackendService);
|
|
||||||
fold_dast_into_target(&mut t, &dast(Some("x".to_string()), DastTargetType::WebApp));
|
|
||||||
assert_eq!(t.target_type, TargetType::WebApp); // promoted
|
|
||||||
assert!(t.has(ArtifactKind::LiveUrl));
|
|
||||||
assert!(t.has(ArtifactKind::GitRepo));
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn fold_is_idempotent_on_live_url() {
|
|
||||||
let mut t = repo_to_target(&repo());
|
|
||||||
let d = dast(Some("x".to_string()), DastTargetType::WebApp);
|
|
||||||
fold_dast_into_target(&mut t, &d);
|
|
||||||
fold_dast_into_target(&mut t, &d);
|
|
||||||
let live_urls = t
|
|
||||||
.artifacts
|
|
||||||
.iter()
|
|
||||||
.filter(|a| a.kind == ArtifactKind::LiveUrl)
|
|
||||||
.count();
|
|
||||||
assert_eq!(live_urls, 1);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -328,7 +328,6 @@ mod tests {
|
|||||||
scan_schedule: String::new(),
|
scan_schedule: String::new(),
|
||||||
cve_monitor_schedule: String::new(),
|
cve_monitor_schedule: String::new(),
|
||||||
git_clone_base_path: String::new(),
|
git_clone_base_path: String::new(),
|
||||||
artifact_store_base_path: String::new(),
|
|
||||||
ssh_key_path: String::new(),
|
ssh_key_path: String::new(),
|
||||||
keycloak_url: None,
|
keycloak_url: None,
|
||||||
keycloak_realm: None,
|
keycloak_realm: None,
|
||||||
|
|||||||
@@ -215,7 +215,7 @@ fn scan_with_patterns(
|
|||||||
repo_id.to_string(),
|
repo_id.to_string(),
|
||||||
fingerprint,
|
fingerprint,
|
||||||
scanner_name.to_string(),
|
scanner_name.to_string(),
|
||||||
scan_type,
|
scan_type.clone(),
|
||||||
pattern.title.clone(),
|
pattern.title.clone(),
|
||||||
pattern.description.clone(),
|
pattern.description.clone(),
|
||||||
pattern.severity.clone(),
|
pattern.severity.clone(),
|
||||||
|
|||||||
@@ -7,18 +7,11 @@ use crate::agent::ComplianceAgent;
|
|||||||
use crate::database::Database;
|
use crate::database::Database;
|
||||||
use crate::error::AgentError;
|
use crate::error::AgentError;
|
||||||
|
|
||||||
/// Default tenant the scheduler runs against when neither the tenant
|
/// Default tenant the scheduler runs against when `SCHEDULER_TENANT_IDS`
|
||||||
/// registry nor `SCHEDULER_TENANT_IDS` are configured. Matches the
|
/// isn't set. Matches the dev-injector default so a bare `cargo run` has
|
||||||
/// dev-injector default so a bare `cargo run` has the scheduler
|
/// the scheduler scanning whatever lives in `<prefix>_dev`.
|
||||||
/// scanning whatever lives in `<prefix>_dev`.
|
|
||||||
const DEFAULT_SCHEDULER_TENANT_ID: &str = "dev";
|
const DEFAULT_SCHEDULER_TENANT_ID: &str = "dev";
|
||||||
|
|
||||||
/// Request timeout when fetching the live tenant list from the
|
|
||||||
/// registry. Kept short — if the registry is slow we'd rather fall
|
|
||||||
/// back to env-configured ids and finish the tick than block the
|
|
||||||
/// scheduler loop.
|
|
||||||
const REGISTRY_FETCH_TIMEOUT_SECS: u64 = 5;
|
|
||||||
|
|
||||||
pub async fn start_scheduler(agent: &ComplianceAgent) -> Result<(), AgentError> {
|
pub async fn start_scheduler(agent: &ComplianceAgent) -> Result<(), AgentError> {
|
||||||
let sched = JobScheduler::new()
|
let sched = JobScheduler::new()
|
||||||
.await
|
.await
|
||||||
@@ -31,12 +24,7 @@ pub async fn start_scheduler(agent: &ComplianceAgent) -> Result<(), AgentError>
|
|||||||
let agent = scan_agent.clone();
|
let agent = scan_agent.clone();
|
||||||
Box::pin(async move {
|
Box::pin(async move {
|
||||||
tracing::info!("Scheduled scan triggered");
|
tracing::info!("Scheduled scan triggered");
|
||||||
let tenants = scheduler_tenants(&agent).await;
|
for tenant_id in scheduler_tenants() {
|
||||||
tracing::debug!(
|
|
||||||
tenant_count = tenants.len(),
|
|
||||||
"Scheduled scan: tenants resolved"
|
|
||||||
);
|
|
||||||
for tenant_id in tenants {
|
|
||||||
scan_all_repos(&agent, &tenant_id).await;
|
scan_all_repos(&agent, &tenant_id).await;
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
@@ -54,12 +42,7 @@ pub async fn start_scheduler(agent: &ComplianceAgent) -> Result<(), AgentError>
|
|||||||
let agent = cve_agent.clone();
|
let agent = cve_agent.clone();
|
||||||
Box::pin(async move {
|
Box::pin(async move {
|
||||||
tracing::info!("CVE monitor triggered");
|
tracing::info!("CVE monitor triggered");
|
||||||
let tenants = scheduler_tenants(&agent).await;
|
for tenant_id in scheduler_tenants() {
|
||||||
tracing::debug!(
|
|
||||||
tenant_count = tenants.len(),
|
|
||||||
"CVE monitor: tenants resolved"
|
|
||||||
);
|
|
||||||
for tenant_id in tenants {
|
|
||||||
monitor_cves(&agent, &tenant_id).await;
|
monitor_cves(&agent, &tenant_id).await;
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
@@ -75,14 +58,9 @@ pub async fn start_scheduler(agent: &ComplianceAgent) -> Result<(), AgentError>
|
|||||||
.await
|
.await
|
||||||
.map_err(|e| AgentError::Scheduler(format!("Failed to start scheduler: {e}")))?;
|
.map_err(|e| AgentError::Scheduler(format!("Failed to start scheduler: {e}")))?;
|
||||||
|
|
||||||
let tenants = scheduler_tenants(agent).await;
|
let tenants = scheduler_tenants();
|
||||||
let source = if agent.config.tenant_registry_url.is_some() {
|
|
||||||
"tenant-registry (env fallback)"
|
|
||||||
} else {
|
|
||||||
"env (SCHEDULER_TENANT_IDS)"
|
|
||||||
};
|
|
||||||
tracing::info!(
|
tracing::info!(
|
||||||
"Scheduler started: scans='{}', CVE monitor='{}', tenant source={source}, tenants={tenants:?}",
|
"Scheduler started: scans='{}', CVE monitor='{}', tenants={tenants:?}",
|
||||||
agent.config.scan_schedule,
|
agent.config.scan_schedule,
|
||||||
agent.config.cve_monitor_schedule,
|
agent.config.cve_monitor_schedule,
|
||||||
);
|
);
|
||||||
@@ -93,40 +71,10 @@ pub async fn start_scheduler(agent: &ComplianceAgent) -> Result<(), AgentError>
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Tenants the scheduler iterates each tick.
|
/// Tenants the scheduler iterates each tick. From `SCHEDULER_TENANT_IDS`
|
||||||
///
|
/// (comma-separated), or `DEFAULT_SCHEDULER_TENANT_ID` if unset. M7.2-D
|
||||||
/// Resolution order:
|
/// will replace this with a pull from the tenant-registry.
|
||||||
/// 1. **Tenant registry** at `agent.config.tenant_registry_url`
|
fn scheduler_tenants() -> Vec<String> {
|
||||||
/// (`GET /v1/tenants`). Fresh on every tick — picks up newly
|
|
||||||
/// provisioned tenants without an agent restart.
|
|
||||||
/// 2. **`SCHEDULER_TENANT_IDS`** env (comma-separated) — fallback when
|
|
||||||
/// the registry is unreachable, the response is malformed, or no
|
|
||||||
/// registry URL is configured.
|
|
||||||
/// 3. **`DEFAULT_SCHEDULER_TENANT_ID`** (`"dev"`) — last-ditch fallback
|
|
||||||
/// so the scheduler keeps doing something useful in dev.
|
|
||||||
///
|
|
||||||
/// We never panic out of this function — the scheduler must keep
|
|
||||||
/// firing even if the registry is offline.
|
|
||||||
async fn scheduler_tenants(agent: &ComplianceAgent) -> Vec<String> {
|
|
||||||
if let Some(url) = agent.config.tenant_registry_url.as_deref() {
|
|
||||||
match fetch_tenants_from_registry(&agent.http, url).await {
|
|
||||||
Ok(v) if !v.is_empty() => return v,
|
|
||||||
Ok(_) => {
|
|
||||||
tracing::warn!("tenant-registry returned empty list; falling back to env");
|
|
||||||
}
|
|
||||||
Err(e) => {
|
|
||||||
tracing::warn!(
|
|
||||||
url = %url,
|
|
||||||
error = %e,
|
|
||||||
"tenant-registry fetch failed; falling back to env"
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
tenants_from_env()
|
|
||||||
}
|
|
||||||
|
|
||||||
fn tenants_from_env() -> Vec<String> {
|
|
||||||
std::env::var("SCHEDULER_TENANT_IDS")
|
std::env::var("SCHEDULER_TENANT_IDS")
|
||||||
.ok()
|
.ok()
|
||||||
.map(|s| {
|
.map(|s| {
|
||||||
@@ -140,134 +88,6 @@ fn tenants_from_env() -> Vec<String> {
|
|||||||
.unwrap_or_else(|| vec![DEFAULT_SCHEDULER_TENANT_ID.to_string()])
|
.unwrap_or_else(|| vec![DEFAULT_SCHEDULER_TENANT_ID.to_string()])
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Shape we accept from the registry. Liberal in what we accept:
|
|
||||||
/// the registry can return any field shape as long as either `id` or
|
|
||||||
/// `tenant_id` is present. Other fields are ignored.
|
|
||||||
#[derive(serde::Deserialize)]
|
|
||||||
struct RegistryTenant {
|
|
||||||
#[serde(alias = "tenant_id")]
|
|
||||||
id: String,
|
|
||||||
/// Filter out non-running tenants if status is present. Missing
|
|
||||||
/// status defaults to "active" so older registry deployments keep
|
|
||||||
/// working.
|
|
||||||
#[serde(default = "default_status")]
|
|
||||||
status: String,
|
|
||||||
}
|
|
||||||
|
|
||||||
fn default_status() -> String {
|
|
||||||
"active".to_string()
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(serde::Deserialize)]
|
|
||||||
struct RegistryListResponse {
|
|
||||||
data: Vec<RegistryTenant>,
|
|
||||||
}
|
|
||||||
|
|
||||||
async fn fetch_tenants_from_registry(
|
|
||||||
http: &reqwest::Client,
|
|
||||||
base_url: &str,
|
|
||||||
) -> Result<Vec<String>, String> {
|
|
||||||
let url = format!("{}/v1/tenants", base_url.trim_end_matches('/'));
|
|
||||||
let resp = http
|
|
||||||
.get(&url)
|
|
||||||
.timeout(std::time::Duration::from_secs(REGISTRY_FETCH_TIMEOUT_SECS))
|
|
||||||
.send()
|
|
||||||
.await
|
|
||||||
.map_err(|e| format!("request failed: {e}"))?;
|
|
||||||
if !resp.status().is_success() {
|
|
||||||
return Err(format!("registry returned {}", resp.status()));
|
|
||||||
}
|
|
||||||
let body: RegistryListResponse = resp
|
|
||||||
.json()
|
|
||||||
.await
|
|
||||||
.map_err(|e| format!("invalid JSON: {e}"))?;
|
|
||||||
Ok(filter_active(body.data))
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Frozen/Archived tenants don't need scheduled scans; the M7.1
|
|
||||||
/// status gate would 402/410 anyway. Skip them so we don't waste
|
|
||||||
/// cycles. Active / trial / demo / anything-else-unknown all run.
|
|
||||||
fn filter_active(rows: Vec<RegistryTenant>) -> Vec<String> {
|
|
||||||
rows.into_iter()
|
|
||||||
.filter(|t| !matches!(t.status.as_str(), "frozen" | "archived"))
|
|
||||||
.map(|t| t.id)
|
|
||||||
.collect()
|
|
||||||
}
|
|
||||||
|
|
||||||
#[cfg(test)]
|
|
||||||
mod tests {
|
|
||||||
use super::*;
|
|
||||||
|
|
||||||
fn tenant(id: &str, status: &str) -> RegistryTenant {
|
|
||||||
RegistryTenant {
|
|
||||||
id: id.to_string(),
|
|
||||||
status: status.to_string(),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn filter_active_keeps_running_skips_frozen_archived() {
|
|
||||||
let rows = vec![
|
|
||||||
tenant("a", "active"),
|
|
||||||
tenant("b", "trial"),
|
|
||||||
tenant("c", "demo"),
|
|
||||||
tenant("d", "frozen"),
|
|
||||||
tenant("e", "archived"),
|
|
||||||
tenant("f", "weird-but-not-known-dead"),
|
|
||||||
];
|
|
||||||
let out = filter_active(rows);
|
|
||||||
assert_eq!(out, vec!["a", "b", "c", "f"]);
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn deserialize_registry_response_accepts_id_or_tenant_id() {
|
|
||||||
let body = r#"{"data":[
|
|
||||||
{"id":"a","status":"active"},
|
|
||||||
{"tenant_id":"b","status":"trial"},
|
|
||||||
{"id":"c"}
|
|
||||||
]}"#;
|
|
||||||
let parsed: RegistryListResponse = serde_json::from_str(body).unwrap();
|
|
||||||
assert_eq!(parsed.data.len(), 3);
|
|
||||||
assert_eq!(parsed.data[0].id, "a");
|
|
||||||
assert_eq!(parsed.data[1].id, "b");
|
|
||||||
assert_eq!(parsed.data[2].id, "c");
|
|
||||||
// Default status for the third entry should be "active"
|
|
||||||
assert_eq!(parsed.data[2].status, "active");
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Combined into a single test: cargo runs tests in parallel and
|
|
||||||
/// env vars are process-global, so two separate tests touching
|
|
||||||
/// `SCHEDULER_TENANT_IDS` race each other. Doing both checks in
|
|
||||||
/// one test keeps them in a deterministic order.
|
|
||||||
#[test]
|
|
||||||
fn tenants_from_env_resolution() {
|
|
||||||
std::env::remove_var("SCHEDULER_TENANT_IDS");
|
|
||||||
assert_eq!(
|
|
||||||
tenants_from_env(),
|
|
||||||
vec![DEFAULT_SCHEDULER_TENANT_ID.to_string()],
|
|
||||||
"unset → default"
|
|
||||||
);
|
|
||||||
|
|
||||||
std::env::set_var("SCHEDULER_TENANT_IDS", "acme, globex ,,hello");
|
|
||||||
let out = tenants_from_env();
|
|
||||||
std::env::remove_var("SCHEDULER_TENANT_IDS");
|
|
||||||
assert_eq!(
|
|
||||||
out,
|
|
||||||
vec!["acme", "globex", "hello"],
|
|
||||||
"splits + trims + drops empty"
|
|
||||||
);
|
|
||||||
|
|
||||||
std::env::set_var("SCHEDULER_TENANT_IDS", "");
|
|
||||||
let out = tenants_from_env();
|
|
||||||
std::env::remove_var("SCHEDULER_TENANT_IDS");
|
|
||||||
assert_eq!(
|
|
||||||
out,
|
|
||||||
vec![DEFAULT_SCHEDULER_TENANT_ID.to_string()],
|
|
||||||
"empty → default"
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Resolve the per-tenant database. Logs and returns `None` on failure
|
/// Resolve the per-tenant database. Logs and returns `None` on failure
|
||||||
/// so the loop in the caller can continue with other tenants.
|
/// so the loop in the caller can continue with other tenants.
|
||||||
async fn tenant_db(agent: &ComplianceAgent, tenant_id: &str) -> Option<Database> {
|
async fn tenant_db(agent: &ComplianceAgent, tenant_id: &str) -> Option<Database> {
|
||||||
|
|||||||
@@ -25,9 +25,8 @@ impl TestServer {
|
|||||||
let mongodb_uri = std::env::var("TEST_MONGODB_URI")
|
let mongodb_uri = std::env::var("TEST_MONGODB_URI")
|
||||||
.unwrap_or_else(|_| "mongodb://root:example@localhost:27017/?authSource=admin".into());
|
.unwrap_or_else(|_| "mongodb://root:example@localhost:27017/?authSource=admin".into());
|
||||||
|
|
||||||
// Unique db-name prefix per run. Must fit the pool's 30-char cap
|
// Unique database name per test run to avoid collisions
|
||||||
// (`<prefix>_<32 hex>` <= 63), so use a 16-hex-char suffix.
|
let db_name = format!("test_{}", uuid::Uuid::new_v4().simple());
|
||||||
let db_name = format!("t_{}", &uuid::Uuid::new_v4().simple().to_string()[..16]);
|
|
||||||
|
|
||||||
let db_pool = DatabasePool::connect(&mongodb_uri, &db_name)
|
let db_pool = DatabasePool::connect(&mongodb_uri, &db_name)
|
||||||
.await
|
.await
|
||||||
@@ -45,7 +44,6 @@ impl TestServer {
|
|||||||
scan_schedule: String::new(),
|
scan_schedule: String::new(),
|
||||||
cve_monitor_schedule: String::new(),
|
cve_monitor_schedule: String::new(),
|
||||||
git_clone_base_path: "/tmp/compliance-scanner-tests/repos".into(),
|
git_clone_base_path: "/tmp/compliance-scanner-tests/repos".into(),
|
||||||
artifact_store_base_path: "/tmp/compliance-scanner-tests/artifacts".into(),
|
|
||||||
ssh_key_path: "/tmp/compliance-scanner-tests/ssh/id_ed25519".into(),
|
ssh_key_path: "/tmp/compliance-scanner-tests/ssh/id_ed25519".into(),
|
||||||
github_token: None,
|
github_token: None,
|
||||||
github_webhook_secret: None,
|
github_webhook_secret: None,
|
||||||
|
|||||||
@@ -2,6 +2,5 @@ mod cascade_delete;
|
|||||||
mod dast;
|
mod dast;
|
||||||
mod findings;
|
mod findings;
|
||||||
mod health;
|
mod health;
|
||||||
mod onboarding;
|
|
||||||
mod repositories;
|
mod repositories;
|
||||||
mod stats;
|
mod stats;
|
||||||
|
|||||||
@@ -1,115 +0,0 @@
|
|||||||
use crate::common::TestServer;
|
|
||||||
use serde_json::json;
|
|
||||||
|
|
||||||
#[tokio::test]
|
|
||||||
async fn create_list_and_applicable_scans() {
|
|
||||||
let server = TestServer::start().await;
|
|
||||||
|
|
||||||
// Initially empty.
|
|
||||||
let resp = server.get("/api/v1/targets").await;
|
|
||||||
assert_eq!(resp.status(), 200);
|
|
||||||
let body: serde_json::Value = resp.json().await.unwrap();
|
|
||||||
assert_eq!(body["data"].as_array().unwrap().len(), 0);
|
|
||||||
|
|
||||||
// Create a web-app target with a git repo + a live URL.
|
|
||||||
let resp = server
|
|
||||||
.post(
|
|
||||||
"/api/v1/targets",
|
|
||||||
&json!({
|
|
||||||
"name": "acme-web",
|
|
||||||
"target_type": "web_app",
|
|
||||||
"artifacts": [
|
|
||||||
{ "kind": "git_repo", "source_ref": "https://git/acme.git", "branch": "main" },
|
|
||||||
{ "kind": "live_url", "source_ref": "https://acme.example.com" }
|
|
||||||
]
|
|
||||||
}),
|
|
||||||
)
|
|
||||||
.await;
|
|
||||||
assert_eq!(resp.status(), 200);
|
|
||||||
let body: serde_json::Value = resp.json().await.unwrap();
|
|
||||||
let id = body["data"]["_id"]["$oid"].as_str().unwrap().to_string();
|
|
||||||
assert!(!id.is_empty());
|
|
||||||
assert_eq!(body["data"]["artifacts"].as_array().unwrap().len(), 2);
|
|
||||||
|
|
||||||
// List returns it.
|
|
||||||
let resp = server.get("/api/v1/targets").await;
|
|
||||||
let body: serde_json::Value = resp.json().await.unwrap();
|
|
||||||
assert_eq!(body["data"].as_array().unwrap().len(), 1);
|
|
||||||
|
|
||||||
// Applicable scans: SAST present + DAST offered (live URL present), pentest supported.
|
|
||||||
let resp = server
|
|
||||||
.get(&format!("/api/v1/targets/{id}/applicable-scans"))
|
|
||||||
.await;
|
|
||||||
assert_eq!(resp.status(), 200);
|
|
||||||
let body: serde_json::Value = resp.json().await.unwrap();
|
|
||||||
let scans = body["data"]["scans"].as_array().unwrap();
|
|
||||||
let names: Vec<&str> = scans.iter().filter_map(|s| s["scan"].as_str()).collect();
|
|
||||||
assert!(names.contains(&"sast"));
|
|
||||||
assert!(names.contains(&"dast"));
|
|
||||||
assert_eq!(body["data"]["pentest_supported"], true);
|
|
||||||
|
|
||||||
server.cleanup().await;
|
|
||||||
}
|
|
||||||
|
|
||||||
#[tokio::test]
|
|
||||||
async fn detect_classifies_a_plc_target() {
|
|
||||||
let server = TestServer::start().await;
|
|
||||||
|
|
||||||
// A PLC project artifact is a strong kind-based signal.
|
|
||||||
let resp = server
|
|
||||||
.post(
|
|
||||||
"/api/v1/targets",
|
|
||||||
&json!({
|
|
||||||
"name": "line-controller",
|
|
||||||
"target_type": "backend_service", // deliberately wrong; detect should suggest PLC
|
|
||||||
"artifacts": [
|
|
||||||
{ "kind": "plc_project", "source_ref": "line.xml", "plc_format": "plcopen_xml" }
|
|
||||||
]
|
|
||||||
}),
|
|
||||||
)
|
|
||||||
.await;
|
|
||||||
let body: serde_json::Value = resp.json().await.unwrap();
|
|
||||||
let id = body["data"]["_id"]["$oid"].as_str().unwrap().to_string();
|
|
||||||
|
|
||||||
let resp = server
|
|
||||||
.post(&format!("/api/v1/targets/{id}/detect"), &json!({}))
|
|
||||||
.await;
|
|
||||||
assert_eq!(resp.status(), 200);
|
|
||||||
let body: serde_json::Value = resp.json().await.unwrap();
|
|
||||||
assert_eq!(body["data"]["classification"]["suggested"], "plc_sps");
|
|
||||||
|
|
||||||
server.cleanup().await;
|
|
||||||
}
|
|
||||||
|
|
||||||
#[tokio::test]
|
|
||||||
async fn add_artifact_and_delete_target() {
|
|
||||||
let server = TestServer::start().await;
|
|
||||||
|
|
||||||
let resp = server
|
|
||||||
.post(
|
|
||||||
"/api/v1/targets",
|
|
||||||
&json!({ "name": "svc", "target_type": "backend_service" }),
|
|
||||||
)
|
|
||||||
.await;
|
|
||||||
let body: serde_json::Value = resp.json().await.unwrap();
|
|
||||||
let id = body["data"]["_id"]["$oid"].as_str().unwrap().to_string();
|
|
||||||
|
|
||||||
// Attach a git repo.
|
|
||||||
let resp = server
|
|
||||||
.post(
|
|
||||||
&format!("/api/v1/targets/{id}/artifacts"),
|
|
||||||
&json!({ "kind": "git_repo", "source_ref": "https://git/svc.git" }),
|
|
||||||
)
|
|
||||||
.await;
|
|
||||||
assert_eq!(resp.status(), 200);
|
|
||||||
let body: serde_json::Value = resp.json().await.unwrap();
|
|
||||||
assert_eq!(body["data"]["artifacts"].as_array().unwrap().len(), 1);
|
|
||||||
|
|
||||||
// Delete it.
|
|
||||||
let resp = server.delete(&format!("/api/v1/targets/{id}")).await;
|
|
||||||
assert_eq!(resp.status(), 200);
|
|
||||||
let resp = server.get(&format!("/api/v1/targets/{id}")).await;
|
|
||||||
assert_eq!(resp.status(), 404);
|
|
||||||
|
|
||||||
server.cleanup().await;
|
|
||||||
}
|
|
||||||
@@ -1,156 +0,0 @@
|
|||||||
// Integration tests for the onboarding backfill migration.
|
|
||||||
//
|
|
||||||
// Requires MongoDB (set TEST_MONGODB_URI if not at the default).
|
|
||||||
// Not run in CI (which is `--lib` only) — run locally:
|
|
||||||
// cargo test -p compliance-agent --test e2e migration
|
|
||||||
|
|
||||||
use compliance_agent::database::{Database, DatabasePool};
|
|
||||||
use compliance_agent::migrate::onboarding;
|
|
||||||
use compliance_core::models::{
|
|
||||||
ArtifactKind, DastTarget, DastTargetType, TargetType, TrackedRepository,
|
|
||||||
};
|
|
||||||
use mongodb::bson::{doc, Document};
|
|
||||||
|
|
||||||
async fn fresh_db() -> (DatabasePool, String, Database) {
|
|
||||||
let uri = std::env::var("TEST_MONGODB_URI")
|
|
||||||
.unwrap_or_else(|_| "mongodb://root:example@localhost:27017/?authSource=admin".into());
|
|
||||||
// Prefix must fit the pool's 30-char cap (`<prefix>_<32 hex>` <= 63).
|
|
||||||
let prefix = format!("t_{}", &uuid::Uuid::new_v4().simple().to_string()[..16]);
|
|
||||||
let pool = DatabasePool::connect(&uri, &prefix)
|
|
||||||
.await
|
|
||||||
.expect("connect mongo");
|
|
||||||
let db = pool.for_tenant_id("t1").await.expect("tenant db");
|
|
||||||
(pool, prefix, db)
|
|
||||||
}
|
|
||||||
|
|
||||||
async fn cleanup(pool: &DatabasePool, prefix: &str) {
|
|
||||||
if let Ok(names) = pool.client().list_database_names().await {
|
|
||||||
for n in names {
|
|
||||||
if n.starts_with(prefix) {
|
|
||||||
pool.client().database(&n).drop().await.ok();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[tokio::test]
|
|
||||||
async fn backfill_folds_relinks_is_idempotent_and_reversible() {
|
|
||||||
let (pool, prefix, db) = fresh_db().await;
|
|
||||||
|
|
||||||
// Seed a repo.
|
|
||||||
let repo = TrackedRepository::new("acme".into(), "https://git/acme.git".into());
|
|
||||||
let repo_id = db
|
|
||||||
.repositories()
|
|
||||||
.insert_one(repo)
|
|
||||||
.await
|
|
||||||
.expect("insert repo")
|
|
||||||
.inserted_id
|
|
||||||
.as_object_id()
|
|
||||||
.expect("repo oid");
|
|
||||||
|
|
||||||
// A DAST target linked to the repo (folds + promotes to WebApp + relinks).
|
|
||||||
let mut linked = DastTarget::new(
|
|
||||||
"acme-web".into(),
|
|
||||||
"https://acme.example.com".into(),
|
|
||||||
DastTargetType::WebApp,
|
|
||||||
);
|
|
||||||
linked.repo_id = Some(repo_id.to_hex());
|
|
||||||
let linked_id = db
|
|
||||||
.dast_targets()
|
|
||||||
.insert_one(linked)
|
|
||||||
.await
|
|
||||||
.expect("insert linked dast")
|
|
||||||
.inserted_id
|
|
||||||
.as_object_id()
|
|
||||||
.expect("linked oid");
|
|
||||||
|
|
||||||
// A repo-less DAST target (standalone).
|
|
||||||
let standalone = DastTarget::new(
|
|
||||||
"acme-api".into(),
|
|
||||||
"https://api.acme.com".into(),
|
|
||||||
DastTargetType::RestApi,
|
|
||||||
);
|
|
||||||
let standalone_id = db
|
|
||||||
.dast_targets()
|
|
||||||
.insert_one(standalone)
|
|
||||||
.await
|
|
||||||
.expect("insert standalone dast")
|
|
||||||
.inserted_id
|
|
||||||
.as_object_id()
|
|
||||||
.expect("standalone oid");
|
|
||||||
|
|
||||||
// A DAST scan run pointing at the linked target — should be relinked to the repo.
|
|
||||||
db.collection_named::<Document>("dast_scan_runs")
|
|
||||||
.insert_one(doc! { "target_id": linked_id.to_hex(), "status": "completed" })
|
|
||||||
.await
|
|
||||||
.expect("insert dast run");
|
|
||||||
|
|
||||||
// --- Backfill ---
|
|
||||||
assert!(!onboarding::already_applied(&db).await.unwrap());
|
|
||||||
let report = onboarding::backfill_onboarded_targets(&db, false)
|
|
||||||
.await
|
|
||||||
.expect("backfill");
|
|
||||||
assert_eq!(report.repos_migrated, 1);
|
|
||||||
assert_eq!(report.dast_targets_folded, 1);
|
|
||||||
assert_eq!(report.dast_targets_standalone, 1);
|
|
||||||
assert!(onboarding::already_applied(&db).await.unwrap());
|
|
||||||
|
|
||||||
// Repo target: preserved _id, has git + folded live-url, promoted to WebApp.
|
|
||||||
let repo_target = db
|
|
||||||
.onboarded_targets()
|
|
||||||
.find_one(doc! { "_id": repo_id })
|
|
||||||
.await
|
|
||||||
.unwrap()
|
|
||||||
.expect("repo target");
|
|
||||||
assert!(repo_target.has(ArtifactKind::GitRepo));
|
|
||||||
assert!(repo_target.has(ArtifactKind::LiveUrl));
|
|
||||||
assert_eq!(repo_target.target_type, TargetType::WebApp);
|
|
||||||
|
|
||||||
// Standalone target: preserved _id, live-url, backend service.
|
|
||||||
let standalone_target = db
|
|
||||||
.onboarded_targets()
|
|
||||||
.find_one(doc! { "_id": standalone_id })
|
|
||||||
.await
|
|
||||||
.unwrap()
|
|
||||||
.expect("standalone target");
|
|
||||||
assert!(standalone_target.has(ArtifactKind::LiveUrl));
|
|
||||||
assert_eq!(standalone_target.target_type, TargetType::BackendService);
|
|
||||||
|
|
||||||
// The DAST run was relinked from the old dast id to the repo (unified) id.
|
|
||||||
let run = db
|
|
||||||
.collection_named::<Document>("dast_scan_runs")
|
|
||||||
.find_one(doc! {})
|
|
||||||
.await
|
|
||||||
.unwrap()
|
|
||||||
.expect("run");
|
|
||||||
assert_eq!(run.get_str("target_id").unwrap(), repo_id.to_hex());
|
|
||||||
|
|
||||||
// --- Idempotent: re-run migrates nothing new ---
|
|
||||||
let again = onboarding::backfill_onboarded_targets(&db, false)
|
|
||||||
.await
|
|
||||||
.expect("backfill again");
|
|
||||||
assert_eq!(again.repos_migrated, 0);
|
|
||||||
assert_eq!(again.dast_targets_folded, 0);
|
|
||||||
assert_eq!(again.dast_targets_standalone, 0);
|
|
||||||
assert!(again.skipped_existing >= 2);
|
|
||||||
|
|
||||||
// --- Revert: onboarded targets gone, relink undone, marker cleared ---
|
|
||||||
onboarding::revert(&db).await.expect("revert");
|
|
||||||
assert_eq!(
|
|
||||||
db.onboarded_targets()
|
|
||||||
.count_documents(doc! {})
|
|
||||||
.await
|
|
||||||
.unwrap(),
|
|
||||||
0
|
|
||||||
);
|
|
||||||
let run_after = db
|
|
||||||
.collection_named::<Document>("dast_scan_runs")
|
|
||||||
.find_one(doc! {})
|
|
||||||
.await
|
|
||||||
.unwrap()
|
|
||||||
.expect("run");
|
|
||||||
assert_eq!(run_after.get_str("target_id").unwrap(), linked_id.to_hex());
|
|
||||||
assert!(!onboarding::already_applied(&db).await.unwrap());
|
|
||||||
|
|
||||||
cleanup(&pool, &prefix).await;
|
|
||||||
}
|
|
||||||
@@ -7,4 +7,3 @@
|
|||||||
// Or nightly: (via CI with MongoDB service container)
|
// Or nightly: (via CI with MongoDB service container)
|
||||||
|
|
||||||
mod api;
|
mod api;
|
||||||
mod migration;
|
|
||||||
|
|||||||
@@ -24,9 +24,6 @@ pub struct AgentConfig {
|
|||||||
pub scan_schedule: String,
|
pub scan_schedule: String,
|
||||||
pub cve_monitor_schedule: String,
|
pub cve_monitor_schedule: String,
|
||||||
pub git_clone_base_path: String,
|
pub git_clone_base_path: String,
|
||||||
/// Base directory for content-addressed artifact blobs and per-run working
|
|
||||||
/// dirs (`<base>/blobs/<sha[0:2]>/<sha>`, `<base>/work/<target>/<artifact>/`).
|
|
||||||
pub artifact_store_base_path: String,
|
|
||||||
pub ssh_key_path: String,
|
pub ssh_key_path: String,
|
||||||
pub keycloak_url: Option<String>,
|
pub keycloak_url: Option<String>,
|
||||||
pub keycloak_realm: Option<String>,
|
pub keycloak_realm: Option<String>,
|
||||||
|
|||||||
@@ -2,7 +2,6 @@ pub mod config;
|
|||||||
pub mod db;
|
pub mod db;
|
||||||
pub mod error;
|
pub mod error;
|
||||||
pub mod models;
|
pub mod models;
|
||||||
pub mod scan_matrix;
|
|
||||||
#[cfg(feature = "telemetry")]
|
#[cfg(feature = "telemetry")]
|
||||||
pub mod telemetry;
|
pub mod telemetry;
|
||||||
pub mod tenant;
|
pub mod tenant;
|
||||||
|
|||||||
@@ -9,7 +9,6 @@ pub mod issue;
|
|||||||
pub mod mcp;
|
pub mod mcp;
|
||||||
pub mod mcp_token;
|
pub mod mcp_token;
|
||||||
pub mod notification;
|
pub mod notification;
|
||||||
pub mod onboarding;
|
|
||||||
pub mod pentest;
|
pub mod pentest;
|
||||||
pub mod repository;
|
pub mod repository;
|
||||||
pub mod sbom;
|
pub mod sbom;
|
||||||
@@ -32,12 +31,6 @@ pub use issue::{IssueStatus, TrackerIssue, TrackerType};
|
|||||||
pub use mcp::{McpServerConfig, McpServerStatus, McpTransport};
|
pub use mcp::{McpServerConfig, McpServerStatus, McpTransport};
|
||||||
pub use mcp_token::{McpToken, McpTokenView};
|
pub use mcp_token::{McpToken, McpTokenView};
|
||||||
pub use notification::{CveNotification, NotificationSeverity, NotificationStatus};
|
pub use notification::{CveNotification, NotificationSeverity, NotificationStatus};
|
||||||
pub use onboarding::{
|
|
||||||
default_compliance_profile, Artifact, ArtifactAuth, ArtifactKind, Classification,
|
|
||||||
ComplianceFramework, ComplianceProfile, DetectedFact, ExternalRef, ExternalSystem,
|
|
||||||
GitArtifactConfig, IssueTrackerConfig, OnboardedTarget, PlcArtifactConfig, PlcFormat,
|
|
||||||
TargetScanConfig, TargetType, TargetTypeCandidate, WebArtifactConfig,
|
|
||||||
};
|
|
||||||
pub use pentest::{
|
pub use pentest::{
|
||||||
AttackChainNode, AttackNodeStatus, AuthMode, CodeContextHint, Environment, IdentityProvider,
|
AttackChainNode, AttackNodeStatus, AuthMode, CodeContextHint, Environment, IdentityProvider,
|
||||||
PentestAuthConfig, PentestConfig, PentestEvent, PentestMessage, PentestSession, PentestStats,
|
PentestAuthConfig, PentestConfig, PentestEvent, PentestMessage, PentestSession, PentestStats,
|
||||||
|
|||||||
@@ -1,753 +0,0 @@
|
|||||||
//! The unified onboarding model.
|
|
||||||
//!
|
|
||||||
//! An [`OnboardedTarget`] is the single source of truth for anything the scanner
|
|
||||||
//! can analyze. It records *what kind of software* the target is ([`TargetType`]),
|
|
||||||
//! the concrete [`Artifact`]s that were provided for it (a git repo, a firmware
|
|
||||||
//! image, a live URL, a PLC project, ...), the classifier's verdict, and the scan
|
|
||||||
//! configuration. It replaces the older git-only `TrackedRepository` and the
|
|
||||||
//! standalone `DastTarget`, both of which fold into this type as artifacts.
|
|
||||||
|
|
||||||
use std::collections::HashMap;
|
|
||||||
|
|
||||||
use chrono::{DateTime, Utc};
|
|
||||||
use serde::{Deserialize, Serialize};
|
|
||||||
|
|
||||||
use super::dast::{DastAuthConfig, DastTargetType};
|
|
||||||
use super::issue::TrackerType;
|
|
||||||
use super::pentest::{Environment, PentestConfig, PentestStrategy};
|
|
||||||
use super::scan::ScanType;
|
|
||||||
|
|
||||||
/// The family of software a target belongs to.
|
|
||||||
///
|
|
||||||
/// Targets look endlessly varied but fall into a small enumerable set classified
|
|
||||||
/// by where the analyzable signal lives. This drives the scan-applicability
|
|
||||||
/// matrix and the onboarding wizard's type selection.
|
|
||||||
#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Serialize, Deserialize)]
|
|
||||||
#[serde(rename_all = "snake_case")]
|
|
||||||
pub enum TargetType {
|
|
||||||
/// Browser-facing web application (front end + server).
|
|
||||||
WebApp,
|
|
||||||
/// Headless backend service / API (REST, GraphQL, gRPC).
|
|
||||||
BackendService,
|
|
||||||
/// Desktop application (Windows/macOS/Linux GUI or CLI binary).
|
|
||||||
DesktopApp,
|
|
||||||
/// Android application (APK / AAB).
|
|
||||||
AndroidApp,
|
|
||||||
/// iOS application (IPA).
|
|
||||||
IosApp,
|
|
||||||
/// Bare-metal embedded firmware (no operating system).
|
|
||||||
FirmwareBareMetal,
|
|
||||||
/// Embedded firmware running on an RTOS (Zephyr, FreeRTOS, ...).
|
|
||||||
FirmwareRtos,
|
|
||||||
/// Embedded Linux built with Yocto / OpenEmbedded (BSP + image).
|
|
||||||
EmbeddedLinuxYocto,
|
|
||||||
/// Programmable logic controller software (IEC 61131-3, PLCopen / SPS).
|
|
||||||
PlcSps,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl std::fmt::Display for TargetType {
|
|
||||||
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
|
|
||||||
match self {
|
|
||||||
Self::WebApp => write!(f, "web_app"),
|
|
||||||
Self::BackendService => write!(f, "backend_service"),
|
|
||||||
Self::DesktopApp => write!(f, "desktop_app"),
|
|
||||||
Self::AndroidApp => write!(f, "android_app"),
|
|
||||||
Self::IosApp => write!(f, "ios_app"),
|
|
||||||
Self::FirmwareBareMetal => write!(f, "firmware_bare_metal"),
|
|
||||||
Self::FirmwareRtos => write!(f, "firmware_rtos"),
|
|
||||||
Self::EmbeddedLinuxYocto => write!(f, "embedded_linux_yocto"),
|
|
||||||
Self::PlcSps => write!(f, "plc_sps"),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// The kind of artifact provided for a target.
|
|
||||||
///
|
|
||||||
/// Which scans are possible is a function of the target type *and* which of
|
|
||||||
/// these are present (SAST needs code, DAST needs a running URL, and so on).
|
|
||||||
#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]
|
|
||||||
#[serde(rename_all = "snake_case")]
|
|
||||||
pub enum ArtifactKind {
|
|
||||||
/// A git repository (cloned for static analysis).
|
|
||||||
GitRepo,
|
|
||||||
/// A source archive (zip / tarball) with no live git remote.
|
|
||||||
SourceArchive,
|
|
||||||
/// A firmware image or binary blob.
|
|
||||||
FirmwareImage,
|
|
||||||
/// A mobile package: Android APK/AAB or iOS IPA.
|
|
||||||
MobilePackage,
|
|
||||||
/// An OCI/Docker container image reference.
|
|
||||||
ContainerImage,
|
|
||||||
/// A reachable running instance (base URL / endpoint) for dynamic testing.
|
|
||||||
LiveUrl,
|
|
||||||
/// A PLC project: PLCopen XML or Structured Text source.
|
|
||||||
PlcProject,
|
|
||||||
/// Free-form plaintext describing the target (feeds classification only).
|
|
||||||
PlaintextDescription,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl std::fmt::Display for ArtifactKind {
|
|
||||||
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
|
|
||||||
match self {
|
|
||||||
Self::GitRepo => write!(f, "git_repo"),
|
|
||||||
Self::SourceArchive => write!(f, "source_archive"),
|
|
||||||
Self::FirmwareImage => write!(f, "firmware_image"),
|
|
||||||
Self::MobilePackage => write!(f, "mobile_package"),
|
|
||||||
Self::ContainerImage => write!(f, "container_image"),
|
|
||||||
Self::LiveUrl => write!(f, "live_url"),
|
|
||||||
Self::PlcProject => write!(f, "plc_project"),
|
|
||||||
Self::PlaintextDescription => write!(f, "plaintext_description"),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Credentials attached to an artifact.
|
|
||||||
///
|
|
||||||
/// This folds both `TrackedRepository`'s git auth (`auth_token` / `auth_username`
|
|
||||||
/// / SSH key) and `DastAuthConfig`'s HTTP auth (form / bearer / cookie) into one
|
|
||||||
/// shape so a single artifact carries whatever it needs to be fetched or probed.
|
|
||||||
#[derive(Debug, Clone, Default, Serialize, Deserialize)]
|
|
||||||
pub struct ArtifactAuth {
|
|
||||||
/// Auth method: `none` | `token` | `basic` | `bearer` | `cookie` | `form` | `ssh`.
|
|
||||||
#[serde(default)]
|
|
||||||
pub method: String,
|
|
||||||
/// Username (git user, basic-auth user, or `x-access-token` for PATs).
|
|
||||||
pub username: Option<String>,
|
|
||||||
/// The secret credential: PAT, password, or bearer token. Encrypted at rest.
|
|
||||||
pub secret: Option<String>,
|
|
||||||
/// Path to an SSH private key for git-over-SSH.
|
|
||||||
pub ssh_key_path: Option<String>,
|
|
||||||
/// Login URL for form-based authentication.
|
|
||||||
pub login_url: Option<String>,
|
|
||||||
/// Extra headers to send when authenticating / probing.
|
|
||||||
pub headers: Option<HashMap<String, String>>,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl From<DastAuthConfig> for ArtifactAuth {
|
|
||||||
fn from(c: DastAuthConfig) -> Self {
|
|
||||||
Self {
|
|
||||||
method: c.method,
|
|
||||||
username: c.username,
|
|
||||||
// Prefer a bearer token; otherwise fall back to the password.
|
|
||||||
secret: c.token.or(c.password),
|
|
||||||
ssh_key_path: None,
|
|
||||||
login_url: c.login_url,
|
|
||||||
headers: c.headers,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Git-specific configuration for a [`ArtifactKind::GitRepo`] artifact.
|
|
||||||
#[derive(Debug, Clone, Serialize, Deserialize)]
|
|
||||||
pub struct GitArtifactConfig {
|
|
||||||
/// Branch to scan.
|
|
||||||
pub default_branch: String,
|
|
||||||
/// Commit SHA of the last completed scan (change-detection watermark).
|
|
||||||
pub last_scanned_commit: Option<String>,
|
|
||||||
/// Local clone path once the repo has been fetched.
|
|
||||||
pub local_path: Option<String>,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl GitArtifactConfig {
|
|
||||||
/// Config for a fresh git artifact on the given branch.
|
|
||||||
pub fn on_branch(branch: impl Into<String>) -> Self {
|
|
||||||
Self {
|
|
||||||
default_branch: branch.into(),
|
|
||||||
last_scanned_commit: None,
|
|
||||||
local_path: None,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
impl Default for GitArtifactConfig {
|
|
||||||
fn default() -> Self {
|
|
||||||
Self::on_branch("main")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Dynamic-analysis configuration for a [`ArtifactKind::LiveUrl`] artifact.
|
|
||||||
#[derive(Debug, Clone, Serialize, Deserialize)]
|
|
||||||
pub struct WebArtifactConfig {
|
|
||||||
/// Whether the endpoint is a web app, REST API, or GraphQL API.
|
|
||||||
pub target_kind: DastTargetType,
|
|
||||||
/// URL paths to exclude from crawling / scanning.
|
|
||||||
#[serde(default)]
|
|
||||||
pub excluded_paths: Vec<String>,
|
|
||||||
/// Maximum crawl depth.
|
|
||||||
pub max_crawl_depth: u32,
|
|
||||||
/// Rate limit in requests per second.
|
|
||||||
pub rate_limit: u32,
|
|
||||||
/// Whether destructive methods (DELETE / PUT) are permitted.
|
|
||||||
#[serde(default)]
|
|
||||||
pub allow_destructive: bool,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl Default for WebArtifactConfig {
|
|
||||||
fn default() -> Self {
|
|
||||||
Self {
|
|
||||||
target_kind: DastTargetType::WebApp,
|
|
||||||
excluded_paths: Vec::new(),
|
|
||||||
max_crawl_depth: 3,
|
|
||||||
rate_limit: 10,
|
|
||||||
allow_destructive: false,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// The source format of a PLC project artifact.
|
|
||||||
#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]
|
|
||||||
#[serde(rename_all = "snake_case")]
|
|
||||||
pub enum PlcFormat {
|
|
||||||
/// PLCopen XML project export.
|
|
||||||
PlcopenXml,
|
|
||||||
/// IEC 61131-3 Structured Text source.
|
|
||||||
StructuredText,
|
|
||||||
}
|
|
||||||
|
|
||||||
/// PLC-specific configuration for a [`ArtifactKind::PlcProject`] artifact.
|
|
||||||
#[derive(Debug, Clone, Serialize, Deserialize)]
|
|
||||||
pub struct PlcArtifactConfig {
|
|
||||||
/// The project source format.
|
|
||||||
pub format: PlcFormat,
|
|
||||||
}
|
|
||||||
|
|
||||||
/// A single fact discovered about a target by ingest or classification
|
|
||||||
/// (e.g. `language=rust`, `build_system=cmake`, `mcu=stm32f429`).
|
|
||||||
#[derive(Debug, Clone, Serialize, Deserialize)]
|
|
||||||
pub struct DetectedFact {
|
|
||||||
/// The fact name.
|
|
||||||
pub key: String,
|
|
||||||
/// The fact value.
|
|
||||||
pub value: String,
|
|
||||||
/// What produced the fact (e.g. `tramiton`, `language-fingerprint`).
|
|
||||||
pub source: String,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl DetectedFact {
|
|
||||||
/// Build a fact from its parts.
|
|
||||||
pub fn new(
|
|
||||||
key: impl Into<String>,
|
|
||||||
value: impl Into<String>,
|
|
||||||
source: impl Into<String>,
|
|
||||||
) -> Self {
|
|
||||||
Self {
|
|
||||||
key: key.into(),
|
|
||||||
value: value.into(),
|
|
||||||
source: source.into(),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// One concrete thing provided for a target: code, a binary, a URL, etc.
|
|
||||||
#[derive(Debug, Clone, Serialize, Deserialize)]
|
|
||||||
pub struct Artifact {
|
|
||||||
/// Stable per-artifact id (UUID v4) — scan steps reference this.
|
|
||||||
pub id: String,
|
|
||||||
/// What kind of artifact this is.
|
|
||||||
pub kind: ArtifactKind,
|
|
||||||
/// The source reference: git URL, blob id, live URL, or image ref.
|
|
||||||
pub source_ref: String,
|
|
||||||
/// Optional human-friendly label.
|
|
||||||
pub display_name: Option<String>,
|
|
||||||
/// Content-addressed storage path once ingested (blobs only).
|
|
||||||
pub stored_path: Option<String>,
|
|
||||||
/// SHA-256 of the ingested content (git artifacts store the head SHA).
|
|
||||||
pub content_hash: Option<String>,
|
|
||||||
/// Size of the stored blob in bytes.
|
|
||||||
pub size_bytes: Option<u64>,
|
|
||||||
/// Credentials for fetching or probing this artifact.
|
|
||||||
pub auth: Option<ArtifactAuth>,
|
|
||||||
/// Git configuration (present for [`ArtifactKind::GitRepo`]).
|
|
||||||
pub git: Option<GitArtifactConfig>,
|
|
||||||
/// Dynamic-analysis configuration (present for [`ArtifactKind::LiveUrl`]).
|
|
||||||
pub web: Option<WebArtifactConfig>,
|
|
||||||
/// PLC configuration (present for [`ArtifactKind::PlcProject`]).
|
|
||||||
pub plc: Option<PlcArtifactConfig>,
|
|
||||||
/// Facts discovered about this artifact by ingest / classification.
|
|
||||||
#[serde(default)]
|
|
||||||
pub detected: Vec<DetectedFact>,
|
|
||||||
/// When this artifact was last ingested.
|
|
||||||
#[serde(default, with = "super::serde_helpers::opt_bson_datetime")]
|
|
||||||
pub ingested_at: Option<DateTime<Utc>>,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl Artifact {
|
|
||||||
/// A bare artifact of the given kind and source reference.
|
|
||||||
fn bare(kind: ArtifactKind, source_ref: impl Into<String>) -> Self {
|
|
||||||
Self {
|
|
||||||
id: uuid::Uuid::new_v4().to_string(),
|
|
||||||
kind,
|
|
||||||
source_ref: source_ref.into(),
|
|
||||||
display_name: None,
|
|
||||||
stored_path: None,
|
|
||||||
content_hash: None,
|
|
||||||
size_bytes: None,
|
|
||||||
auth: None,
|
|
||||||
git: None,
|
|
||||||
web: None,
|
|
||||||
plc: None,
|
|
||||||
detected: Vec::new(),
|
|
||||||
ingested_at: None,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// A git-repository artifact tracking the given branch.
|
|
||||||
pub fn git_repo(url: impl Into<String>, branch: impl Into<String>) -> Self {
|
|
||||||
let mut a = Self::bare(ArtifactKind::GitRepo, url);
|
|
||||||
a.git = Some(GitArtifactConfig::on_branch(branch));
|
|
||||||
a
|
|
||||||
}
|
|
||||||
|
|
||||||
/// A live-URL artifact with default crawl settings.
|
|
||||||
pub fn live_url(url: impl Into<String>) -> Self {
|
|
||||||
let mut a = Self::bare(ArtifactKind::LiveUrl, url);
|
|
||||||
a.web = Some(WebArtifactConfig::default());
|
|
||||||
a
|
|
||||||
}
|
|
||||||
|
|
||||||
/// A firmware-image artifact referenced by name (blob ingested later).
|
|
||||||
pub fn firmware_image(source_ref: impl Into<String>) -> Self {
|
|
||||||
Self::bare(ArtifactKind::FirmwareImage, source_ref)
|
|
||||||
}
|
|
||||||
|
|
||||||
/// A source-archive artifact referenced by name (blob ingested later).
|
|
||||||
pub fn source_archive(source_ref: impl Into<String>) -> Self {
|
|
||||||
Self::bare(ArtifactKind::SourceArchive, source_ref)
|
|
||||||
}
|
|
||||||
|
|
||||||
/// A mobile-package artifact (APK/AAB/IPA) referenced by name.
|
|
||||||
pub fn mobile_package(source_ref: impl Into<String>) -> Self {
|
|
||||||
Self::bare(ArtifactKind::MobilePackage, source_ref)
|
|
||||||
}
|
|
||||||
|
|
||||||
/// A container-image artifact referenced by OCI ref.
|
|
||||||
pub fn container_image(source_ref: impl Into<String>) -> Self {
|
|
||||||
Self::bare(ArtifactKind::ContainerImage, source_ref)
|
|
||||||
}
|
|
||||||
|
|
||||||
/// A PLC-project artifact in the given format.
|
|
||||||
pub fn plc_project(source_ref: impl Into<String>, format: PlcFormat) -> Self {
|
|
||||||
let mut a = Self::bare(ArtifactKind::PlcProject, source_ref);
|
|
||||||
a.plc = Some(PlcArtifactConfig { format });
|
|
||||||
a
|
|
||||||
}
|
|
||||||
|
|
||||||
/// A plaintext-description artifact (classification input only).
|
|
||||||
pub fn plaintext(text: impl Into<String>) -> Self {
|
|
||||||
Self::bare(ArtifactKind::PlaintextDescription, text)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// One ranked candidate produced by the classifier.
|
|
||||||
#[derive(Debug, Clone, Serialize, Deserialize)]
|
|
||||||
pub struct TargetTypeCandidate {
|
|
||||||
/// The candidate target type.
|
|
||||||
pub target_type: TargetType,
|
|
||||||
/// Confidence in `[0.0, 1.0]`.
|
|
||||||
pub confidence: f32,
|
|
||||||
/// Why this candidate was proposed.
|
|
||||||
pub rationale: String,
|
|
||||||
}
|
|
||||||
|
|
||||||
/// The classifier's verdict for a target: a suggested type plus ranked
|
|
||||||
/// alternatives and the facts the decision rested on.
|
|
||||||
#[derive(Debug, Clone, Serialize, Deserialize)]
|
|
||||||
pub struct Classification {
|
|
||||||
/// The top-ranked target type.
|
|
||||||
pub suggested: TargetType,
|
|
||||||
/// All candidates, sorted by descending confidence.
|
|
||||||
#[serde(default)]
|
|
||||||
pub candidates: Vec<TargetTypeCandidate>,
|
|
||||||
/// Facts gathered during classification.
|
|
||||||
#[serde(default)]
|
|
||||||
pub facts: Vec<DetectedFact>,
|
|
||||||
/// Which classifiers contributed (e.g. `["tramiton", "language-fingerprint"]`).
|
|
||||||
#[serde(default)]
|
|
||||||
pub detected_by: Vec<String>,
|
|
||||||
/// When classification ran.
|
|
||||||
#[serde(with = "super::serde_helpers::bson_datetime")]
|
|
||||||
pub detected_at: DateTime<Utc>,
|
|
||||||
/// Whether a human confirmed the suggestion.
|
|
||||||
#[serde(default)]
|
|
||||||
pub confirmed: bool,
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Issue-tracker linkage, migrated from `TrackedRepository`'s `tracker_*` fields.
|
|
||||||
#[derive(Debug, Clone, Default, Serialize, Deserialize)]
|
|
||||||
pub struct IssueTrackerConfig {
|
|
||||||
/// The tracker platform.
|
|
||||||
pub tracker_type: Option<TrackerType>,
|
|
||||||
/// Tracker owner / organization.
|
|
||||||
pub owner: Option<String>,
|
|
||||||
/// Tracker repository / project.
|
|
||||||
pub repo: Option<String>,
|
|
||||||
/// Per-target tracker access token.
|
|
||||||
pub token: Option<String>,
|
|
||||||
}
|
|
||||||
|
|
||||||
/// How a target should be scanned.
|
|
||||||
///
|
|
||||||
/// `enabled_scans` / `disabled_scans` override the scan-applicability matrix
|
|
||||||
/// defaults; the pentest and tracker blocks reuse the existing wizard config.
|
|
||||||
#[derive(Debug, Clone, Default, Serialize, Deserialize)]
|
|
||||||
pub struct TargetScanConfig {
|
|
||||||
/// Scans explicitly turned on (empty means "use matrix defaults").
|
|
||||||
#[serde(default)]
|
|
||||||
pub enabled_scans: Vec<ScanType>,
|
|
||||||
/// Scans explicitly turned off.
|
|
||||||
#[serde(default)]
|
|
||||||
pub disabled_scans: Vec<ScanType>,
|
|
||||||
/// Target environment (gates destructive / active testing).
|
|
||||||
#[serde(default)]
|
|
||||||
pub environment: Environment,
|
|
||||||
/// Whether destructive tests are permitted for this target.
|
|
||||||
#[serde(default)]
|
|
||||||
pub allow_destructive: bool,
|
|
||||||
/// Pentest strategy selector.
|
|
||||||
pub strategy: Option<PentestStrategy>,
|
|
||||||
/// Full pentest wizard configuration.
|
|
||||||
pub pentest: Option<PentestConfig>,
|
|
||||||
/// Issue-tracker linkage.
|
|
||||||
pub issue_tracker: Option<IssueTrackerConfig>,
|
|
||||||
}
|
|
||||||
|
|
||||||
/// A sibling product in the company suite that may already hold authoritative
|
|
||||||
/// data for a target. compliance-scanner reconciles with these rather than
|
|
||||||
/// recomputing what they already know.
|
|
||||||
#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]
|
|
||||||
#[serde(rename_all = "snake_case")]
|
|
||||||
pub enum ExternalSystem {
|
|
||||||
/// Reproducible-build & firmware compliance engine (build plan, SBOM, VEX,
|
|
||||||
/// attestation).
|
|
||||||
Tramiton,
|
|
||||||
/// Code assistant (downstream remediation consumer).
|
|
||||||
Werkpilot,
|
|
||||||
/// Compliance-controls RAG (atomic controls derived from laws).
|
|
||||||
BreakpilotCompliance,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl std::fmt::Display for ExternalSystem {
|
|
||||||
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
|
|
||||||
match self {
|
|
||||||
Self::Tramiton => write!(f, "tramiton"),
|
|
||||||
Self::Werkpilot => write!(f, "werkpilot"),
|
|
||||||
Self::BreakpilotCompliance => write!(f, "breakpilot_compliance"),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// A link from this target to a record in a sibling product, used to reconcile
|
|
||||||
/// existing evidence instead of recomputing it.
|
|
||||||
///
|
|
||||||
/// For tramiton, `project_id` is the shared cross-product key and
|
|
||||||
/// `subject_sha256` matches a firmware artifact's [`Artifact::content_hash`]
|
|
||||||
/// (which equals tramiton's `Artifact.sha256`).
|
|
||||||
#[derive(Debug, Clone, Serialize, Deserialize)]
|
|
||||||
pub struct ExternalRef {
|
|
||||||
/// Which sibling product this reference points at.
|
|
||||||
pub system: ExternalSystem,
|
|
||||||
/// The sibling product's project identifier, if known.
|
|
||||||
pub project_id: Option<String>,
|
|
||||||
/// Content digest of the subject artifact (firmware sha256), if known.
|
|
||||||
pub subject_sha256: Option<String>,
|
|
||||||
/// Reconciliation status: `linked` | `reconciled` | `unavailable`.
|
|
||||||
#[serde(default)]
|
|
||||||
pub status: String,
|
|
||||||
/// Opaque, offline-verifiable entitlement grant (e.g. tramiton's signed
|
|
||||||
/// `LicenseGrant`), if the tenant provided one.
|
|
||||||
pub license_grant: Option<String>,
|
|
||||||
/// When evidence was last reconciled from this system.
|
|
||||||
#[serde(default, with = "super::serde_helpers::opt_bson_datetime")]
|
|
||||||
pub last_reconciled_at: Option<DateTime<Utc>>,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl ExternalRef {
|
|
||||||
/// A freshly linked (not yet reconciled) reference to a sibling system.
|
|
||||||
pub fn linked(system: ExternalSystem) -> Self {
|
|
||||||
Self {
|
|
||||||
system,
|
|
||||||
project_id: None,
|
|
||||||
subject_sha256: None,
|
|
||||||
status: "linked".to_string(),
|
|
||||||
license_grant: None,
|
|
||||||
last_reconciled_at: None,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// A regulatory / standards framework a target must comply with. Drives which
|
|
||||||
/// controls the mapping engine pulls from the [`crate::traits::ControlsProvider`].
|
|
||||||
#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]
|
|
||||||
#[serde(rename_all = "snake_case")]
|
|
||||||
pub enum ComplianceFramework {
|
|
||||||
/// EU Cyber Resilience Act.
|
|
||||||
Cra,
|
|
||||||
/// IEC 62443 (industrial automation & control systems security).
|
|
||||||
Iec62443,
|
|
||||||
/// EU General Data Protection Regulation.
|
|
||||||
Gdpr,
|
|
||||||
/// SOC 2.
|
|
||||||
Soc2,
|
|
||||||
/// ISO/IEC 27001.
|
|
||||||
Iso27001,
|
|
||||||
/// EU Radio Equipment Directive (RED) cybersecurity articles.
|
|
||||||
RedDirective,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl std::fmt::Display for ComplianceFramework {
|
|
||||||
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
|
|
||||||
match self {
|
|
||||||
Self::Cra => write!(f, "cra"),
|
|
||||||
Self::Iec62443 => write!(f, "iec_62443"),
|
|
||||||
Self::Gdpr => write!(f, "gdpr"),
|
|
||||||
Self::Soc2 => write!(f, "soc2"),
|
|
||||||
Self::Iso27001 => write!(f, "iso_27001"),
|
|
||||||
Self::RedDirective => write!(f, "red_directive"),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// The compliance scope of a target: which frameworks apply and, optionally, the
|
|
||||||
/// jurisdiction. Captured at onboarding (with per-target-type defaults from
|
|
||||||
/// [`default_compliance_profile`]).
|
|
||||||
#[derive(Debug, Clone, Default, Serialize, Deserialize)]
|
|
||||||
pub struct ComplianceProfile {
|
|
||||||
/// Applicable frameworks.
|
|
||||||
#[serde(default)]
|
|
||||||
pub frameworks: Vec<ComplianceFramework>,
|
|
||||||
/// Free-form jurisdiction (e.g. `eu`, `us`, `de`).
|
|
||||||
pub jurisdiction: Option<String>,
|
|
||||||
}
|
|
||||||
|
|
||||||
/// The sensible default compliance scope for a target type. Firmware / PLC /
|
|
||||||
/// embedded default to CRA + IEC 62443; software defaults to GDPR + SOC 2.
|
|
||||||
pub fn default_compliance_profile(target_type: TargetType) -> ComplianceProfile {
|
|
||||||
use ComplianceFramework::{Cra, Gdpr, Iec62443, Soc2};
|
|
||||||
let frameworks = match target_type {
|
|
||||||
TargetType::PlcSps
|
|
||||||
| TargetType::FirmwareBareMetal
|
|
||||||
| TargetType::FirmwareRtos
|
|
||||||
| TargetType::EmbeddedLinuxYocto => vec![Cra, Iec62443],
|
|
||||||
TargetType::WebApp | TargetType::BackendService => vec![Gdpr, Soc2],
|
|
||||||
TargetType::DesktopApp | TargetType::AndroidApp | TargetType::IosApp => {
|
|
||||||
vec![Gdpr, Cra]
|
|
||||||
}
|
|
||||||
};
|
|
||||||
ComplianceProfile {
|
|
||||||
frameworks,
|
|
||||||
jurisdiction: None,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// A target onboarded for scanning: the unified replacement for the legacy
|
|
||||||
/// `TrackedRepository` (SAST) and `DastTarget` (DAST) records.
|
|
||||||
#[derive(Debug, Clone, Serialize, Deserialize)]
|
|
||||||
pub struct OnboardedTarget {
|
|
||||||
/// Mongo id. Preserved from the legacy record during migration so every
|
|
||||||
/// downstream collection keyed by `repo_id` / `target_id` keeps resolving.
|
|
||||||
#[serde(rename = "_id", skip_serializing_if = "Option::is_none")]
|
|
||||||
pub id: Option<bson::oid::ObjectId>,
|
|
||||||
/// Human-friendly name.
|
|
||||||
#[serde(default)]
|
|
||||||
pub name: String,
|
|
||||||
/// The software family this target belongs to.
|
|
||||||
pub target_type: TargetType,
|
|
||||||
/// Optional free-form description (also a classification input).
|
|
||||||
pub description: Option<String>,
|
|
||||||
/// The artifacts provided for this target.
|
|
||||||
#[serde(default)]
|
|
||||||
pub artifacts: Vec<Artifact>,
|
|
||||||
/// The classifier's verdict, once run.
|
|
||||||
pub classification: Option<Classification>,
|
|
||||||
/// How this target should be scanned.
|
|
||||||
#[serde(default)]
|
|
||||||
pub scan_config: TargetScanConfig,
|
|
||||||
/// The compliance scope (applicable frameworks / jurisdiction).
|
|
||||||
#[serde(default)]
|
|
||||||
pub compliance_profile: ComplianceProfile,
|
|
||||||
/// Links to sibling products (tramiton, ...) holding reconcilable evidence.
|
|
||||||
#[serde(default)]
|
|
||||||
pub external_refs: Vec<ExternalRef>,
|
|
||||||
/// Cron schedule for recurring scans, if any.
|
|
||||||
pub scan_schedule: Option<String>,
|
|
||||||
/// Whether inbound webhooks are enabled for this target.
|
|
||||||
#[serde(default)]
|
|
||||||
pub webhook_enabled: bool,
|
|
||||||
/// HMAC secret for verifying inbound webhooks.
|
|
||||||
#[serde(default, skip_serializing_if = "Option::is_none")]
|
|
||||||
pub webhook_secret: Option<String>,
|
|
||||||
/// Cached count of findings across this target's scans.
|
|
||||||
#[serde(default)]
|
|
||||||
pub findings_count: u32,
|
|
||||||
/// Creation timestamp.
|
|
||||||
#[serde(
|
|
||||||
default = "chrono::Utc::now",
|
|
||||||
with = "super::serde_helpers::bson_datetime"
|
|
||||||
)]
|
|
||||||
pub created_at: DateTime<Utc>,
|
|
||||||
/// Last-update timestamp.
|
|
||||||
#[serde(
|
|
||||||
default = "chrono::Utc::now",
|
|
||||||
with = "super::serde_helpers::bson_datetime"
|
|
||||||
)]
|
|
||||||
pub updated_at: DateTime<Utc>,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl OnboardedTarget {
|
|
||||||
/// A new target of the given type with a freshly generated webhook secret.
|
|
||||||
pub fn new(name: String, target_type: TargetType) -> Self {
|
|
||||||
let now = Utc::now();
|
|
||||||
let webhook_secret = uuid::Uuid::new_v4().to_string().replace('-', "");
|
|
||||||
Self {
|
|
||||||
id: None,
|
|
||||||
name,
|
|
||||||
target_type,
|
|
||||||
description: None,
|
|
||||||
artifacts: Vec::new(),
|
|
||||||
classification: None,
|
|
||||||
scan_config: TargetScanConfig::default(),
|
|
||||||
compliance_profile: default_compliance_profile(target_type),
|
|
||||||
external_refs: Vec::new(),
|
|
||||||
scan_schedule: None,
|
|
||||||
webhook_enabled: false,
|
|
||||||
webhook_secret: Some(webhook_secret),
|
|
||||||
findings_count: 0,
|
|
||||||
created_at: now,
|
|
||||||
updated_at: now,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// The first artifact of the given kind, if present.
|
|
||||||
pub fn first_of(&self, kind: ArtifactKind) -> Option<&Artifact> {
|
|
||||||
self.artifacts.iter().find(|a| a.kind == kind)
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Whether the target has at least one artifact of the given kind.
|
|
||||||
pub fn has(&self, kind: ArtifactKind) -> bool {
|
|
||||||
self.artifacts.iter().any(|a| a.kind == kind)
|
|
||||||
}
|
|
||||||
|
|
||||||
/// The primary code artifact (git repo or source archive), if any.
|
|
||||||
pub fn code_artifact(&self) -> Option<&Artifact> {
|
|
||||||
self.artifacts
|
|
||||||
.iter()
|
|
||||||
.find(|a| matches!(a.kind, ArtifactKind::GitRepo | ArtifactKind::SourceArchive))
|
|
||||||
}
|
|
||||||
|
|
||||||
/// The live-URL artifact, if any.
|
|
||||||
pub fn live_url(&self) -> Option<&Artifact> {
|
|
||||||
self.first_of(ArtifactKind::LiveUrl)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[cfg(test)]
|
|
||||||
#[allow(clippy::expect_used, clippy::unwrap_used)]
|
|
||||||
mod tests {
|
|
||||||
use super::*;
|
|
||||||
|
|
||||||
fn sample_target() -> OnboardedTarget {
|
|
||||||
let mut t = OnboardedTarget::new("acme-web".to_string(), TargetType::WebApp);
|
|
||||||
t.artifacts.push(Artifact::git_repo(
|
|
||||||
"https://git.example.com/acme.git",
|
|
||||||
"main",
|
|
||||||
));
|
|
||||||
t.artifacts
|
|
||||||
.push(Artifact::live_url("https://acme.example.com"));
|
|
||||||
t
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn onboarded_target_bson_round_trip() {
|
|
||||||
let t = sample_target();
|
|
||||||
let b = bson::to_bson(&t).expect("serialize");
|
|
||||||
let back: OnboardedTarget = bson::from_bson(b.clone()).expect("deserialize");
|
|
||||||
let b2 = bson::to_bson(&back).expect("re-serialize");
|
|
||||||
assert_eq!(b, b2);
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn enum_display_is_snake_case() {
|
|
||||||
assert_eq!(
|
|
||||||
TargetType::FirmwareBareMetal.to_string(),
|
|
||||||
"firmware_bare_metal"
|
|
||||||
);
|
|
||||||
assert_eq!(TargetType::PlcSps.to_string(), "plc_sps");
|
|
||||||
assert_eq!(ArtifactKind::PlcProject.to_string(), "plc_project");
|
|
||||||
assert_eq!(ArtifactKind::MobilePackage.to_string(), "mobile_package");
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn helpers_locate_artifacts() {
|
|
||||||
let t = sample_target();
|
|
||||||
assert!(t.has(ArtifactKind::GitRepo));
|
|
||||||
assert!(t.live_url().is_some());
|
|
||||||
assert!(t.code_artifact().is_some());
|
|
||||||
assert!(!t.has(ArtifactKind::FirmwareImage));
|
|
||||||
assert_eq!(
|
|
||||||
t.first_of(ArtifactKind::GitRepo).map(|a| a.kind),
|
|
||||||
Some(ArtifactKind::GitRepo)
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn new_target_generates_webhook_secret() {
|
|
||||||
let t = OnboardedTarget::new("t".to_string(), TargetType::BackendService);
|
|
||||||
let secret = t.webhook_secret.expect("secret present");
|
|
||||||
assert_eq!(secret.len(), 32);
|
|
||||||
assert!(!secret.contains('-'));
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn dast_auth_folds_into_artifact_auth() {
|
|
||||||
let dast = DastAuthConfig {
|
|
||||||
method: "bearer".to_string(),
|
|
||||||
login_url: Some("https://x/login".to_string()),
|
|
||||||
username: Some("user".to_string()),
|
|
||||||
password: Some("pw".to_string()),
|
|
||||||
token: Some("tok".to_string()),
|
|
||||||
headers: None,
|
|
||||||
};
|
|
||||||
let auth = ArtifactAuth::from(dast);
|
|
||||||
assert_eq!(auth.method, "bearer");
|
|
||||||
// Bearer token wins over password.
|
|
||||||
assert_eq!(auth.secret.as_deref(), Some("tok"));
|
|
||||||
assert_eq!(auth.login_url.as_deref(), Some("https://x/login"));
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn each_artifact_gets_a_unique_id() {
|
|
||||||
let a = Artifact::firmware_image("fw.bin");
|
|
||||||
let b = Artifact::firmware_image("fw.bin");
|
|
||||||
assert_ne!(a.id, b.id);
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn firmware_default_profile_is_cra_and_62443() {
|
|
||||||
let p = default_compliance_profile(TargetType::FirmwareBareMetal);
|
|
||||||
assert!(p.frameworks.contains(&ComplianceFramework::Cra));
|
|
||||||
assert!(p.frameworks.contains(&ComplianceFramework::Iec62443));
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn webapp_default_profile_is_gdpr_and_soc2() {
|
|
||||||
let p = default_compliance_profile(TargetType::WebApp);
|
|
||||||
assert!(p.frameworks.contains(&ComplianceFramework::Gdpr));
|
|
||||||
assert!(p.frameworks.contains(&ComplianceFramework::Soc2));
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn new_target_gets_default_profile_and_no_external_refs() {
|
|
||||||
let t = OnboardedTarget::new("fw".to_string(), TargetType::FirmwareRtos);
|
|
||||||
assert!(!t.compliance_profile.frameworks.is_empty());
|
|
||||||
assert!(t.external_refs.is_empty());
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn external_ref_linked_defaults() {
|
|
||||||
let r = ExternalRef::linked(ExternalSystem::Tramiton);
|
|
||||||
assert_eq!(r.system, ExternalSystem::Tramiton);
|
|
||||||
assert_eq!(r.status, "linked");
|
|
||||||
assert!(r.project_id.is_none());
|
|
||||||
assert!(r.last_reconciled_at.is_none());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -3,7 +3,7 @@ use serde::{Deserialize, Serialize};
|
|||||||
|
|
||||||
use super::repository::ScanTrigger;
|
use super::repository::ScanTrigger;
|
||||||
|
|
||||||
#[derive(Debug, Clone, Copy, Serialize, Deserialize, PartialEq, Eq)]
|
#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
|
||||||
#[serde(rename_all = "lowercase")]
|
#[serde(rename_all = "lowercase")]
|
||||||
pub enum ScanType {
|
pub enum ScanType {
|
||||||
Sast,
|
Sast,
|
||||||
@@ -16,14 +16,6 @@ pub enum ScanType {
|
|||||||
SecretDetection,
|
SecretDetection,
|
||||||
Lint,
|
Lint,
|
||||||
CodeReview,
|
CodeReview,
|
||||||
/// Static analysis of a firmware image (unpack + component CVE).
|
|
||||||
FirmwareStatic,
|
|
||||||
/// Control-logic security analysis of PLC / SPS programs.
|
|
||||||
PlcControlLogic,
|
|
||||||
/// Static analysis of a mobile package (APK / AAB / IPA).
|
|
||||||
MobileStatic,
|
|
||||||
/// Static analysis of a container image.
|
|
||||||
ContainerScan,
|
|
||||||
}
|
}
|
||||||
|
|
||||||
impl std::fmt::Display for ScanType {
|
impl std::fmt::Display for ScanType {
|
||||||
@@ -39,10 +31,6 @@ impl std::fmt::Display for ScanType {
|
|||||||
Self::SecretDetection => write!(f, "secret_detection"),
|
Self::SecretDetection => write!(f, "secret_detection"),
|
||||||
Self::Lint => write!(f, "lint"),
|
Self::Lint => write!(f, "lint"),
|
||||||
Self::CodeReview => write!(f, "code_review"),
|
Self::CodeReview => write!(f, "code_review"),
|
||||||
Self::FirmwareStatic => write!(f, "firmware_static"),
|
|
||||||
Self::PlcControlLogic => write!(f, "plc_control_logic"),
|
|
||||||
Self::MobileStatic => write!(f, "mobile_static"),
|
|
||||||
Self::ContainerScan => write!(f, "container_scan"),
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -59,8 +47,6 @@ pub enum ScanRunStatus {
|
|||||||
#[serde(rename_all = "snake_case")]
|
#[serde(rename_all = "snake_case")]
|
||||||
pub enum ScanPhase {
|
pub enum ScanPhase {
|
||||||
ChangeDetection,
|
ChangeDetection,
|
||||||
ArtifactIngest,
|
|
||||||
Classification,
|
|
||||||
Sast,
|
Sast,
|
||||||
SbomGeneration,
|
SbomGeneration,
|
||||||
CveScanning,
|
CveScanning,
|
||||||
@@ -69,10 +55,6 @@ pub enum ScanPhase {
|
|||||||
LintScanning,
|
LintScanning,
|
||||||
CodeReview,
|
CodeReview,
|
||||||
GraphBuilding,
|
GraphBuilding,
|
||||||
FirmwareStatic,
|
|
||||||
PlcAnalysis,
|
|
||||||
MobileStatic,
|
|
||||||
ContainerScan,
|
|
||||||
LlmTriage,
|
LlmTriage,
|
||||||
IssueCreation,
|
IssueCreation,
|
||||||
DastScanning,
|
DastScanning,
|
||||||
|
|||||||
@@ -1,379 +0,0 @@
|
|||||||
//! The scan-applicability matrix.
|
|
||||||
//!
|
|
||||||
//! Which scans are possible for a target is a function of its [`TargetType`] and
|
|
||||||
//! which [`ArtifactKind`]s are actually present: SAST needs code, DAST needs a
|
|
||||||
//! running URL, firmware-static analysis needs a firmware image, and so on. This
|
|
||||||
//! module encodes that as a table — one rule set per target type — and resolves
|
|
||||||
//! it against a concrete [`OnboardedTarget`] into a list of [`ScanOption`]s the
|
|
||||||
//! onboarding wizard and the scan pipeline both consume.
|
|
||||||
|
|
||||||
use crate::models::{ArtifactKind, OnboardedTarget, ScanType, TargetType};
|
|
||||||
|
|
||||||
/// What an artifact a scan needs in order to run.
|
|
||||||
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
|
|
||||||
pub enum ArtifactRequirement {
|
|
||||||
/// Source code — a git repo or a source archive.
|
|
||||||
Code,
|
|
||||||
/// A reachable running instance (live URL / endpoint).
|
|
||||||
RunningUrl,
|
|
||||||
/// A firmware image / binary blob.
|
|
||||||
Firmware,
|
|
||||||
/// A PLC project (PLCopen XML or Structured Text).
|
|
||||||
Plc,
|
|
||||||
/// A mobile package (APK / AAB / IPA).
|
|
||||||
Mobile,
|
|
||||||
/// A container image.
|
|
||||||
Container,
|
|
||||||
/// No specific artifact required.
|
|
||||||
Any,
|
|
||||||
}
|
|
||||||
|
|
||||||
/// A static rule: this scan applies to a target type, needs this artifact, and
|
|
||||||
/// defaults on/off. The rationale explains the entry to the user.
|
|
||||||
#[derive(Debug, Clone, Copy)]
|
|
||||||
pub struct ScanRule {
|
|
||||||
/// The scan this rule governs.
|
|
||||||
pub scan: ScanType,
|
|
||||||
/// Whether the scan is on by default (only when its artifact is present).
|
|
||||||
pub default_on: bool,
|
|
||||||
/// Human-readable explanation of what the scan does here.
|
|
||||||
pub rationale: &'static str,
|
|
||||||
/// The artifact the scan consumes.
|
|
||||||
pub requires: ArtifactRequirement,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl ScanRule {
|
|
||||||
const fn new(
|
|
||||||
scan: ScanType,
|
|
||||||
default_on: bool,
|
|
||||||
rationale: &'static str,
|
|
||||||
requires: ArtifactRequirement,
|
|
||||||
) -> Self {
|
|
||||||
Self {
|
|
||||||
scan,
|
|
||||||
default_on,
|
|
||||||
rationale,
|
|
||||||
requires,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// A resolved scan choice for a specific target: a rule intersected with the
|
|
||||||
/// artifacts actually present. `blocked_reason` is `Some` when the required
|
|
||||||
/// artifact is missing.
|
|
||||||
#[derive(Debug, Clone)]
|
|
||||||
pub struct ScanOption {
|
|
||||||
/// The scan.
|
|
||||||
pub scan: ScanType,
|
|
||||||
/// Whether to pre-select the scan (false when blocked).
|
|
||||||
pub default_on: bool,
|
|
||||||
/// Why the scan is offered.
|
|
||||||
pub rationale: String,
|
|
||||||
/// The artifact kind the scan needs, if any specific one.
|
|
||||||
pub required_artifact: Option<ArtifactKind>,
|
|
||||||
/// Set when the required artifact is absent, explaining the block.
|
|
||||||
pub blocked_reason: Option<String>,
|
|
||||||
}
|
|
||||||
|
|
||||||
/// The SAST umbrella: every static-analysis sub-scan that runs over source code.
|
|
||||||
fn sast_umbrella() -> Vec<ScanRule> {
|
|
||||||
use ArtifactRequirement::Code;
|
|
||||||
vec![
|
|
||||||
ScanRule::new(
|
|
||||||
ScanType::Sast,
|
|
||||||
true,
|
|
||||||
"Static analysis (Semgrep) over source",
|
|
||||||
Code,
|
|
||||||
),
|
|
||||||
ScanRule::new(
|
|
||||||
ScanType::Sbom,
|
|
||||||
true,
|
|
||||||
"Software bill of materials from source",
|
|
||||||
Code,
|
|
||||||
),
|
|
||||||
ScanRule::new(
|
|
||||||
ScanType::Cve,
|
|
||||||
true,
|
|
||||||
"Match dependencies against known CVEs",
|
|
||||||
Code,
|
|
||||||
),
|
|
||||||
ScanRule::new(
|
|
||||||
ScanType::SecretDetection,
|
|
||||||
true,
|
|
||||||
"Scan source for committed secrets",
|
|
||||||
Code,
|
|
||||||
),
|
|
||||||
ScanRule::new(ScanType::Lint, true, "Language linters over source", Code),
|
|
||||||
ScanRule::new(
|
|
||||||
ScanType::Gdpr,
|
|
||||||
true,
|
|
||||||
"GDPR data-handling pattern checks",
|
|
||||||
Code,
|
|
||||||
),
|
|
||||||
ScanRule::new(
|
|
||||||
ScanType::OAuth,
|
|
||||||
true,
|
|
||||||
"OAuth misconfiguration patterns",
|
|
||||||
Code,
|
|
||||||
),
|
|
||||||
ScanRule::new(
|
|
||||||
ScanType::Graph,
|
|
||||||
true,
|
|
||||||
"Build the code graph for impact analysis",
|
|
||||||
Code,
|
|
||||||
),
|
|
||||||
ScanRule::new(
|
|
||||||
ScanType::CodeReview,
|
|
||||||
false,
|
|
||||||
"LLM code review over changed source",
|
|
||||||
Code,
|
|
||||||
),
|
|
||||||
]
|
|
||||||
}
|
|
||||||
|
|
||||||
/// The rule set for a target type. Scans that are never applicable to a type are
|
|
||||||
/// simply absent (e.g. DAST is not listed for a PLC target).
|
|
||||||
pub fn rules_for(target_type: TargetType) -> Vec<ScanRule> {
|
|
||||||
use ArtifactRequirement::{Firmware, Mobile, Plc, RunningUrl};
|
|
||||||
match target_type {
|
|
||||||
TargetType::WebApp | TargetType::BackendService => {
|
|
||||||
let mut r = sast_umbrella();
|
|
||||||
r.push(ScanRule::new(
|
|
||||||
ScanType::Dast,
|
|
||||||
true,
|
|
||||||
"Dynamic scan of the running endpoint",
|
|
||||||
RunningUrl,
|
|
||||||
));
|
|
||||||
r
|
|
||||||
}
|
|
||||||
TargetType::DesktopApp => sast_umbrella(),
|
|
||||||
TargetType::AndroidApp | TargetType::IosApp => {
|
|
||||||
let mut r = sast_umbrella();
|
|
||||||
r.push(ScanRule::new(
|
|
||||||
ScanType::MobileStatic,
|
|
||||||
true,
|
|
||||||
"Static analysis of the mobile package (manifest, permissions, libs)",
|
|
||||||
Mobile,
|
|
||||||
));
|
|
||||||
r
|
|
||||||
}
|
|
||||||
TargetType::FirmwareBareMetal | TargetType::FirmwareRtos => {
|
|
||||||
let mut r = sast_umbrella();
|
|
||||||
r.push(ScanRule::new(
|
|
||||||
ScanType::FirmwareStatic,
|
|
||||||
true,
|
|
||||||
"Unpack and statically analyze the firmware image",
|
|
||||||
Firmware,
|
|
||||||
));
|
|
||||||
r.push(ScanRule::new(
|
|
||||||
ScanType::Sbom,
|
|
||||||
true,
|
|
||||||
"SBOM from the firmware image (binwalk / tramiton)",
|
|
||||||
Firmware,
|
|
||||||
));
|
|
||||||
r.push(ScanRule::new(
|
|
||||||
ScanType::Cve,
|
|
||||||
true,
|
|
||||||
"Match firmware components against known CVEs",
|
|
||||||
Firmware,
|
|
||||||
));
|
|
||||||
r
|
|
||||||
}
|
|
||||||
TargetType::EmbeddedLinuxYocto => {
|
|
||||||
let mut r = sast_umbrella();
|
|
||||||
r.push(ScanRule::new(
|
|
||||||
ScanType::FirmwareStatic,
|
|
||||||
true,
|
|
||||||
"EMBA / binwalk static analysis of the image",
|
|
||||||
Firmware,
|
|
||||||
));
|
|
||||||
r.push(ScanRule::new(
|
|
||||||
ScanType::Sbom,
|
|
||||||
true,
|
|
||||||
"SBOM from image layers / recipes",
|
|
||||||
Firmware,
|
|
||||||
));
|
|
||||||
r.push(ScanRule::new(
|
|
||||||
ScanType::Cve,
|
|
||||||
true,
|
|
||||||
"Match image components against known CVEs",
|
|
||||||
Firmware,
|
|
||||||
));
|
|
||||||
r.push(ScanRule::new(
|
|
||||||
ScanType::Dast,
|
|
||||||
false,
|
|
||||||
"Dynamic scan of exposed network services (if any)",
|
|
||||||
RunningUrl,
|
|
||||||
));
|
|
||||||
r
|
|
||||||
}
|
|
||||||
TargetType::PlcSps => vec![ScanRule::new(
|
|
||||||
ScanType::PlcControlLogic,
|
|
||||||
true,
|
|
||||||
"Control-logic security rules over the PLC program",
|
|
||||||
Plc,
|
|
||||||
)],
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Whether an active penetration test is applicable to this target type.
|
|
||||||
///
|
|
||||||
/// Pentest runs as its own session (not a [`ScanType`] scan) and needs a
|
|
||||||
/// reachable running target, so it is offered only for the network-reachable
|
|
||||||
/// families.
|
|
||||||
pub fn supports_pentest(target_type: TargetType) -> bool {
|
|
||||||
matches!(
|
|
||||||
target_type,
|
|
||||||
TargetType::WebApp
|
|
||||||
| TargetType::BackendService
|
|
||||||
| TargetType::AndroidApp
|
|
||||||
| TargetType::IosApp
|
|
||||||
| TargetType::EmbeddedLinuxYocto
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
/// The representative artifact kind a requirement is satisfied by.
|
|
||||||
fn representative_kind(req: ArtifactRequirement) -> Option<ArtifactKind> {
|
|
||||||
match req {
|
|
||||||
ArtifactRequirement::Code => Some(ArtifactKind::GitRepo),
|
|
||||||
ArtifactRequirement::RunningUrl => Some(ArtifactKind::LiveUrl),
|
|
||||||
ArtifactRequirement::Firmware => Some(ArtifactKind::FirmwareImage),
|
|
||||||
ArtifactRequirement::Plc => Some(ArtifactKind::PlcProject),
|
|
||||||
ArtifactRequirement::Mobile => Some(ArtifactKind::MobilePackage),
|
|
||||||
ArtifactRequirement::Container => Some(ArtifactKind::ContainerImage),
|
|
||||||
ArtifactRequirement::Any => None,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Whether the target carries an artifact that satisfies the requirement.
|
|
||||||
fn requirement_satisfied(req: ArtifactRequirement, target: &OnboardedTarget) -> bool {
|
|
||||||
match req {
|
|
||||||
ArtifactRequirement::Code => target.code_artifact().is_some(),
|
|
||||||
ArtifactRequirement::RunningUrl => target.has(ArtifactKind::LiveUrl),
|
|
||||||
ArtifactRequirement::Firmware => target.has(ArtifactKind::FirmwareImage),
|
|
||||||
ArtifactRequirement::Plc => target.has(ArtifactKind::PlcProject),
|
|
||||||
ArtifactRequirement::Mobile => target.has(ArtifactKind::MobilePackage),
|
|
||||||
ArtifactRequirement::Container => target.has(ArtifactKind::ContainerImage),
|
|
||||||
ArtifactRequirement::Any => true,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Resolve the matrix for a concrete target into the scans it can run, marking
|
|
||||||
/// any whose required artifact is missing as blocked.
|
|
||||||
pub fn applicable_scans(target: &OnboardedTarget) -> Vec<ScanOption> {
|
|
||||||
rules_for(target.target_type)
|
|
||||||
.into_iter()
|
|
||||||
.map(|rule| {
|
|
||||||
let satisfied = requirement_satisfied(rule.requires, target);
|
|
||||||
let required_artifact = representative_kind(rule.requires);
|
|
||||||
let blocked_reason = if satisfied {
|
|
||||||
None
|
|
||||||
} else {
|
|
||||||
Some(match required_artifact {
|
|
||||||
Some(kind) => format!("no {kind} artifact provided"),
|
|
||||||
None => "required artifact missing".to_string(),
|
|
||||||
})
|
|
||||||
};
|
|
||||||
ScanOption {
|
|
||||||
scan: rule.scan,
|
|
||||||
default_on: rule.default_on && satisfied,
|
|
||||||
rationale: rule.rationale.to_string(),
|
|
||||||
required_artifact,
|
|
||||||
blocked_reason,
|
|
||||||
}
|
|
||||||
})
|
|
||||||
.collect()
|
|
||||||
}
|
|
||||||
|
|
||||||
#[cfg(test)]
|
|
||||||
#[allow(clippy::expect_used, clippy::unwrap_used)]
|
|
||||||
mod tests {
|
|
||||||
use super::*;
|
|
||||||
use crate::models::{Artifact, PlcFormat};
|
|
||||||
|
|
||||||
fn target_with(target_type: TargetType, artifacts: Vec<Artifact>) -> OnboardedTarget {
|
|
||||||
let mut t = OnboardedTarget::new("t".to_string(), target_type);
|
|
||||||
t.artifacts = artifacts;
|
|
||||||
t
|
|
||||||
}
|
|
||||||
|
|
||||||
fn option<'a>(opts: &'a [ScanOption], scan: ScanType) -> Option<&'a ScanOption> {
|
|
||||||
opts.iter().find(|o| o.scan == scan)
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn webapp_with_code_and_url_offers_sast_and_dast() {
|
|
||||||
let t = target_with(
|
|
||||||
TargetType::WebApp,
|
|
||||||
vec![
|
|
||||||
Artifact::git_repo("u", "main"),
|
|
||||||
Artifact::live_url("http://x"),
|
|
||||||
],
|
|
||||||
);
|
|
||||||
let opts = applicable_scans(&t);
|
|
||||||
let sast = option(&opts, ScanType::Sast).expect("sast offered");
|
|
||||||
assert!(sast.default_on && sast.blocked_reason.is_none());
|
|
||||||
let dast = option(&opts, ScanType::Dast).expect("dast offered");
|
|
||||||
assert!(dast.default_on && dast.blocked_reason.is_none());
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn webapp_without_url_blocks_dast() {
|
|
||||||
let t = target_with(TargetType::WebApp, vec![Artifact::git_repo("u", "main")]);
|
|
||||||
let opts = applicable_scans(&t);
|
|
||||||
let dast = option(&opts, ScanType::Dast).expect("dast listed");
|
|
||||||
assert!(!dast.default_on);
|
|
||||||
assert!(dast.blocked_reason.is_some());
|
|
||||||
assert_eq!(dast.required_artifact, Some(ArtifactKind::LiveUrl));
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn firmware_offers_firmware_static_and_not_dast() {
|
|
||||||
let t = target_with(
|
|
||||||
TargetType::FirmwareBareMetal,
|
|
||||||
vec![Artifact::firmware_image("fw.bin")],
|
|
||||||
);
|
|
||||||
let opts = applicable_scans(&t);
|
|
||||||
let fw = option(&opts, ScanType::FirmwareStatic).expect("firmware static offered");
|
|
||||||
assert!(fw.default_on && fw.blocked_reason.is_none());
|
|
||||||
assert!(option(&opts, ScanType::Dast).is_none());
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn plc_offers_only_control_logic() {
|
|
||||||
let t = target_with(
|
|
||||||
TargetType::PlcSps,
|
|
||||||
vec![Artifact::plc_project("p.xml", PlcFormat::PlcopenXml)],
|
|
||||||
);
|
|
||||||
let opts = applicable_scans(&t);
|
|
||||||
assert_eq!(opts.len(), 1);
|
|
||||||
assert_eq!(opts[0].scan, ScanType::PlcControlLogic);
|
|
||||||
assert!(opts[0].default_on);
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn pentest_support_matches_reachable_families() {
|
|
||||||
assert!(supports_pentest(TargetType::WebApp));
|
|
||||||
assert!(supports_pentest(TargetType::BackendService));
|
|
||||||
assert!(!supports_pentest(TargetType::PlcSps));
|
|
||||||
assert!(!supports_pentest(TargetType::FirmwareBareMetal));
|
|
||||||
assert!(!supports_pentest(TargetType::DesktopApp));
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn every_target_type_has_at_least_one_rule() {
|
|
||||||
for tt in [
|
|
||||||
TargetType::WebApp,
|
|
||||||
TargetType::BackendService,
|
|
||||||
TargetType::DesktopApp,
|
|
||||||
TargetType::AndroidApp,
|
|
||||||
TargetType::IosApp,
|
|
||||||
TargetType::FirmwareBareMetal,
|
|
||||||
TargetType::FirmwareRtos,
|
|
||||||
TargetType::EmbeddedLinuxYocto,
|
|
||||||
TargetType::PlcSps,
|
|
||||||
] {
|
|
||||||
assert!(!rules_for(tt).is_empty(), "{tt} has no rules");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,51 +0,0 @@
|
|||||||
//! The target-classification port.
|
|
||||||
//!
|
|
||||||
//! A [`TargetClassifier`] inspects a target's artifacts (and optionally their
|
|
||||||
//! ingested working directories) and proposes one or more [`ClassifierVerdict`]s
|
|
||||||
//! — a target type, a confidence, and the facts the decision rested on. Concrete
|
|
||||||
//! classifiers live in the agent (language/build-system fingerprinting, a
|
|
||||||
//! firmware detector backed by tramiton, etc.); a registry merges and ranks
|
|
||||||
//! their verdicts. This mirrors the [`crate::traits::Scanner`] port so the two
|
|
||||||
//! read the same way.
|
|
||||||
|
|
||||||
use std::collections::HashMap;
|
|
||||||
use std::path::PathBuf;
|
|
||||||
|
|
||||||
use crate::error::CoreError;
|
|
||||||
use crate::models::{Artifact, DetectedFact, TargetType};
|
|
||||||
|
|
||||||
/// Everything a classifier needs to reason about a target.
|
|
||||||
pub struct ClassificationInput<'a> {
|
|
||||||
/// The artifacts declared for the target.
|
|
||||||
pub artifacts: &'a [Artifact],
|
|
||||||
/// Ingested working paths, keyed by [`Artifact::id`]. Absent for artifacts
|
|
||||||
/// with no on-disk form (e.g. a live URL).
|
|
||||||
pub working_paths: &'a HashMap<String, PathBuf>,
|
|
||||||
/// Free-form description of the target, if provided.
|
|
||||||
pub description: Option<&'a str>,
|
|
||||||
}
|
|
||||||
|
|
||||||
/// A single classifier's proposal for a target.
|
|
||||||
pub struct ClassifierVerdict {
|
|
||||||
/// The proposed target type.
|
|
||||||
pub target_type: TargetType,
|
|
||||||
/// Confidence in `[0.0, 1.0]`.
|
|
||||||
pub confidence: f32,
|
|
||||||
/// Facts that informed the proposal.
|
|
||||||
pub facts: Vec<DetectedFact>,
|
|
||||||
/// Human-readable explanation.
|
|
||||||
pub rationale: String,
|
|
||||||
}
|
|
||||||
|
|
||||||
/// A source of target-type classification.
|
|
||||||
#[allow(async_fn_in_trait)]
|
|
||||||
pub trait TargetClassifier: Send + Sync {
|
|
||||||
/// Stable identifier for this classifier (recorded in `detected_by`).
|
|
||||||
fn name(&self) -> &str;
|
|
||||||
|
|
||||||
/// Propose zero or more ranked verdicts for the given input.
|
|
||||||
async fn classify(
|
|
||||||
&self,
|
|
||||||
input: &ClassificationInput<'_>,
|
|
||||||
) -> Result<Vec<ClassifierVerdict>, CoreError>;
|
|
||||||
}
|
|
||||||
@@ -1,45 +0,0 @@
|
|||||||
//! The compliance-controls provider port.
|
|
||||||
//!
|
|
||||||
//! The mapping engine turns findings into compliance status against a corpus of
|
|
||||||
//! controls. That corpus is pluggable: the built-in OSCAL catalog by default, or
|
|
||||||
//! a tenant-owned RAG of atomic controls derived from laws
|
|
||||||
//! (`breakpilot-compliance`) when available. A [`ControlsProvider`] abstracts the
|
|
||||||
//! source so the mapping engine does not hardcode a catalog.
|
|
||||||
|
|
||||||
use crate::error::CoreError;
|
|
||||||
use crate::models::ComplianceFramework;
|
|
||||||
|
|
||||||
/// A control retrieved from a controls corpus.
|
|
||||||
#[derive(Debug, Clone)]
|
|
||||||
pub struct Control {
|
|
||||||
/// Stable control identifier (e.g. an OSCAL control id or a RAG chunk id).
|
|
||||||
pub id: String,
|
|
||||||
/// The framework this control belongs to.
|
|
||||||
pub framework: ComplianceFramework,
|
|
||||||
/// Short human-readable title.
|
|
||||||
pub title: String,
|
|
||||||
/// The control text / requirement.
|
|
||||||
pub text: String,
|
|
||||||
/// Free-form source reference (catalog name, law citation, ...).
|
|
||||||
pub source: Option<String>,
|
|
||||||
}
|
|
||||||
|
|
||||||
/// A query for relevant controls.
|
|
||||||
pub struct ControlQuery<'a> {
|
|
||||||
/// Frameworks in scope for the target.
|
|
||||||
pub frameworks: &'a [ComplianceFramework],
|
|
||||||
/// Free-text describing what to map (a finding summary, a component, ...).
|
|
||||||
pub context: &'a str,
|
|
||||||
/// Maximum number of controls to return.
|
|
||||||
pub limit: usize,
|
|
||||||
}
|
|
||||||
|
|
||||||
/// A source of compliance controls (built-in OSCAL catalog, breakpilot RAG, ...).
|
|
||||||
#[allow(async_fn_in_trait)]
|
|
||||||
pub trait ControlsProvider: Send + Sync {
|
|
||||||
/// Stable identifier for this provider.
|
|
||||||
fn name(&self) -> &str;
|
|
||||||
|
|
||||||
/// Retrieve the controls most relevant to the query.
|
|
||||||
async fn controls(&self, query: &ControlQuery<'_>) -> Result<Vec<Control>, CoreError>;
|
|
||||||
}
|
|
||||||
@@ -1,58 +0,0 @@
|
|||||||
//! The external-evidence provider port.
|
|
||||||
//!
|
|
||||||
//! A sibling product (tramiton, for firmware) may already hold authoritative
|
|
||||||
//! analysis for an artifact. An [`EvidenceProvider`] lets compliance-scanner
|
|
||||||
//! *reconcile* that evidence — a build plan, an SBOM, a VEX document, a
|
|
||||||
//! reproducible-build lock, an attestation — instead of recomputing it. The key
|
|
||||||
//! used to match is the artifact content digest (a firmware sha256, which equals
|
|
||||||
//! [`crate::models::Artifact::content_hash`]).
|
|
||||||
//!
|
|
||||||
//! Concrete providers live in the agent (a tramiton CLI shell-out today, a cloud
|
|
||||||
//! client later) plus a deterministic mock for tests, so nothing here depends on
|
|
||||||
//! an external binary.
|
|
||||||
|
|
||||||
use std::path::Path;
|
|
||||||
|
|
||||||
use crate::error::CoreError;
|
|
||||||
use crate::models::{Artifact, ExternalSystem};
|
|
||||||
|
|
||||||
/// A single reconcilable evidence document fetched from a sibling product.
|
|
||||||
#[derive(Debug, Clone)]
|
|
||||||
pub struct EvidenceDocument {
|
|
||||||
/// What the document is: `build_plan` | `sbom` | `vex` | `lock` | `attestation`.
|
|
||||||
pub kind: String,
|
|
||||||
/// The document's format (e.g. `cyclonedx-1.5`, `openvex-0.2.0`, `toml`, `json`).
|
|
||||||
pub format: String,
|
|
||||||
/// The raw document payload.
|
|
||||||
pub content: String,
|
|
||||||
}
|
|
||||||
|
|
||||||
/// The evidence a provider could return for a target's artifact.
|
|
||||||
#[derive(Debug, Clone, Default)]
|
|
||||||
pub struct ReconciledEvidence {
|
|
||||||
/// The sibling's project identifier, if resolved.
|
|
||||||
pub project_id: Option<String>,
|
|
||||||
/// The subject content digest the evidence pertains to.
|
|
||||||
pub subject_sha256: Option<String>,
|
|
||||||
/// The documents fetched (any of build plan / SBOM / VEX / lock / attestation).
|
|
||||||
pub documents: Vec<EvidenceDocument>,
|
|
||||||
}
|
|
||||||
|
|
||||||
/// A source of externally-held, reconcilable evidence for an artifact.
|
|
||||||
#[allow(async_fn_in_trait)]
|
|
||||||
pub trait EvidenceProvider: Send + Sync {
|
|
||||||
/// Which sibling product this provider integrates.
|
|
||||||
fn system(&self) -> ExternalSystem;
|
|
||||||
|
|
||||||
/// Whether this provider can handle the given artifact + working path
|
|
||||||
/// (e.g. tramiton handles firmware images / embedded source trees).
|
|
||||||
fn handles(&self, artifact: &Artifact, working_path: Option<&Path>) -> bool;
|
|
||||||
|
|
||||||
/// Reconcile existing evidence for the artifact, keyed by its content digest.
|
|
||||||
/// Returns `Ok(None)` when the provider has nothing for this artifact.
|
|
||||||
async fn reconcile(
|
|
||||||
&self,
|
|
||||||
artifact: &Artifact,
|
|
||||||
working_path: Option<&Path>,
|
|
||||||
) -> Result<Option<ReconciledEvidence>, CoreError>;
|
|
||||||
}
|
|
||||||
@@ -1,16 +1,10 @@
|
|||||||
pub mod classifier;
|
|
||||||
pub mod controls;
|
|
||||||
pub mod dast_agent;
|
pub mod dast_agent;
|
||||||
pub mod evidence;
|
|
||||||
pub mod graph_builder;
|
pub mod graph_builder;
|
||||||
pub mod issue_tracker;
|
pub mod issue_tracker;
|
||||||
pub mod pentest_tool;
|
pub mod pentest_tool;
|
||||||
pub mod scanner;
|
pub mod scanner;
|
||||||
|
|
||||||
pub use classifier::{ClassificationInput, ClassifierVerdict, TargetClassifier};
|
|
||||||
pub use controls::{Control, ControlQuery, ControlsProvider};
|
|
||||||
pub use dast_agent::{DastAgent, DastContext, DiscoveredEndpoint, EndpointParameter};
|
pub use dast_agent::{DastAgent, DastContext, DiscoveredEndpoint, EndpointParameter};
|
||||||
pub use evidence::{EvidenceDocument, EvidenceProvider, ReconciledEvidence};
|
|
||||||
pub use graph_builder::{LanguageParser, ParseOutput};
|
pub use graph_builder::{LanguageParser, ParseOutput};
|
||||||
pub use issue_tracker::IssueTracker;
|
pub use issue_tracker::IssueTracker;
|
||||||
pub use pentest_tool::{PentestTool, PentestToolContext, PentestToolResult};
|
pub use pentest_tool::{PentestTool, PentestToolContext, PentestToolResult};
|
||||||
|
|||||||
Reference in New Issue
Block a user