Building 70 Projects ranging from beginner to advanced so anyone can β learn from, build upon, use as a reference, or even copy directly. Owned by my cybersecurity company π
Go aicertificationcloud-engineeringcybercybersecuritycybersecurity-analystcybersecurity-certificationcybersecurity-certificationscybersecurity-educationcybersecurity-jobscybersecurity-portfoliocybersecurity-projectscybersecurity-toolsgrchackinglearningpentestingproject-repositoryprojetcspython
fix(lisdex): B21 - the compiler-shadow guard hardcoded an LLVM release that a base-image bump deletes
CarterPerez-dev78e849c05be4
diff --git a/PROJECTS/advanced/zero-day-vulnerability-scanner/crates/lisdex-build/src/instrument.rs b/PROJECTS/advanced/zero-day-vulnerability-scanner/crates/lisdex-build/src/instrument.rsindex 97d8fa97..685c5978 100644--- a/PROJECTS/advanced/zero-day-vulnerability-scanner/crates/lisdex-build/src/instrument.rs+++ b/PROJECTS/advanced/zero-day-vulnerability-scanner/crates/lisdex-build/src/instrument.rs@@ -11,6 +11,7 @@ pub const LLVM_AR: &str = "llvm-ar";pub const LLVM_RANLIB: &str = "llvm-ranlib";pub const LLVM_NM: &str = "llvm-nm";pub const LLVM_AS: &str = "llvm-as";+pub const LLVM_CONFIG: &str = "llvm-config";pub const ENV_CC: &str = "CC";pub const ENV_CXX: &str = "CXX";diff --git a/PROJECTS/advanced/zero-day-vulnerability-scanner/crates/lisdex-build/src/shadow.rs b/PROJECTS/advanced/zero-day-vulnerability-scanner/crates/lisdex-build/src/shadow.rsindex de1fa4dd..31d7d235 100644--- a/PROJECTS/advanced/zero-day-vulnerability-scanner/crates/lisdex-build/src/shadow.rs+++ b/PROJECTS/advanced/zero-day-vulnerability-scanner/crates/lisdex-build/src/shadow.rs@@ -2,8 +2,11 @@// shadow.rsuse std::path::{Path, PathBuf};+use std::time::Duration;-use crate::instrument::{Instrumentation, Toolchain};+use lisdex_core::process::{self, CommandSpec};++use crate::instrument::{Instrumentation, LLVM_CONFIG, PLAIN_CC, PLAIN_CXX, Toolchain};pub const SHADOWED_C: [&str; 3] = ["cc", "gcc", "clang"];pub const SHADOWED_CXX: [&str; 3] = ["c++", "g++", "clang++"];@@ -13,10 +16,10 @@ pub const SHADOWED_NM: &str = "nm";pub const ENV_PATH: &str = "PATH";pub const ENV_AFL_CC: &str = "AFL_CC";pub const ENV_AFL_CXX: &str = "AFL_CXX";-pub const REAL_CLANG: &str = "/usr/lib/llvm-20/bin/clang";-pub const REAL_CLANGXX: &str = "/usr/lib/llvm-20/bin/clang++";+pub const ARG_BINDIR: &str = "--bindir";const SCRIPT_MODE: u32 = 0o755;+const LLVM_CONFIG_TIMEOUT_SECS: u64 = 30;#[derive(Debug, thiserror::Error)]pub enum ShadowError {@@ -131,13 +134,52 @@ pub fn shadowed(instrumentation: &Instrumentation, dir: &Path) -> Instrumentatio}#[must_use]-pub fn recursion_guard_envs() -> Vec<(String, String)> {+pub fn llvm_config_spec() -> CommandSpec {+ CommandSpec::new(LLVM_CONFIG).arg(ARG_BINDIR)+}++#[must_use]+pub fn bindir_from(succeeded: bool, output: &str) -> Option<PathBuf> {+ if !succeeded {+ return None;+ }+ let trimmed = output.trim();+ if trimmed.is_empty() {+ return None;+ }+ Some(PathBuf::from(trimmed))+}++#[must_use]+pub fn llvm_bindir() -> Option<PathBuf> {+ let execution = process::run(+ &llvm_config_spec(),+ Duration::from_secs(LLVM_CONFIG_TIMEOUT_SECS),+ )+ .ok()?;+ bindir_from(execution.success, &execution.output)+}++#[must_use]+pub fn guard_envs_in(bindir: &Path) -> Vec<(String, String)> {+ let cc = bindir.join(PLAIN_CC);+ let cxx = bindir.join(PLAIN_CXX);+ if !cc.is_file() || !cxx.is_file() {+ return Vec::new();+ }vec![- (ENV_AFL_CC.to_owned(), REAL_CLANG.to_owned()),- (ENV_AFL_CXX.to_owned(), REAL_CLANGXX.to_owned()),+ (ENV_AFL_CC.to_owned(), cc.display().to_string()),+ (ENV_AFL_CXX.to_owned(), cxx.display().to_string()),]}+#[must_use]+pub fn recursion_guard_envs() -> Vec<(String, String)> {+ llvm_bindir()+ .as_deref()+ .map_or_else(Vec::new, guard_envs_in)+}+#[cfg(test)]mod tests {use super::*;@@ -244,12 +286,71 @@ mod tests {#[test]fn the_recursion_guard_pins_the_underlying_compiler_by_absolute_path() {let envs = recursion_guard_envs();+ assert_eq!(envs.len(), 2, "guard must name both compilers: {envs:?}");assert!(envs.iter().all(|(_, value)| value.starts_with('/') && !value.contains("shadow")));}+ #[test]+ fn every_compiler_the_guard_names_exists_on_disk() {+ for (name, value) in recursion_guard_envs() {+ assert!(+ Path::new(&value).is_file(),+ "{name}={value} does not exist; afl-cc aborts with 'failed to execute'"+ );+ }+ }++ #[test]+ fn the_guard_follows_the_installed_llvm_rather_than_a_pinned_release() {+ let bindir = llvm_bindir().expect("llvm-config --bindir must resolve in the toolchain");+ let envs = recursion_guard_envs();+ let cc = envs+ .iter()+ .find(|(name, _)| name == ENV_AFL_CC)+ .map(|(_, value)| value.clone())+ .unwrap();+ assert_eq!(cc, bindir.join(PLAIN_CC).display().to_string());+ }++ #[test]+ fn a_bindir_without_the_compilers_emits_no_guard_rather_than_a_fatal_path() {+ let dir = scratch("emptybindir");+ std::fs::create_dir_all(&dir).unwrap();+ assert!(guard_envs_in(&dir).is_empty());+ assert!(guard_envs_in(Path::new("/usr/lib/llvm-99/bin")).is_empty());+ }++ #[test]+ fn the_guard_names_the_bindir_it_was_given_and_not_a_baked_in_one() {+ let dir = scratch("otherbindir");+ std::fs::create_dir_all(&dir).unwrap();+ for name in [PLAIN_CC, PLAIN_CXX] {+ std::fs::write(dir.join(name), "#!/bin/sh\n").unwrap();+ }+ let envs = guard_envs_in(&dir);+ assert_eq!(envs.len(), 2);+ for (_, value) in envs {+ assert!(+ value.starts_with(&dir.display().to_string()),+ "{value} ignores the requested bindir {}",+ dir.display()+ );+ }+ }++ #[test]+ fn a_failed_or_silent_llvm_config_resolves_to_no_bindir() {+ assert!(bindir_from(false, "/usr/lib/llvm-20/bin").is_none());+ assert!(bindir_from(true, " \n").is_none());+ assert_eq!(+ bindir_from(true, "/usr/lib/llvm-20/bin\n"),+ Some(PathBuf::from("/usr/lib/llvm-20/bin"))+ );+ }+#[test]fn a_shadow_script_runs_and_forwards_its_arguments() {let dir = scratch("run");