detect capital R in rm command (#132)

* detect capital R in rm command

* clippy fixes

Author: kaplanelad

Cargo.lock

@@ -1,7 +1,7 @@
 [package]
 name = "shellfirm"
 description = "`shellfirm` will intercept any risky patterns (default or defined by you) and prompt you a small challenge for double verification, kinda like a captcha for your terminal."
-version = "0.2.8"
+version = "0.2.9"
 edition = "2021"
 authors = ["Elad-Kaplan <[email protected]>"]
 license = "MIT"
@@ -18,13 +18,13 @@ dirs = "4.0"
 anyhow = "1.0.51"
 serde = "1.0"
 serde_yaml = "0.8.21"
-serde_derive="1.0.131"
+serde_derive = "1.0.131"
 serde_regex = "1.1.0"
 regex = "1.5"
 rayon = "1.5.1"
 rand = "0.8.4"
-log="0.4.14"
-env_logger="0.9.0"
+log = "0.4.14"
+env_logger = "0.9.0"
 console = "^0.15.0"
 exitcode = "^1.1.2"
 lazy_static = "1.4.0"
@@ -46,4 +46,4 @@ cli = ["clap"]
 
 [[bin]]
 name = "shellfirm"
-required-features = ["cli"]
+required-features = ["cli"]

shellfirm/Cargo.toml

@@ -9,7 +9,7 @@ fn main() -> Result<()> {
 
     let dest_checks_path = Path::new(&out_dir).join("all-checks.yaml");
     let dest_groups = Path::new(&out_dir).join("all_the_files.rs");
-    let mut groups_names = File::create(&dest_groups)?;
+    let mut groups_names = File::create(dest_groups)?;
 
     writeln!(&mut groups_names, r##"["##,)?;
 
@@ -26,7 +26,7 @@ fn main() -> Result<()> {
             .unwrap()
             .to_str()
             .expect("could not get file name");
-        writeln!(&mut groups_names, r##""{name}","##, name = file_name)?;
+        writeln!(&mut groups_names, r##""{file_name}","##)?;
     }
 
     writeln!(&mut groups_names, r##"]"##,)?;

shellfirm/build.rs

@@ -1,5 +1,5 @@
 - from: fs
-  test: 'rm\s{1,}(-r|-fr|-rf)\s*(\*|\.{1,}|/)\s*$'
+  test: 'rm\s{1,}(-R|-r|-fR|-fr|-Rf|-rf)\s*(\*|\.{1,}|/)\s*$'
   description: "You are going to delete everything in the path."
   id: fs:recursively_delete
   filters:

shellfirm/checks/fs.yaml

@@ -64,7 +64,7 @@ pub fn run_update_groups(
         }),
         Err(e) => Ok(shellfirm::CmdExit {
             code: exitcode::CONFIG,
-            message: Some(format!("Could not update checks group. error: {}", e)),
+            message: Some(format!("Could not update checks group. error: {e}")),
         }),
     }
 }
@@ -77,7 +77,7 @@ pub fn run_reset(config: &Config, force_selection: Option<usize>) -> shellfirm::
         },
         Err(e) => shellfirm::CmdExit {
             code: exitcode::CONFIG,
-            message: Some(format!("reset settings error: {:?}", e)),
+            message: Some(format!("reset settings error: {e:?}")),
         },
     }
 }
@@ -97,7 +97,7 @@ pub fn run_challenge(config: &Config, challenge: Option<Challenge>) -> Result<sh
         }),
         Err(e) => Ok(shellfirm::CmdExit {
             code: exitcode::CONFIG,
-            message: Some(format!("change challenge error: {:?}", e)),
+            message: Some(format!("change challenge error: {e:?}")),
         }),
     }
 }
@@ -131,7 +131,7 @@ pub fn run_ignore(
         }),
         Err(e) => Ok(shellfirm::CmdExit {
             code: exitcode::CONFIG,
-            message: Some(format!("update pattern ignore errors: {:?}", e)),
+            message: Some(format!("update pattern ignore errors: {e:?}")),
         }),
     }
 }
@@ -165,7 +165,7 @@ pub fn run_deny(
         }),
         Err(e) => Ok(shellfirm::CmdExit {
             code: exitcode::CONFIG,
-            message: Some(format!("update pattern ignore errors: {:?}", e)),
+            message: Some(format!("update pattern ignore errors: {e:?}")),
         }),
     }
 }

shellfirm/src/bin/cmd/config.rs

@@ -1,12 +1,12 @@
 ---
 source: shellfirm/src/bin/cmd/command.rs
