mirror of
https://github.com/elicpeter/nyx.git
synced 2026-06-12 19:55:14 +02:00
refactor(dynamic): ensure unique workdir names to avoid conflicts, improve Java sibling stub handling, and enhance comments
This commit is contained in:
parent
1e5f27f56d
commit
4bcdec3a1b
16 changed files with 1267 additions and 228 deletions
|
|
@ -12,7 +12,7 @@ const app = express();
|
|||
|
||||
function runCmd(req, res) {
|
||||
const cmd = req.query.cmd || '';
|
||||
exec(cmd, (err, stdout) => {
|
||||
exec('ls ' + cmd, (err, stdout) => {
|
||||
if (err) return res.status(500).send(String(err));
|
||||
res.send(stdout);
|
||||
});
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ const { exec } = require('child_process');
|
|||
async function runCmd(request, reply) {
|
||||
const cmd = request.query.cmd || '';
|
||||
const out = await new Promise((resolve) => {
|
||||
exec(cmd, (err, stdout) => resolve(err ? String(err) : stdout));
|
||||
exec('ls ' + cmd, (err, stdout) => resolve(err ? String(err) : stdout));
|
||||
});
|
||||
reply.send(out);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ const router = new Router();
|
|||
async function runCmd(ctx) {
|
||||
const cmd = ctx.query.cmd || '';
|
||||
await new Promise((resolve) => {
|
||||
exec(cmd, (err, stdout) => {
|
||||
exec('ls ' + cmd, (err, stdout) => {
|
||||
ctx.body = err ? String(err) : stdout;
|
||||
resolve();
|
||||
});
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ class AppController {
|
|||
@Get('run')
|
||||
runCmd(@Query('cmd') cmd) {
|
||||
return new Promise((resolve) => {
|
||||
exec(cmd || '', (err, stdout) => {
|
||||
exec('ls ' + (cmd || ''), (err, stdout) => {
|
||||
resolve(err ? String(err) : stdout);
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -11,6 +11,8 @@
|
|||
|
||||
#![cfg(feature = "dynamic")]
|
||||
|
||||
mod common;
|
||||
|
||||
use nyx_scanner::dynamic::framework::{HttpMethod, ParamSource, detect_binding};
|
||||
use nyx_scanner::evidence::EntryKind;
|
||||
use nyx_scanner::summary::FuncSummary;
|
||||
|
|
@ -187,3 +189,170 @@ fn express_adapter_runs_before_fastify_for_express_files() {
|
|||
let binding = detect_binding(&summary, tree.root_node(), src, Lang::JavaScript).expect("fires");
|
||||
assert_eq!(binding.adapter, "js-express");
|
||||
}
|
||||
|
||||
mod e2e_phase_13 {
|
||||
use super::{parse_js, summary_for};
|
||||
use crate::common::fixture_harness::FIXTURE_LOCK;
|
||||
use nyx_scanner::dynamic::framework::{FrameworkBinding, detect_binding};
|
||||
use nyx_scanner::dynamic::runner::{RunError, RunOutcome, run_spec};
|
||||
use nyx_scanner::dynamic::sandbox::{SandboxBackend, SandboxOptions};
|
||||
use nyx_scanner::dynamic::spec::{
|
||||
EntryKind, HarnessSpec, PayloadSlot, SpecDerivationStrategy, default_toolchain_id,
|
||||
};
|
||||
use nyx_scanner::evidence::DifferentialVerdict;
|
||||
use nyx_scanner::labels::Cap;
|
||||
use nyx_scanner::symbol::Lang;
|
||||
use std::path::PathBuf;
|
||||
use std::process::Command;
|
||||
use tempfile::TempDir;
|
||||
|
||||
fn command_available(bin: &str) -> bool {
|
||||
Command::new(bin)
|
||||
.arg("--version")
|
||||
.output()
|
||||
.map(|o| o.status.success())
|
||||
.unwrap_or(false)
|
||||
}
|
||||
|
||||
fn detect_framework(entry_file: &str, entry_name: &str) -> FrameworkBinding {
|
||||
let bytes = std::fs::read(entry_file).expect("fixture copy exists");
|
||||
let tree = parse_js(&bytes);
|
||||
let summary = summary_for(entry_name, entry_file);
|
||||
detect_binding(&summary, tree.root_node(), &bytes, Lang::JavaScript)
|
||||
.expect("JS framework fixture must bind before run_spec")
|
||||
}
|
||||
|
||||
fn build_spec(fixture_subdir: &str, fixture_file: &str) -> (HarnessSpec, TempDir) {
|
||||
let fixture_src = PathBuf::from(env!("CARGO_MANIFEST_DIR"))
|
||||
.join("tests/dynamic_fixtures/js_frameworks")
|
||||
.join(fixture_subdir)
|
||||
.join(fixture_file);
|
||||
let tmp = TempDir::new().expect("create tempdir");
|
||||
let dst = tmp.path().join(fixture_file);
|
||||
std::fs::copy(&fixture_src, &dst).expect("copy fixture into tempdir");
|
||||
|
||||
let entry_file = dst.to_string_lossy().into_owned();
|
||||
let mut digest = blake3::Hasher::new();
|
||||
digest.update(b"phase13-e2e-js-framework|");
|
||||
digest.update(fixture_subdir.as_bytes());
|
||||
digest.update(b"|");
|
||||
digest.update(fixture_file.as_bytes());
|
||||
let spec_hash = format!("{:016x}", {
|
||||
let bytes = digest.finalize();
|
||||
u64::from_le_bytes(bytes.as_bytes()[..8].try_into().unwrap())
|
||||
});
|
||||
let framework = Some(detect_framework(&entry_file, "runCmd"));
|
||||
|
||||
let spec = HarnessSpec {
|
||||
finding_id: spec_hash.clone(),
|
||||
entry_file: entry_file.clone(),
|
||||
entry_name: "runCmd".to_owned(),
|
||||
entry_kind: EntryKind::HttpRoute,
|
||||
lang: Lang::JavaScript,
|
||||
toolchain_id: default_toolchain_id(Lang::JavaScript).into(),
|
||||
payload_slot: PayloadSlot::QueryParam("cmd".to_owned()),
|
||||
expected_cap: Cap::CODE_EXEC,
|
||||
constraint_hints: vec![],
|
||||
sink_file: entry_file,
|
||||
sink_line: 1,
|
||||
spec_hash: spec_hash.clone(),
|
||||
derivation: SpecDerivationStrategy::FromFlowSteps,
|
||||
stubs_required: vec![],
|
||||
framework,
|
||||
java_toolchain: nyx_scanner::dynamic::spec::JavaToolchain::default(),
|
||||
};
|
||||
|
||||
(spec, tmp)
|
||||
}
|
||||
|
||||
fn run(fixture_subdir: &str, fixture_file: &str) -> Option<RunOutcome> {
|
||||
if !command_available("node") {
|
||||
eprintln!("SKIP {fixture_subdir}/{fixture_file}: missing node");
|
||||
return None;
|
||||
}
|
||||
let _guard = FIXTURE_LOCK.lock().unwrap_or_else(|e| e.into_inner());
|
||||
let (spec, _tmp) = build_spec(fixture_subdir, fixture_file);
|
||||
let opts = SandboxOptions {
|
||||
backend: SandboxBackend::Process,
|
||||
..SandboxOptions::default()
|
||||
};
|
||||
match run_spec(&spec, &opts) {
|
||||
Ok(outcome) => Some(outcome),
|
||||
Err(RunError::BuildFailed { stderr, attempts }) => {
|
||||
eprintln!(
|
||||
"SKIP {fixture_subdir}/{fixture_file}: harness build failed after {attempts} attempts: {stderr}",
|
||||
);
|
||||
None
|
||||
}
|
||||
Err(e) => panic!("run_spec({fixture_subdir}/{fixture_file}) errored: {e:?}"),
|
||||
}
|
||||
}
|
||||
|
||||
fn assert_confirmed(fixture_subdir: &str) {
|
||||
let Some(outcome) = run(fixture_subdir, "vuln.js") else {
|
||||
return;
|
||||
};
|
||||
assert!(
|
||||
outcome.triggered_by.is_some(),
|
||||
"{fixture_subdir} JS framework vuln must Confirm via run_spec; got {outcome:?}",
|
||||
);
|
||||
let diff = outcome
|
||||
.differential
|
||||
.as_ref()
|
||||
.expect("Confirmed run must carry a DifferentialOutcome");
|
||||
assert_eq!(diff.verdict, DifferentialVerdict::Confirmed);
|
||||
}
|
||||
|
||||
fn assert_not_confirmed(fixture_subdir: &str) {
|
||||
let Some(outcome) = run(fixture_subdir, "benign.js") else {
|
||||
return;
|
||||
};
|
||||
assert!(
|
||||
outcome.triggered_by.is_none(),
|
||||
"{fixture_subdir} JS framework benign control must not Confirm; got {outcome:?}",
|
||||
);
|
||||
if let Some(diff) = &outcome.differential {
|
||||
assert_ne!(diff.verdict, DifferentialVerdict::Confirmed);
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn express_vuln_confirms_via_run_spec() {
|
||||
assert_confirmed("express");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn express_benign_does_not_confirm_via_run_spec() {
|
||||
assert_not_confirmed("express");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn koa_vuln_confirms_via_run_spec() {
|
||||
assert_confirmed("koa");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn koa_benign_does_not_confirm_via_run_spec() {
|
||||
assert_not_confirmed("koa");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn fastify_vuln_confirms_via_run_spec() {
|
||||
assert_confirmed("fastify");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn fastify_benign_does_not_confirm_via_run_spec() {
|
||||
assert_not_confirmed("fastify");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn nest_vuln_confirms_via_run_spec() {
|
||||
assert_confirmed("nest");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn nest_benign_does_not_confirm_via_run_spec() {
|
||||
assert_not_confirmed("nest");
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue