[casr-python][casr-java] Add sub-tool option

casr/Cargo.toml

@@ -34,6 +34,7 @@ reqwest = { version = "0.11", features = ["json", "multipart", "rustls-tls"], de
 tokio = { version = "1", features = ["rt", "macros"], optional = true }
 toml = { version = "0.7", optional = true }
 wait-timeout = "0.2"
+which = "4.4"
 
 libcasr = { path = "../libcasr", version = "2.7.0", features = ["serde", "exploitable"] }
 

casr/src/bin/casr-java.rs

@@ -56,6 +56,17 @@ fn main() -> Result<()> {
                 .value_name("FILE")
                 .help("File with regular expressions for functions and file paths that should be ignored"),
         )
+        .arg(
+            Arg::new("sub-tool")
+                .long("sub-tool")
+                .default_value("casr-san")
+                .action(ArgAction::Set)
+                .value_parser(clap::value_parser!(PathBuf))
+                .value_name("BIN")
+                .help(
+                    "Path to sub tool for crash analysis that will be called when main tool fails to detect a crash",
+                ),
+        )
         .arg(
             Arg::new("ARGS")
                 .action(ArgAction::Set)
@@ -135,8 +146,8 @@ fn main() -> Result<()> {
             report.execution_class = exception;
         }
     } else {
-        // Call casr-san
-        return util::call_casr_san(&matches, &argv, "casr-java");
+        // Call sub tool
+        return util::call_sub_tool(&matches, &argv, "casr-java");
     }
 
     if let Ok(crash_line) = JavaStacktrace::parse_stacktrace(&report.stacktrace)?.crash_line() {

casr/src/bin/casr-python.rs

@@ -55,6 +55,17 @@ fn main() -> Result<()> {
                 .value_name("FILE")
                 .help("File with regular expressions for functions and file paths that should be ignored"),
         )
+        .arg(
+            Arg::new("sub-tool")
+                .long("sub-tool")
+                .default_value("casr-san")
+                .action(ArgAction::Set)
+                .value_parser(clap::value_parser!(PathBuf))
+                .value_name("BIN")
+                .help(
+                    "Path to sub tool for crash analysis that will be called when main tool fails to detect a crash",
+                ),
+        )
         .arg(
             Arg::new("ARGS")
                 .action(ArgAction::Set)
@@ -138,8 +149,8 @@ fn main() -> Result<()> {
                 }
             }
         } else {
-            // Call casr-san
-            return util::call_casr_san(&matches, &argv, "casr-python");
+            // Call sub tool
+            return util::call_sub_tool(&matches, &argv, "casr-python");
         }
     } else if let Some(report_start) = python_stderr_list
         .iter()
@@ -160,8 +171,8 @@ fn main() -> Result<()> {
             report.execution_class = exception;
         }
     } else {
-        // Call casr-san
-        return util::call_casr_san(&matches, &argv, "casr-python");
+        // Call sub tool
+        return util::call_sub_tool(&matches, &argv, "casr-python");
     }
 
     if let Ok(crash_line) = PythonStacktrace::parse_stacktrace(&report.stacktrace)?.crash_line() {

casr/src/util.rs

@@ -13,21 +13,35 @@ use simplelog::*;
 use std::fs::OpenOptions;
 use std::io::Write;
 use std::io::{BufRead, BufReader};
+use std::os::unix::fs::PermissionsExt;
 use std::path::{Path, PathBuf};
 use std::process::{Command, Stdio};
 use std::sync::RwLock;
+use which::which;
 
-/// Call casr-san with the provided options
+/// Call sub tool with the provided options
 ///
 /// # Arguments
 ///
 /// * `matches` - casr options
 ///
-/// * `tool` - tool, that called casr-san
+/// * `name` - main tool name, that called sub tool
 ///
 /// * `argv` - executable file options
-pub fn call_casr_san(matches: &ArgMatches, argv: &[&str], tool: &str) -> Result<()> {
-    let mut cmd = Command::new("casr-san");
+pub fn call_sub_tool(matches: &ArgMatches, argv: &[&str], name: &str) -> Result<()> {
+    let tool = matches.get_one::<PathBuf>("sub-tool").unwrap();
+    if let Err(_) = which(tool) {
+        if !tool.exists() {
+            bail!("Sub tool {tool:?} doesn't exist");
+        }
+        if !tool.is_file() {
+            bail!("Sub tool {tool:?} isn't exist");
+        }
+        if tool.metadata()?.permissions().mode() & 0o111 == 0 {
+            bail!("Sub tool {tool:?} isn't executable");
+        }
+    }
+    let mut cmd = Command::new(tool);
     if let Some(report_path) = matches.get_one::<PathBuf>("output") {
         cmd.args(["--output", report_path.to_str().unwrap()]);
     } else {
@@ -50,7 +64,7 @@ pub fn call_casr_san(matches: &ArgMatches, argv: &[&str], tool: &str) -> Result<
     if output.status.success() {
         Ok(())
     } else {
-        bail!("casr-san error when calling from {tool}");
+        bail!("{tool:?} error when calling from {name}");
     }
 }