apunkt/nyx
1
0
Fork 0
mirror of https://github.com/elicpeter/nyx.git synced 2026-06-09 19:45:13 +02:00
Code Issues Projects Releases Packages Wiki Activity

style(dynamic): improve code readability by reformatting long lines and aligning nested structures

Browse source
This commit is contained in:
elipeter 2026-06-01 19:42:22 -05:00
parent d3bfd6c848
commit e64fb25dae
8 changed files with 54 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/dynamic/corpus/path_trav/java.rs
View file

@ -44,9 +44,7 @@ pub const PAYLOADS: &[CuratedPayload] = &[
provenance: PayloadProvenance::Curated,
since_corpus_version: 17,
deprecated_at_corpus_version: None,
fixture_paths: &[
"tests/benchmark/corpus/java/path_traversal/PathTraversalServlet.java",
],
fixture_paths: &["tests/benchmark/corpus/java/path_traversal/PathTraversalServlet.java"],
oob_nonce_slot: false,
probe_predicates: &[],
benign_control: Some(PayloadRef {
@ -64,9 +62,7 @@ pub const PAYLOADS: &[CuratedPayload] = &[
provenance: PayloadProvenance::Curated,
since_corpus_version: 17,
deprecated_at_corpus_version: None,
fixture_paths: &[
"tests/benchmark/corpus/java/path_traversal/PathTraversalServlet.java",
],
fixture_paths: &["tests/benchmark/corpus/java/path_traversal/PathTraversalServlet.java"],
oob_nonce_slot: false,
probe_predicates: &[],
benign_control: None,

6
src/dynamic/lang/java.rs
View file

@ -3326,14 +3326,16 @@ fn invoke_for_shape(spec: &HarnessSpec, shape: JavaShape, entry_class: &str) ->
" String[] mainArgs = new String[] {{ payload }};\n {entry_class}.main(mainArgs);"
),
JavaShape::ServletDoGet => {
let slots = slot_names_java_array(&servlet_slot_names(&read_entry_source(&spec.entry_file)));
let slots =
slot_names_java_array(&servlet_slot_names(&read_entry_source(&spec.entry_file)));
let drain = servlet_drain_response(spec);
format!(
" invokeServlet({entry_class}.class, \"doGet\", payload, \"GET\", {slots}, {drain});"
)
}
JavaShape::ServletDoPost => {
let slots = slot_names_java_array(&servlet_slot_names(&read_entry_source(&spec.entry_file)));
let slots =
slot_names_java_array(&servlet_slot_names(&read_entry_source(&spec.entry_file)));
let drain = servlet_drain_response(spec);
format!(
" invokeServlet({entry_class}.class, \"doPost\", payload, \"POST\", {slots}, {drain});"

12
src/dynamic/lang/js_shared.rs
View file

@ -2790,7 +2790,11 @@ console.log(JSON.stringify({
"#;
let (body, entry_subpath) = if spec.entry_is_derivable() {
let entry_subpath = if is_typescript { "entry.ts" } else { "entry.js" };
let entry_subpath = if is_typescript {
"entry.ts"
} else {
"entry.js"
};
let entry_name = &spec.entry_name;
let call_args = pp_entry_call_args(spec);
// TypeScript fixtures use ES-module imports + type annotations the
@ -2800,7 +2804,11 @@ console.log(JSON.stringify({
// type-stripping + ESM→CJS shim so `esModuleInterop`-style fixtures
// run as the author intended. JS fixtures are CommonJS — require
// them directly.
let loader_defs = if is_typescript { TS_ENTRY_LOADER_JS } else { "" };
let loader_defs = if is_typescript {
TS_ENTRY_LOADER_JS
} else {
""
};
let entry_load_expr = if is_typescript {
format!("nyxLoadTsEntry('./{entry_subpath}')")
} else {

5
src/dynamic/oracle.rs
View file

@ -2022,7 +2022,10 @@ mod tests {
"render must be lowercase hex: {r}",
);
assert!(Canary::ENTROPY_BITS >= 128);
assert!(r.len() * 4 >= 128, "rendered canary clears the 128-bit floor");
assert!(
r.len() * 4 >= 128,
"rendered canary clears the 128-bit floor"
);
}
#[test]

3
src/dynamic/runner.rs
View file

@ -817,8 +817,7 @@ pub fn run_spec(spec: &HarnessSpec, opts: &SandboxOptions) -> Result<RunOutcome,
let has_proven_oob = candidates
.iter()
.any(|(_, r)| r.verdict == DifferentialVerdict::ConfirmedProvenOob);
let confirmed_class =
has_proven_oob || matches!(aggregate, DifferentialVerdict::Confirmed);
let confirmed_class = has_proven_oob || matches!(aggregate, DifferentialVerdict::Confirmed);
if confirmed_class {
// Representative outcome: prefer the strongest (ProvenOob), else
// the first candidate carrying a triggering verdict. Iteration

28
src/dynamic/spec.rs
View file

@ -616,9 +616,7 @@ fn derive_from_flow_steps(
Some(e) => (e.file, e.function),
None => {
let name = lang_from_path(&sink_file)
.and_then(|l| {
resolve_enclosing_function_via_ast(&sink_file, sink_line as usize, l)
})
.and_then(|l| resolve_enclosing_function_via_ast(&sink_file, sink_line as usize, l))
.unwrap_or_else(|| "<unknown>".to_owned());
(sink_file.clone(), name)
}
@ -2118,10 +2116,26 @@ mod tests {
// enclosing `run` function the sink sits in so the harness can drive
// it and the author's guard participates in the verdict.
let cases = [
("tests/dynamic_fixtures/deserialize/java/Benign.java", 36, Lang::Java),
("tests/dynamic_fixtures/deserialize/java/Vuln.java", 14, Lang::Java),
("tests/dynamic_fixtures/deserialize/ruby/benign.rb", 14, Lang::Ruby),
("tests/dynamic_fixtures/deserialize/ruby/vuln.rb", 7, Lang::Ruby),
(
"tests/dynamic_fixtures/deserialize/java/Benign.java",
36,
Lang::Java,
),
(
"tests/dynamic_fixtures/deserialize/java/Vuln.java",
14,
Lang::Java,
),
(
"tests/dynamic_fixtures/deserialize/ruby/benign.rb",
14,
Lang::Ruby,
),
(
"tests/dynamic_fixtures/deserialize/ruby/vuln.rb",
7,
Lang::Ruby,
),
];
for (path, line, lang) in cases {
assert_eq!(