mirror of
https://github.com/uutils/coreutils
synced 2024-10-15 04:14:44 +00:00
Run the echo fuzzer in the CI
This commit is contained in:
parent
66e0835e72
commit
4d5c034eb1
1
.github/workflows/fuzzing.yml
vendored
1
.github/workflows/fuzzing.yml
vendored
|
@ -42,6 +42,7 @@ jobs:
|
||||||
- { name: fuzz_date, should_pass: false }
|
- { name: fuzz_date, should_pass: false }
|
||||||
- { name: fuzz_expr, should_pass: true }
|
- { name: fuzz_expr, should_pass: true }
|
||||||
- { name: fuzz_printf, should_pass: false }
|
- { name: fuzz_printf, should_pass: false }
|
||||||
|
- { name: fuzz_echo, should_pass: false }
|
||||||
- { name: fuzz_parse_glob, should_pass: true }
|
- { name: fuzz_parse_glob, should_pass: true }
|
||||||
- { name: fuzz_parse_size, should_pass: true }
|
- { name: fuzz_parse_size, should_pass: true }
|
||||||
- { name: fuzz_parse_time, should_pass: true }
|
- { name: fuzz_parse_time, should_pass: true }
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
#![no_main]
|
#![no_main]
|
||||||
use libfuzzer_sys::fuzz_target;
|
use libfuzzer_sys::fuzz_target;
|
||||||
use uu_echo::uumain; // Changed from uu_printf to uu_echo
|
use uu_echo::uumain;
|
||||||
|
|
||||||
use rand::prelude::SliceRandom;
|
use rand::prelude::SliceRandom;
|
||||||
use rand::Rng;
|
use rand::Rng;
|
||||||
|
@ -12,7 +12,7 @@ use crate::fuzz_common::{
|
||||||
compare_result, generate_and_run_uumain, generate_random_string, run_gnu_cmd,
|
compare_result, generate_and_run_uumain, generate_random_string, run_gnu_cmd,
|
||||||
};
|
};
|
||||||
|
|
||||||
static CMD_PATH: &str = "/usr/bin/echo"; // Changed from "printf" to "echo"
|
static CMD_PATH: &str = "echo";
|
||||||
|
|
||||||
fn generate_echo() -> String {
|
fn generate_echo() -> String {
|
||||||
let mut rng = rand::thread_rng();
|
let mut rng = rand::thread_rng();
|
||||||
|
@ -22,7 +22,6 @@ fn generate_echo() -> String {
|
||||||
let include_n = rng.gen_bool(0.1); // 10% chance
|
let include_n = rng.gen_bool(0.1); // 10% chance
|
||||||
let include_e = rng.gen_bool(0.1); // 10% chance
|
let include_e = rng.gen_bool(0.1); // 10% chance
|
||||||
let include_E = rng.gen_bool(0.1); // 10% chance
|
let include_E = rng.gen_bool(0.1); // 10% chance
|
||||||
// --help and --version are typically not included in fuzzing as they don't change output format
|
|
||||||
|
|
||||||
if include_n {
|
if include_n {
|
||||||
echo_str.push_str("-n ");
|
echo_str.push_str("-n ");
|
||||||
|
@ -41,29 +40,25 @@ fn generate_echo() -> String {
|
||||||
if include_e {
|
if include_e {
|
||||||
// Add a 10% chance of including an escape sequence
|
// Add a 10% chance of including an escape sequence
|
||||||
if rng.gen_bool(0.1) {
|
if rng.gen_bool(0.1) {
|
||||||
echo_str.push_str(&generate_escape_sequence(&mut rng)); // This function should handle echo-specific sequences
|
echo_str.push_str(&generate_escape_sequence(&mut rng));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
echo_str
|
echo_str
|
||||||
}
|
}
|
||||||
|
|
||||||
// You should also modify the generate_escape_sequence function to include echo-specific sequences
|
|
||||||
fn generate_escape_sequence(rng: &mut impl Rng) -> String {
|
fn generate_escape_sequence(rng: &mut impl Rng) -> String {
|
||||||
let escape_sequences = [
|
let escape_sequences = [
|
||||||
"\\\\", "\\a", "\\b", "\\c", "\\e", "\\f", "\\n", "\\r", "\\t", "\\v",
|
"\\\\", "\\a", "\\b", "\\c", "\\e", "\\f", "\\n", "\\r", "\\t", "\\v", "\\0NNN", "\\xHH",
|
||||||
"\\0NNN", // You can randomly generate NNN
|
|
||||||
"\\xHH", // You can randomly generate HH
|
|
||||||
// ... other sequences
|
|
||||||
];
|
];
|
||||||
escape_sequences.choose(rng).unwrap().to_string()
|
escape_sequences.choose(rng).unwrap().to_string()
|
||||||
}
|
}
|
||||||
|
|
||||||
fuzz_target!(|_data: &[u8]| {
|
fuzz_target!(|_data: &[u8]| {
|
||||||
let echo_input = generate_echo(); // Changed from generate_printf to generate_echo
|
let echo_input = generate_echo();
|
||||||
let mut args = vec![OsString::from("echo")]; // Changed from "printf" to "echo"
|
let mut args = vec![OsString::from("echo")];
|
||||||
args.extend(echo_input.split_whitespace().map(OsString::from));
|
args.extend(echo_input.split_whitespace().map(OsString::from));
|
||||||
let rust_result = generate_and_run_uumain(&args, uumain); // uumain function from uu_echo
|
let rust_result = generate_and_run_uumain(&args, uumain);
|
||||||
|
|
||||||
let gnu_result = match run_gnu_cmd(CMD_PATH, &args[1..], false) {
|
let gnu_result = match run_gnu_cmd(CMD_PATH, &args[1..], false) {
|
||||||
Ok(result) => result,
|
Ok(result) => result,
|
||||||
|
@ -88,6 +83,6 @@ fuzz_target!(|_data: &[u8]| {
|
||||||
&gnu_result.stderr,
|
&gnu_result.stderr,
|
||||||
rust_result.exit_code,
|
rust_result.exit_code,
|
||||||
gnu_result.exit_code,
|
gnu_result.exit_code,
|
||||||
false, // Set to true if you want to fail on stderr diff
|
true,
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
|
Loading…
Reference in a new issue