Clippy (#510)

* settings

* silly jack

* silly jack

* first run

* we did it

* nit

* un nit

.devcontainer/devcontainer.json

@@ -24,6 +24,17 @@
 				"go.useLanguageServer": true,
 				"go.gopath": "/go",
 				"go.goroot": "/usr/local/go",
+				// RUST
+				"rust-analyzer.check.command": "clippy",
+				"rust-analyzer.checkOnSave.overrideCommand": [
+					"cargo",
+					"clippy",
+					"--fix",
+					"--workspace",
+					"--message-format=json",
+					"--all-targets",
+					"--allow-dirty"
+				],
 				// Formatting
 				"editor.formatOnSave": true,
 				"files.trimTrailingWhitespace": true,

.devcontainer/library-scripts/rust-debian.sh

@@ -80,7 +80,7 @@ if ! type rustup > /dev/null 2>&1; then
     mkdir -p "${CARGO_HOME}" "${RUSTUP_HOME}"
     chown ${USERNAME} "${CARGO_HOME}" "${RUSTUP_HOME}"
     su ${USERNAME} -c "curl --tlsv1.2 https://sh.rustup.rs -sSf | bash -s -- -y --no-modify-path --profile minimal 2>&1"
-else 
+else
     echo "Rust already installed. Skipping."
 fi
 
@@ -95,6 +95,7 @@ su ${USERNAME} -c "$(cat << EOF
     rustup component add rls rust-analysis rust-src clippy 2>&1
     rustup toolchain install nightly-2023-09-04
     rustup component add rustfmt --toolchain nightly-2023-09-04
+    rustup component add clippy --toolchain nightly-2023-09-04
 EOF
 )"
 
@@ -109,4 +110,4 @@ EOF
 )"
 
 
-echo "Done!"
+echo "Done!"

.vscode/settings.json

@@ -2,5 +2,15 @@
     "rust-analyzer.cargo.extraArgs": [
         "--profile",
         "rust-analyzer"
-    ]  
-}
+    ],
+    "rust-analyzer.check.command": "clippy",
+    "rust-analyzer.checkOnSave.overrideCommand": [
+        "cargo",
+        "clippy",
+        "--fix",
+        "--workspace",
+        "--message-format=json",
+        "--all-targets",
+        "--allow-dirty"
+    ],
+}

implants/golem/src/inter.rs

@@ -26,8 +26,8 @@
 use std::fmt;
 use std::fmt::Display;
 
-use anyhow;
-use serde_json;
+
+
 use starlark::errors::EvalMessage;
 use starlark::errors::EvalSeverity;
 use starlark::read_line::ReadLine;
