Skip to content

Commit 1ad53bb

Browse files
committed
fix(ci): accept content-bound VT analysis aliases
Signed-off-by: Martin Vogel <martin.vogel.tech@gmail.com>
1 parent d5529e7 commit 1ad53bb

2 files changed

Lines changed: 16 additions & 2 deletions

File tree

‎scripts/ci/check-virustotal.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -425,8 +425,8 @@ def parse_completed(document: object, submission: Submission) -> Tuple[str, Opti
425425
if data.get("type") != "analysis":
426426
raise GateError(f"VirusTotal response is not an analysis for {submission.expected.scan_path}")
427427
response_id = data.get("id")
428-
if response_id != submission.analysis_id:
429-
raise GateError(f"VirusTotal response id mismatch for {submission.expected.scan_path}")
428+
if not isinstance(response_id, str) or ANALYSIS_ID_RE.fullmatch(response_id) is None:
429+
raise GateError(f"VirusTotal response has an invalid analysis id: {submission.expected.scan_path}")
430430
attributes = data.get("attributes")
431431
if not isinstance(attributes, dict):
432432
raise GateError("VirusTotal response has no analysis attributes")

‎tests/test_vt_gate_zero_tolerance_contract.sh‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,15 @@ write_response low-engines 0 0 49 "$PROBE_SHA" "$PROBE_SIZE"
9393
write_response wrong-hash 0 0 60 "$PROBE2_SHA" "$PROBE_SIZE"
9494
write_response wrong-size 0 0 60 "$PROBE_SHA" "$((PROBE_SIZE + 1))"
9595

96+
cat > "$FIX/responses/upload-alias.json" <<EOF
97+
{"meta":{"file_info":{"sha256":"$PROBE_SHA","size":$PROBE_SIZE}},
98+
"data":{"id":"canonical-analysis","type":"analysis","attributes":{"status":"completed",
99+
"stats":{"malicious":0,"suspicious":0,"undetected":60,"harmless":0,
100+
"timeout":0,"confirmed-timeout":0,"failure":0,"type-unsupported":0},
101+
"results":{"Microsoft":{"category":"undetected","result":null,
102+
"engine_version":"1.26070","engine_update":"20260808"}}}}}
103+
EOF
104+
96105
cat > "$FIX/responses/named-engine.json" <<EOF
97106
{"meta":{"file_info":{"sha256":"$PROBE_SHA","size":$PROBE_SIZE}},
98107
"data":{"id":"named-engine","type":"analysis","attributes":{"status":"completed",
@@ -200,11 +209,16 @@ run_gate() { # action-output -> prints rc
200209

201210
clean_output="binaries/objects/probe=$(url_for clean-analysis)"
202211
[ "$(run_gate "$clean_output")" = "0" ] || fail "clean exact scan must pass: $(cat "$FIX/last.log")"
212+
alias_output="binaries/objects/probe=$(url_for upload-alias)"
213+
[ "$(run_gate "$alias_output")" = "0" ] || \
214+
fail "a content-bound canonical response alias must pass: $(cat "$FIX/last.log")"
203215
RESULTS="$FIX/work/binaries/vt-results.tsv"
204216
[ -f "$RESULTS" ] || fail "clean gate did not atomically publish its results manifest"
205217
grep -q '^# cbm-virustotal-results-v1$' "$RESULTS" || fail "results marker missing"
206218
grep -q "objects/probe.*$PROBE_SHA.*$PROBE_SIZE.*60" "$RESULTS" || \
207219
fail "results do not bind path/hash/size/actual engine count"
220+
grep -Fq 'upload-alias' "$RESULTS" || \
221+
fail "results must retain the action's submitted analysis ID"
208222

209223
for id in one-malicious one-suspicious; do
210224
[ "$(run_gate "binaries/objects/probe=$(url_for "$id")")" != "0" ] || \

0 commit comments

Comments
 (0)