clippy fixes

Author: cutler-scott-newrelic

src/bin/ankamali_hog.rs

@@ -76,10 +76,10 @@ fn run(arg_matches: &ArgMatches) -> Result<(), SimpleError> {
     // Initialize some variables
     let oauthsecretfile = arg_matches
         .value_of("OAUTHSECRETFILE")
-        .unwrap_or_else(|| "clientsecret.json");
+        .unwrap_or("clientsecret.json");
     let oauthtokenfile = arg_matches
         .value_of("OAUTHTOKENFILE")
-        .unwrap_or_else(|| "temp_token");
+        .unwrap_or("temp_token");
     let file_id = arg_matches.value_of("GDRIVEID").unwrap();
     let secret_scanner = SecretScannerBuilder::new().conf_argm(arg_matches).build();
     let gdrive_scanner = GDriveScanner::new_from_scanner(secret_scanner);

src/bin/berkshire_hog.rs

@@ -41,7 +41,6 @@ use url::Url;
 use rusty_hogs::aws_scanning::{S3Finding, S3Scanner};
 use rusty_hogs::{SecretScanner, SecretScannerBuilder};
 use std::collections::HashSet;
-use std::iter::FromIterator;
 
 /// Main entry function that uses the [clap crate](https://docs.rs/clap/2.33.0/clap/)
 fn main() {
@@ -159,7 +158,7 @@ fn run(arg_matches: &ArgMatches) -> Result<(), SimpleError> {
     }
 
     // Output the results
-    let findings: HashSet<S3Finding> = HashSet::from_iter(findings.into_iter());
+    let findings: HashSet<S3Finding> = findings.into_iter().collect();
     info!("Found {} secrets", findings.len());
     match s3scanner.secret_scanner.output_findings(&findings) {
         Ok(_) => Ok(()),

src/bin/berkshire_hog_lambda.rs

@@ -26,7 +26,6 @@ use s3::region::Region;
 use serde_derive::{Deserialize, Serialize};
 use simple_error::SimpleError;
 use std::env;
-use std::error::Error;
 use std::time::SystemTime;
 use simple_logger::SimpleLogger;
 
@@ -106,10 +105,9 @@ struct Finding {
     reason: String,
 }
 
-fn main() -> Result<(), Box<dyn Error>> {
+fn main() {
     SimpleLogger::new().with_level(LevelFilter::Debug).init().unwrap();
     lambda!(my_handler);
-    Ok(())
 }
 
 fn my_handler(e: CustomEvent, _c: Context) -> Result<CustomOutput, HandlerError> {

src/bin/duroc_hog.rs

@@ -171,7 +171,7 @@ where
     C: FnMut(&Path),
 {
     for entry in WalkDir::new(fspath).into_iter().filter_map(|e| e.ok()) {
-        if entry.file_type().is_file() && &PathBuf::from(entry.path()).clean() != output_file {
+        if entry.file_type().is_file() && PathBuf::from(entry.path()).clean() != output_file {
             closure(&entry.path());
         }
     }
@@ -214,7 +214,7 @@ fn scan_file<R: Read + io::Seek>(
     let path_string = String::from(Path::new(path_prefix).join(file_path).to_str().unwrap());
     info!("scan_file({:?})", path_string);
     let ext: String = match file_path.extension() {
-        Some(osstr) => String::from(osstr.to_str().unwrap_or_else(|| "")).to_ascii_lowercase(),
+        Some(osstr) => String::from(osstr.to_str().unwrap_or("")).to_ascii_lowercase(),
         None => String::from(""),
     };
 

src/bin/essex_hog.rs

@@ -22,12 +22,12 @@
 //! ARGS:
 //!     <PAGEID>    The ID (e.g. 1234) of the confluence page you want to scan
 //!     <URL>       Base URL of Confluence instance (e.g. https://newrelic.atlassian.net/)
-//! 				From https://docs.atlassian.com/ConfluenceServer/rest/7.11.0/ Structure of the REST URIs section
-//! 				for details on declaring the base url with or without context
-//! 				With context: http://host:port/context/rest/api/resource-name
-//! 				Or without context: http://host:port/rest/api/resource-name
-//! 				Example with context: http://example.com:8080/confluence/rest/api/space/ds
-//! 				Example without context: http://confluence.myhost.com:8095/rest/api/space/ds
+//!                 From https://docs.atlassian.com/ConfluenceServer/rest/7.11.0/ Structure of the REST URIs section
+//!                 for details on declaring the base url with or without context
+//!                 With context: http://host:port/context/rest/api/resource-name
+//!                 Or without context: http://host:port/rest/api/resource-name
+//!                 Example with context: http://example.com:8080/confluence/rest/api/space/ds
+//!                 Example without context: http://confluence.myhost.com:8095/rest/api/space/ds
 
 #[macro_use]
 extern crate clap;
@@ -50,7 +50,6 @@ use serde_json::{Map, Value};
 use simple_error::SimpleError;
 use std::collections::{BTreeMap, HashSet};
 use std::io::Read;
-use std::iter::FromIterator;
 use url::Url;
 
 /// `serde_json` object that represents a single found secret - finding
@@ -112,7 +111,7 @@ fn run(arg_matches: &ArgMatches) -> Result<(), SimpleError> {
     let authtoken = arg_matches.value_of("BEARERTOKEN");
     let base_url_input = arg_matches
         .value_of("URL")
-        .unwrap_or_else(|| "https://confluence.atlassian.com")
+        .unwrap_or("https://confluence.atlassian.com")
         .trim_end_matches('/');
     let base_url_as_url = Url::parse(base_url_input).unwrap();
     let page_id = arg_matches
@@ -152,7 +151,7 @@ fn run(arg_matches: &ArgMatches) -> Result<(), SimpleError> {
     let secrets = get_findings(&secret_scanner, page_id, content.as_bytes(), &page.web_link);
 
     // combine and output the results
-    let findings: HashSet<ConfluenceFinding> = HashSet::from_iter(secrets.into_iter());
+    let findings: HashSet<ConfluenceFinding> = secrets.into_iter().collect();
     info!("Found {} secrets", findings.len());
     match secret_scanner.output_findings(&findings) {
         Ok(_) => Ok(()),
@@ -273,7 +272,7 @@ fn get_findings(
             }
             if !secrets_for_reason.is_empty() {
                 secrets.push(ConfluenceFinding {
-                    strings_found: Vec::from_iter(secrets_for_reason.iter().cloned()),
+                    strings_found: secrets_for_reason.iter().cloned().collect(),
                     page_id: String::from(issue_id),
                     reason,
                     url: String::from(web_link),

src/bin/gottingen_hog.rs

@@ -43,7 +43,6 @@ use serde_json::{Map, Value};
 use simple_error::SimpleError;
 use std::collections::{BTreeMap, HashSet};
 use std::io::Read;
-use std::iter::FromIterator;
 use url::Url;
 
 /// `serde_json` object that represents a single found secret - finding
@@ -98,7 +97,7 @@ fn run(arg_matches: &ArgMatches) -> Result<(), SimpleError> {
     let jiraauthtoken = arg_matches.value_of("BEARERTOKEN");
     let base_url_input = arg_matches
         .value_of("JIRAURL")
-        .unwrap_or_else(|| "https://jira.atlassian.com/");
+        .unwrap_or("https://jira.atlassian.com/");
     let base_url_as_url = Url::parse(base_url_input).unwrap();
     let issue_id = arg_matches
         .value_of("JIRAID") // TODO validate the format somehow
@@ -183,7 +182,7 @@ fn run(arg_matches: &ArgMatches) -> Result<(), SimpleError> {
     }
 
     // combine and output the results
-    let findings: HashSet<JiraFinding> = HashSet::from_iter(secrets.into_iter());
+    let findings: HashSet<JiraFinding> = secrets.into_iter().collect();
     info!("Found {} secrets", findings.len());
     match secret_scanner.output_findings(&findings) {
         Ok(_) => Ok(()),
@@ -229,6 +228,7 @@ fn get_findings(
     let mut secrets: Vec<JiraFinding> = Vec::new();
     let web_link = format!("{}browse/{}", base_url, issue_id);
     for new_line in lines {
+        debug!("{:?}", std::str::from_utf8(new_line));
         let matches_map: BTreeMap<String, Vec<RustyHogMatch>> =
             secret_scanner.matches_entropy(new_line);
         for (reason, match_iterator) in matches_map {
@@ -245,7 +245,7 @@ fn get_findings(
             }
             if !secrets_for_reason.is_empty() {
                 secrets.push(JiraFinding {
-                    strings_found: Vec::from_iter(secrets_for_reason.iter().cloned()),
+                    strings_found: secrets_for_reason.iter().cloned().collect(),
                     issue_id: String::from(issue_id),
                     reason,
                     url: web_link.clone(),

src/git_scanning.rs

@@ -123,7 +123,7 @@ impl GitScanner {
         let repo_option = self.repo.as_ref(); //borrowing magic here!
         let repo = repo_option.unwrap();
         let mut revwalk = repo.revwalk().unwrap();
-        revwalk.push_glob(glob.unwrap_or_else(|| "*")).unwrap(); //easy mode: iterate over all the commits
+        revwalk.push_glob(glob.unwrap_or("*")).unwrap(); //easy mode: iterate over all the commits
 
         // take our "--since_commit" input (hash id) and convert it to a date and time
         // and build our revwalk with a filter for commits >= that time. This isn't a perfect
@@ -207,8 +207,8 @@ impl GitScanner {
                 }
                 let old_file_id = delta.old_file().id();
                 let new_file_id = delta.new_file().id();
-                let old_line_num = line.old_lineno().unwrap_or_else(|| 0);
-                let new_line_num = line.new_lineno().unwrap_or_else(|| 0);
+                let old_line_num = line.old_lineno().unwrap_or(0);
+                let new_line_num = line.new_lineno().unwrap_or(0);
 
                 for (reason, match_iterator) in matches_map {
                     let mut secrets: Vec<String> = Vec::new();
@@ -462,7 +462,7 @@ impl fmt::Debug for GitScanner {
             Some(repo_obj) => repo_obj
                 .path()
                 .to_str()
-                .unwrap_or_else(|| "<path unwrap error>"),
+                .unwrap_or("<path unwrap error>"),
         };
         write!(
             f,
@@ -479,7 +479,7 @@ impl fmt::Display for GitScanner {
             Some(repo_obj) => repo_obj
                 .path()
                 .to_str()
-                .unwrap_or_else(|| "<path unwrap error>"),
+                .unwrap_or("<path unwrap error>"),
         };
         let scheme_string: String = match self.scheme.as_ref() {
             None => String::from("None"),

src/google_scanning.rs

@@ -85,7 +85,6 @@ use serde_derive::{Deserialize, Serialize};
 use simple_error::SimpleError;
 use std::collections::HashSet;
 use std::io::Read;
-use std::iter::FromIterator;
 use yup_oauth2::{Authenticator, DefaultAuthenticatorDelegate, DiskTokenStorage};
 
 #[derive(Serialize, Deserialize, Debug, PartialEq, Eq, Hash, Clone, Default)]
@@ -286,7 +285,7 @@ impl GDriveScanner {
             }
         }
 
-        HashSet::from_iter(findings.into_iter())
+        findings.into_iter().collect()
     }
 }
 

src/lib.rs

@@ -85,7 +85,6 @@ use std::collections::{BTreeMap, HashMap, HashSet};
 use std::fs::File;
 use std::hash::{Hash, Hasher};
 use std::io::BufReader;
-use std::iter::FromIterator;
 use std::ops::Range;
 use std::path::Path;
 use std::{fmt, fs, str};
@@ -626,10 +625,7 @@ impl SecretScannerBuilder {
                         },
                         None => None,
                     };
-                    let make_ascii_lowercase_processed = match make_ascii_lowercase {
-                        Some(b) => b,
-                        None => false,
-                    };
+                    let make_ascii_lowercase_processed = make_ascii_lowercase.unwrap_or(false);
                     (
                         k,
                         EntropyRegex {
@@ -743,14 +739,14 @@ impl SecretScanner {
 
     /// Helper function to determine whether a byte array only contains valid Base64 characters.
     fn is_base64_string(string_in: &[u8]) -> bool {
-        let hashset_string_in: HashSet<&u8> = HashSet::from_iter(string_in.iter());
-        hashset_string_in.is_subset(&HashSet::from_iter(B64_ENCODE.iter()))
+        let hashset_string_in: HashSet<&u8> = string_in.iter().collect();
+        hashset_string_in.is_subset(&B64_ENCODE.iter().collect())
     }
 
     /// Helper function to determine whether a byte array only contains valid hex characters.
     fn is_hex_string(string_in: &[u8]) -> bool {
-        let hashset_string_in: HashSet<&u8> = HashSet::from_iter(string_in.iter());
-        hashset_string_in.is_subset(&HashSet::from_iter(HEX_ENCODE.iter()))
+        let hashset_string_in: HashSet<&u8> = string_in.iter().collect();
+        hashset_string_in.is_subset(&HEX_ENCODE.iter().collect())
     }
 
     /// Compute the Shannon entropy for a byte array (from https://docs.rs/crate/entropy/0.3.0/source/src/lib.rs)