fixups

ex0dus-0x · Mar 7, 2024 · 25d30bf · 25d30bf
1 parent bcc1bda
commit 25d30bf
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 20 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/src/check/elf.rs b/src/check/elf.rs
@@ -116,8 +116,8 @@ impl Analyze for Elf<'_> {
 
         // find symbols for stack canary and FORTIFY_SOURCE
         for _sym in self.syms.iter() {
-            let _symbol = self.strtab.get(_sym.st_name);
-            if let Some(Ok(symbol)) = _symbol {
+            let _symbol = self.strtab.get_at(_sym.st_name);
+            if let Some(symbol) = _symbol {
                 if symbol == "__stack_chk_fail" {
                     stack_canary = true;
 
@@ -132,19 +132,19 @@ impl Analyze for Elf<'_> {
         mitigate_map
     }
 
-    fn instrumentation(&self) -> Option<GenericMap> {
+    fn instrumentation(&self) -> GenericMap {
         let mut instr_map: GenericMap = GenericMap::new();
         for _sym in self.syms.iter() {
-            let _symbol = self.strtab.get(_sym.st_name);
-            if let Some(Ok(symbol)) = _symbol {
+            let _symbol = self.strtab.get_at(_sym.st_name);
+            if let Some(symbol) = _symbol {
 
                 // /__ubsan\w+\d+/
                 if symbol.starts_with("__ubsan") {
-                    instr_map.insert("Address Sanitizer (ASAN)".to_string(), json!(true));
+                    instr_map.insert("Undefined Behavior Sanitizer (UBSAN)".to_string(), json!(true));
 
                 // /_ZN\w+__asan\w+\d+/
                 } else if symbol.starts_with("__asan") {
-                    instr_map.insert("Undefined Behavior Sanitizer (UBSAN)".to_string(), json!(true));
+                    instr_map.insert("Address Sanitizer (ASAN)".to_string(), json!(true));
 
                 // /__afl\w+\d+/
                 } else if symbol.starts_with("__afl") {
@@ -156,6 +156,6 @@ impl Analyze for Elf<'_> {
                 }
             }
         }
-        unimplemented!();
+        instr_map
     }
 }
diff --git a/src/check/mach.rs b/src/check/mach.rs
@@ -60,7 +60,7 @@ impl Analyze for MachO<'_> {
         mitigate_map
     }
 
-    fn instrumentation(&self) -> Option<GenericMap> {
+    fn instrumentation(&self) -> GenericMap {
         unimplemented!();
     }
 }
diff --git a/src/check/mod.rs b/src/check/mod.rs
@@ -38,5 +38,5 @@ pub trait Analyze {
     /// To be implemented for each specific binary format
     fn compilation(&self, bytes: &[u8]) -> BinResult<GenericMap>;
     fn mitigations(&self) -> GenericMap;
-    fn instrumentation(&self) -> Option<GenericMap>;
+    fn instrumentation(&self) -> GenericMap;
 }
diff --git a/src/check/pe.rs b/src/check/pe.rs
@@ -90,7 +90,7 @@ impl Analyze for PE<'_> {
         mitigation_checks
     }
 
-    fn instrumentation(&self) -> Option<GenericMap> {
+    fn instrumentation(&self) -> GenericMap {
         unimplemented!();
     }
 }
diff --git a/src/detect.rs b/src/detect.rs
@@ -4,7 +4,6 @@
 
 use crate::check::{Analyze, GenericMap};
 use crate::errors::{BinError, BinResult};
-use crate::rules;
 
 use goblin::mach::Mach;
 use goblin::Object;
@@ -22,7 +21,7 @@ pub struct Detector {
     basic: GenericMap,
     compilation: GenericMap,
     mitigations: GenericMap,
-    instrumentation: Option<GenericMap>,
+    instrumentation: GenericMap,
 }
 
 impl Detector {
@@ -93,7 +92,7 @@ impl Detector {
                 },
                 compilation: pe.compilation(&data)?,
                 mitigations: pe.mitigations(),
-                instrumentation: None,
+                instrumentation: pe.instrumentation(),
             }),
             Object::Mach(Mach::Binary(mach)) => Ok(Self {
                 basic: {
@@ -102,22 +101,23 @@ impl Detector {
                 },
                 compilation: mach.compilation(&data)?,
                 mitigations: mach.mitigations(),
-                instrumentation: None,
+                instrumentation: mach.instrumentation(),
             }),
             _ => Err(BinError::new("unsupported filetype for analysis")),
         }
     }
 
     /// Output all the finalized report collected on the specific executable, writing to
     /// JSON path if specificed not as `-`.
-    pub fn output(&self, json: Option<&str>) -> serde_json::Result<()> {
+    pub fn output(&self, json: Option<&str>) -> BinResult<()> {
         if let Some(_path) = json {
             let output: &str = &serde_json::to_string_pretty(self)?;
             if _path == "-" {
                 println!("{}", output);
                 return Ok(());
             } else {
-                todo!()
+                fs::write(_path, output)?;
+                return Ok(());
             }
         }
 
@@ -127,8 +127,8 @@ impl Detector {
         Detector::table("EXPLOIT MITIGATIONS", self.mitigations.clone());
 
         // get instrumentation if any are set
-        if let Some(instrumentation) = &self.instrumentation {
-            Detector::table("INSTRUMENTATION", instrumentation.clone());
+        if !self.instrumentation.is_empty() {
+            Detector::table("INSTRUMENTATION", self.instrumentation.clone());
         }
         Ok(())
     }