-expression: "run_pre_command(\"rm -rf /\", &settings, &settings.get_active_checks().unwrap(),\n    true)"
+expression: "execute(\"rm -rf /\", &settings, &settings.get_active_checks().unwrap(), true)"
 ---
 Ok(
     CmdExit {
         code: 0,
         message: Some(
-            "---\n- id: \"fs:recursively_delete\"\n  test: \"rm\\\\s{1,}(-r|-fr|-rf)\\\\s*(\\\\*|\\\\.{1,}|/)\\\\s*$\"\n  description: You are going to delete everything in the path.\n  from: fs\n  challenge: Math\n  filters:\n    IsExists: \"3\"\n",
+            "---\n- id: \"fs:recursively_delete\"\n  test: \"rm\\\\s{1,}(-R|-r|-fR|-fr|-Rf|-rf)\\\\s*(\\\\*|\\\\.{1,}|/)\\\\s*$\"\n  description: You are going to delete everything in the path.\n  from: fs\n  challenge: Math\n  filters:\n    IsExists: \"3\"\n",
         ),
     },
 )

shellfirm/src/bin/cmd/snapshots/shellfirm__cmd__command__test_command_cli_command__can_run_pre_command.snap

@@ -24,7 +24,7 @@ fn main() {
     let config = match Config::new(None) {
         Ok(config) => config,
         Err(err) => {
-            eprintln!("Loading config error: {}", err);
+            eprintln!("Loading config error: {err}");
             exit(1)
         }
     };
@@ -51,7 +51,7 @@ fn main() {
     let checks = match settings.get_active_checks() {
         Ok(c) => c,
         Err(e) => {
-            eprintln!("Could not load checks. err: Error: {}", e);
+            eprintln!("Could not load checks. err: Error: {e}");
             exit(1)
         }
     };

shellfirm/src/bin/shellfirm.rs

@@ -83,7 +83,7 @@ pub fn challenge(
     }
 
     for description in descriptions {
-        eprintln!("* {}", description);
+        eprintln!("* {description}");
     }
     eprintln!();
 

shellfirm/src/checks.rs

@@ -55,7 +55,7 @@ pub struct Settings {
 }
 
 impl fmt::Display for Challenge {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         match self {
             Self::Math => write!(f, "Math"),
             Self::Enter => write!(f, "Enter"),
@@ -103,7 +103,7 @@ impl Config {
                     // compatibility if the folder $HOME/.shellfirm exists, shillfirm
                     // continue work with that folder. If the folder does not exists, the default
                     // use config dir
-                    let homedir = p.join(format!(".{}", package_name));
+                    let homedir = p.join(format!(".{package_name}"));
                     let conf_dir = dirs::config_dir().unwrap_or_else(|| homedir.clone());
                     if homedir.is_dir() {
                         homedir

shellfirm/src/config.rs

@@ -40,7 +40,7 @@ pub fn math_challenge() -> bool {
         if answer == expected_answer {
             break;
         }
-        eprintln!("{}", WRONG_ANSWER);
+        eprintln!("{WRONG_ANSWER}");
     }
     true
 }
@@ -53,7 +53,7 @@ pub fn enter_challenge() -> bool {
         if answer == "\n" {
             break;
         }
-        eprintln!("{}", WRONG_ANSWER);
+        eprintln!("{WRONG_ANSWER}");
     }
     true
 }
@@ -65,7 +65,7 @@ pub fn yes_challenge() -> bool {
         if show_stdin_prompt().trim() == "yes" {
             break;
         }
-        eprintln!("{}", WRONG_ANSWER);
+        eprintln!("{WRONG_ANSWER}");
     }
     true
 }

shellfirm/src/prompt.rs

@@ -13,3 +13,7 @@
   description: folder not found
 - test: rmm -rf /
   description: folder not found
+- test: rm -Rf /
+  description: Handle capital R
+- test: rm -FR /
+  description: invalid command

shellfirm/tests/checks/fs-recursively_delete.yaml

@@ -60,4 +60,18 @@ expression: test_file_results
         check_detection_ids: [],
         test_description: "folder not found",
     },
+    TestSensitivePatternsResult {
+        file_path: "fs-recursively_delete.yaml",
+        test: "rm -Rf /",
+        check_detection_ids: [
+            "fs:recursively_delete",
+        ],
+        test_description: "Handle capital R",
+    },
+    TestSensitivePatternsResult {
+        file_path: "fs-recursively_delete.yaml",
+        test: "rm -FR /",
+        check_detection_ids: [],
+        test_description: "invalid command",
+    },
 ]