Auto merge dependabot PRs

This pr:
1. checks if the user == dependabot[bot]
2. if all CI passes, auto approve and merge the PR

.gitignore

@@ -1,8 +1,6 @@
 # Generated by Cargo
 # will have compiled files and executables
 /target/
-# generated file by build.rs for mapping nmap-payloads to rust
-src/generated.rs
 
 # Remove Cargo.lock from gitignore if creating an executable, leave it for libraries
 # More information here https://doc.rust-lang.org/cargo/guide/cargo-toml-vs-cargo-lock.html

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "rustscan"
-version = "2.4.1"
+version = "2.3.0"
 authors = ["Autumn <[email protected]>"]
 edition = "2018"
 description = "Faster Nmap Scanning with Rust"
@@ -17,7 +17,7 @@ exclude = [
 ]
 
 [dependencies]
-clap = { version = "4.5.31", features = ["derive", "wrap_help"] }
+clap = { version = "4.5.13", features = ["derive", "wrap_help"] }
 colored = "3.0.0"
 async-std = "1.13.0"
 futures = "0.3"

fixtures/.rustscan_scripts.toml

@@ -1,4 +0,0 @@
-tags = ["core_approved", "example"]
-ports = ["80", "443", "8080"]
-developer = ["example", "https://example.org"]
-directory = "fixtures/.rustscan_scripts" 

src/scripts/mod.rs

@@ -108,21 +108,17 @@ pub fn init_scripts(scripts: &ScriptsRequired) -> Result<Vec<ScriptFile>> {
             scripts_to_run.push(default_script);
         }
         ScriptsRequired::Custom => {
-            let script_config = ScriptConfig::read_config()?;
-            debug!("Script config \n{:?}", script_config);
-
-            let script_dir_base = if let Some(config_directory) = &script_config.directory {
-                PathBuf::from(config_directory)
-            } else {
-                dirs::home_dir().ok_or_else(|| anyhow!("Could not infer scripts path."))?
-            };
-
-            let script_paths = find_scripts(script_dir_base)?;
+            let scripts_dir_base =
+                dirs::home_dir().ok_or_else(|| anyhow!("Could not infer scripts path."))?;
+            let script_paths = find_scripts(scripts_dir_base)?;
             debug!("Scripts paths \n{:?}", script_paths);
 
             let parsed_scripts = parse_scripts(script_paths);
             debug!("Scripts parsed \n{:?}", parsed_scripts);
 
+            let script_config = ScriptConfig::read_config()?;
+            debug!("Script config \n{:?}", script_config);
+
             // Only Scripts that contain all the tags found in ScriptConfig will be selected.
             if let Some(config_hashset) = script_config.tags {
                 for script in parsed_scripts {
@@ -320,7 +316,8 @@ fn execute_script(script: &str) -> Result<String> {
     }
 }
 
-pub fn find_scripts(path: PathBuf) -> Result<Vec<PathBuf>> {
+pub fn find_scripts(mut path: PathBuf) -> Result<Vec<PathBuf>> {
+    path.push(".rustscan_scripts");
     if path.is_dir() {
         debug!("Scripts folder found {}", &path.display());
         let mut files_vec: Vec<PathBuf> = Vec::new();
@@ -385,7 +382,6 @@ pub struct ScriptConfig {
     pub tags: Option<Vec<String>>,
     pub ports: Option<Vec<String>>,
     pub developer: Option<Vec<String>>,
-    pub directory: Option<String>,
 }
 
 #[cfg(not(tarpaulin_include))]
@@ -404,7 +400,7 @@ impl ScriptConfig {
 
 #[cfg(test)]
 mod tests {
-    use super::*;
+    use super::{find_scripts, parse_scripts, Script, ScriptFile};
 
     // Function for testing only, it inserts static values into ip and open_ports
     // Doesn't use impl in case it's implemented in the super module at some point
@@ -422,7 +418,7 @@ mod tests {
 
     #[test]
     fn find_and_parse_scripts() {
-        let scripts = find_scripts("fixtures/.rustscan_scripts".into()).unwrap();
+        let scripts = find_scripts("fixtures/".into()).unwrap();
         let scripts = parse_scripts(scripts);
         assert_eq!(scripts.len(), 4);
     }
@@ -519,49 +515,4 @@ mod tests {
         // output has a newline at the end by default, .trim() trims it
         assert_eq!(output.trim(), "Total args passed to fixtures/.rustscan_scripts/test_script.pl : 2\nArg # 1 : 127.0.0.1\nArg # 2 : 80,8080");
     }
-
-    #[test]
-    fn test_custom_directory_config() {
-        // Create test config
-        let config_str = r#"
-            tags = ["core_approved", "example"]
-            directory = "fixtures/.rustscan_scripts"
-        "#;
-
-        let config: ScriptConfig = toml::from_str(config_str).unwrap();
-        assert_eq!(
-            config.directory,
-            Some("fixtures/.rustscan_scripts".to_string())
-        );
-
-        // Test that the directory is actually used
-        let script_dir_base = PathBuf::from(config.directory.unwrap());
-        let scripts = find_scripts(script_dir_base).unwrap();
-
-        // Verify we found the test script
-        assert!(scripts.iter().any(|p| p
-            .file_name()
-            .and_then(|f| f.to_str())
-            .map(|s| s == "test_script.txt")
-            .unwrap_or(false)));
-    }
-
-    #[test]
-    fn test_default_directory_fallback() {
-        let config_str = r#"
-            tags = ["core_approved", "example"]
-        "#;
-
-        let config: ScriptConfig = toml::from_str(config_str).unwrap();
-        assert_eq!(config.directory, None);
-
-        // Test fallback to home directory
-        let script_dir_base = if let Some(config_directory) = &config.directory {
-            PathBuf::from(config_directory)
-        } else {
-            dirs::home_dir().unwrap()
-        };
-
-        assert_eq!(script_dir_base, dirs::home_dir().unwrap());
-    }
 }