@@ -110,7 +110,7 @@ fn interactive(ctx: &Context) -> anyhow::Result<()> {
 }
 
 pub fn interactive_main() -> anyhow::Result<()> {
-    let ctx = Context::new(ContextMode::Run, true, &vec![], true)?;
+    let ctx = Context::new(ContextMode::Run, true, &[], true)?;
 
     interactive(&ctx)?;
     Ok(())

implants/golem/src/main.rs

@@ -55,7 +55,7 @@ async fn run_tomes(tomes: Vec<ParsedTome>) -> Result<Vec<String>> {
         };
         let mut out = handle.output.collect();
         let errors = handle.output.collect_errors();
-        if errors.len() > 0 {
+        if !errors.is_empty() {
             return Err(anyhow!("tome execution failed: {:?}", errors));
         }
         println!("OUTPUT: {:?}", out);
@@ -108,7 +108,7 @@ fn main() -> anyhow::Result<()> {
             }
         };
 
-        if result.len() > 0 {
+        if !result.is_empty() {
             println!("{:?}", result);
         }
         process::exit(error_code);
@@ -117,10 +117,7 @@ fn main() -> anyhow::Result<()> {
     } else {
         let mut parsed_tomes: Vec<ParsedTome> = Vec::new();
         for embedded_file_path in eldritch::assets::Asset::iter() {
-            let filename = match embedded_file_path.split(r#"/"#).last() {
-                Some(local_filename) => local_filename,
-                None => "",
-            };
+            let filename = embedded_file_path.split('/').last().unwrap_or("");
             println!("{}", embedded_file_path);
             if filename == "main.eldritch" {
                 let tome_path = embedded_file_path.to_string().clone();
@@ -161,7 +158,7 @@ fn main() -> anyhow::Result<()> {
             }
         };
 
-        if result.len() > 0 {
+        if !result.is_empty() {
             println!("{:?}", result);
         }
         process::exit(error_code);

implants/golem/tests/cli.rs

@@ -32,9 +32,7 @@ fn test_golem_main_syntax_fail() -> anyhow::Result<()> {
     cmd.arg(format!("{GOLEM_CLI_TEST_DIR}syntax_fail.tome"));
     cmd.assert()
         .failure()
-        .stderr(predicate::str::contains(format!(
-            r#"Parse error: unexpected string literal "win" here"#
-        )));
+        .stderr(predicate::str::contains(r#"Parse error: unexpected string literal "win" here"#.to_string()));
 
     Ok(())
 }

implants/imix/src/agent.rs

@@ -108,7 +108,7 @@ impl Agent {
                 }
             };
 
-            let interval = self.info.interval.clone();
+            let interval = self.info.interval;
             let delay = match interval.checked_sub(start.elapsed().as_secs()) {
                 Some(secs) => Duration::from_secs(secs),
                 None => Duration::from_secs(0),

implants/imix/src/config.rs

@@ -19,7 +19,7 @@ macro_rules! callback_uri {
  * Compile-time constant for the agent callback URI, derived from the IMIX_CALLBACK_URI environment variable during compilation.
  * Defaults to "http://127.0.0.1:80/grpc" if this is unset.
  */
-pub const CALLBACK_URI: &'static str = callback_uri!();
+pub const CALLBACK_URI: &str = callback_uri!();
 
 macro_rules! callback_interval {
     () => {
@@ -32,7 +32,7 @@ macro_rules! callback_interval {
 /* Compile-time constant for the agent retry interval, derived from the IMIX_RETRY_INTERVAL environment variable during compilation.
  * Defaults to 5 if unset.
  */
-pub const CALLBACK_INTERVAL: &'static str = callback_interval!();
+pub const CALLBACK_INTERVAL: &str = callback_interval!();
 
 macro_rules! retry_interval {
     () => {
@@ -45,7 +45,7 @@ macro_rules! retry_interval {
 /* Compile-time constant for the agent callback interval, derived from the IMIX_CALLBACK_INTERVAL environment variable during compilation.
  * Defaults to 5 if unset.
  */
-pub const RETRY_INTERVAL: &'static str = retry_interval!();
+pub const RETRY_INTERVAL: &str = retry_interval!();
 
 /*
  * Config holds values necessary to configure an Agent.
@@ -82,7 +82,7 @@ impl Default for Config {
                     #[cfg(debug_assertions)]
                     log::error!("failed to parse callback interval constant, defaulting to 5 seconds: {_err}");
 
-                    5 as u64
+                    5_u64
                 }
             },
             host: Some(host),
@@ -100,7 +100,7 @@ impl Default for Config {
                         "failed to parse retry interval constant, defaulting to 5 seconds: {_err}"
                     );
 
-                    5 as u64
+                    5_u64
                 }
             },
         }
@@ -155,10 +155,7 @@ fn get_host_id(file_path: String) -> String {
     // Read Existing Host ID
     let path = Path::new(file_path.as_str());
     if path.exists() {
-        match fs::read_to_string(path) {
-            Ok(host_id) => return host_id.trim().to_string(),
-            Err(_) => {}
-        }
+        if let Ok(host_id) = fs::read_to_string(path) { return host_id.trim().to_string() }
     }
 
     // Generate New
@@ -179,7 +176,7 @@ fn get_host_id(file_path: String) -> String {
         }
     };
 
-    return host_id;
+    host_id
 }
 
 /*

implants/imix/src/install.rs

@@ -8,10 +8,7 @@ pub async fn install() {
 
     // Iterate through all embedded files
     for embedded_file_path in eldritch::assets::Asset::iter() {
-        let filename = match embedded_file_path.split(r#"/"#).last() {
-            Some(local_filename) => local_filename,
-            None => "",
-        };
+        let filename = embedded_file_path.split('/').last().unwrap_or("");
 
         #[cfg(debug_assertions)]
         log::debug!("checking asset {embedded_file_path}");
@@ -75,7 +72,7 @@ fn load_embedded_eldritch(path: String) -> Result<String> {
             #[cfg(debug_assertions)]
             log::error!("no asset file at {}", path);
 
-            return Err(anyhow!("no asset file at {}", path));
+            Err(anyhow!("no asset file at {}", path))
         }
     }
 }

implants/imix/src/main.rs

@@ -8,16 +8,12 @@ async fn main() {
     #[cfg(debug_assertions)]
     init_logging();
 
-    match Command::new("imix")
+    if let Some(("install", _)) = Command::new("imix")
         .subcommand(Command::new("install").about("Install imix"))
         .get_matches()
-        .subcommand()
-    {
-        Some(("install", _)) => {
-            imix::install().await;
-            return;
-        }
-        _ => {}
+        .subcommand() {
+        imix::install().await;
+        return;
     }
 
     loop {

implants/imix/src/task.rs

@@ -31,12 +31,9 @@ impl TaskHandle {
         let exec_started_at = self.output.get_exec_started_at();
         let exec_finished_at = self.output.get_exec_finished_at();
         let text = self.output.collect();
-        let err = match self.output.collect_errors().pop() {
-            Some(err) => Some(TaskError {
+        let err = self.output.collect_errors().pop().map(|err| TaskError {
                 msg: err.to_string(),
-            }),
-            None => None,
-        };
+            });
 
         #[cfg(debug_assertions)]
         log::info!(
@@ -57,7 +54,7 @@ impl TaskHandle {
             }
         );
 
-        if text.len() > 0
+        if !text.is_empty()
             || err.is_some()
             || exec_started_at.is_some()
             || exec_finished_at.is_some()
@@ -71,8 +68,8 @@ impl TaskHandle {
                         id: self.id,
                         output: text.join(""),
                         error: err,
-                        exec_started_at: exec_started_at,
-                        exec_finished_at: exec_finished_at,
+                        exec_started_at,
+                        exec_finished_at,
                     }),
                 })
                 .await?;

implants/imix/src/version.rs

@@ -4,4 +4,4 @@ macro_rules! crate_version {
     };
 }
 
-pub const VERSION: &'static str = crate_version!();
+pub const VERSION: &str = crate_version!();

implants/lib/eldritch/src/assets.rs

@@ -69,6 +69,7 @@ impl<'v> UnpackValue<'v> for AssetsLibrary {
 // This is where all of the "assets.X" impl methods are bound
 #[starlark_module]
 #[rustfmt::skip]
+#[allow(clippy::needless_lifetimes, clippy::type_complexity, clippy::too_many_arguments)]
 fn methods(builder: &mut MethodsBuilder) {
     fn copy(this: AssetsLibrary, src: String, dest: String) -> anyhow::Result<NoneType> {
         if false { println!("Ignore unused this var. _this isn't allowed by starlark. {:?}", this); }

implants/lib/eldritch/src/assets/copy_impl.rs

@@ -28,7 +28,7 @@ mod tests {
         // Run our code
         #[cfg(any(target_os = "linux", target_os = "macos"))]
         copy("exec_script/hello_world.sh".to_string(), path_dst)?;
-        #[cfg(any(target_os = "windows"))]
+        #[cfg(target_os = "windows")]
         copy("exec_script/hello_world.bat".to_string(), path_dst)?;
 
         // Read

implants/lib/eldritch/src/crypto.rs

@@ -53,6 +53,7 @@ impl<'v> UnpackValue<'v> for CryptoLibrary {
 // This is where all of the "crypto.X" impl methods are bound
 #[starlark_module]
 #[rustfmt::skip]
+#[allow(clippy::needless_lifetimes, clippy::type_complexity, clippy::too_many_arguments)]
 fn methods(builder: &mut MethodsBuilder) {
     fn aes_encrypt_file<'v>(this: CryptoLibrary, src: String, dst: String, key: String) -> anyhow::Result<NoneType> {
         if false { println!("Ignore unused this var. _this isn't allowed by starlark. {:?}", this); }

implants/lib/eldritch/src/crypto/aes_decrypt_file_impl.rs

@@ -44,12 +44,24 @@ pub fn decrypt_file(src: String, dst: String, key: String) -> Result<()> {
                     }
                 }
                 if !invalid {
-                    out_file.write(&block[..(16 - last_byte) as usize])?;
+                    match out_file.write(&block[..(16 - last_byte) as usize]) {
+                        Ok(_) => {}
+                        Err(_err) => {
+                            #[cfg(debug_assertions)]
+                            log::error!("failed to decrypt file: {_err}");
+                        }
+                    };
                     continue;
                 }
             }
         }
-        out_file.write(&block)?;
+        match out_file.write(&block) {
+            Ok(_) => {}
+            Err(_err) => {
+                #[cfg(debug_assertions)]
+                log::error!("failed to decrypt file: {_err}");
+            }
+        };
         block = GenericArray::from([0u8; 16]);
     }
     drop(src_file);
@@ -80,7 +92,13 @@ mod tests {
         let test_dec_path = tmp_dir.path().join("test.txt.dec");
         {
             let mut tmp_file = File::create(test_path.clone())?;
-            tmp_file.write(&lorem_encrypted)?;
+            match tmp_file.write(&lorem_encrypted) {
+                Ok(_) => {}
+                Err(_err) => {
+                    #[cfg(debug_assertions)]
+                    log::error!("failed to decrypt file: {_err}");
+                }
+            };
         }
         decrypt_file(
             test_path.to_str().unwrap().to_owned(),
@@ -137,7 +155,13 @@ mod tests {
         let test_path = tmp_dir.path().join("test.txt");
         {
             let mut tmp_file = File::create(test_path.clone())?;
-            tmp_file.write(&[0u8; 15])?;
+            match tmp_file.write(&[0u8; 15]) {
+                Ok(_) => {}
+                Err(_err) => {
+                    #[cfg(debug_assertions)]
+                    log::error!("failed to decrypt file: {_err}");
+                }
+            };
         }
         assert!(decrypt_file(
             test_path.to_str().unwrap().to_owned(),

implants/lib/eldritch/src/crypto/aes_encrypt_file_impl.rs

@@ -36,7 +36,13 @@ pub fn encrypt_file(src: String, dst: String, key: String) -> Result<()> {
             block = GenericArray::from_iter(short_buffer);
         }
         cipher.encrypt_block(&mut block);
-        out_file.write(&block)?;
+        match out_file.write(&block) {
+            Ok(_) => {}
+            Err(_err) => {
+                #[cfg(debug_assertions)]
+                log::error!("failed to encrypt file: {_err}");
+            }
+        };
         block = GenericArray::from([0u8; 16]);
     }
     drop(src_file);