From d9e8b9c0c4f730ebb5aadb2ebc38915c3fc24dda Mon Sep 17 00:00:00 2001
From: joshua-ostrom <joshua.ostrom@coinbase.com>
Date: Wed, 22 Mar 2023 10:33:49 -0400
Subject: [PATCH] Newer cargo audit and trufflehog

---
 Dockerfile                                  | 11 ++++++-----
 lib/salus/scanners/cargo_audit.rb           |  4 ++--
 lib/salus/scanners/trufflehog.rb            |  2 +-
 spec/lib/salus/scanners/cargo_audit_spec.rb |  4 ++--
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 25f93bbc..7a908a4c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -38,12 +38,13 @@ ENV GRADLE_HOME="/opt/gradle/gradle-7.5.1"
 ENV PATH="${GRADLE_HOME}/bin:${PATH}"
 
 ### Rust
-ENV RUST_VERSION 1.58.1
+ENV RUST_VERSION 1.68.0
 # Add a .sha256 to the rust download URL to get this sha
-ENV RUST_VERSION_SHA256 4fac6df9ea49447682c333e57945bebf4f9f45ec7b08849e507a64b2ccd5f8fb
+ENV RUST_VERSION_SHA256 7be1acdac656d0b0b7e909e5c0d4ddf61c755c203ec26ebafbd306322335b361
 ENV RUST_TARBALL_FILE rust-${RUST_VERSION}-x86_64-unknown-linux-gnu.tar.gz
 ENV RUST_DOWNLOAD_URL https://static.rust-lang.org/dist/${RUST_TARBALL_FILE}
-ENV CARGO_AUDIT_VERSION 0.14.0
+ENV CARGO_AUDIT_VERSION 0.17.4
+
 
 # Download manually and verify the hash
 RUN curl -fsSL "$RUST_DOWNLOAD_URL" -o rust.tar.gz \
@@ -105,10 +106,10 @@ RUN go install github.com/svent/sift@${SIFT_VERSION}
 
 ### truffle hog
 
-ENV TRUFFLEHOG_VERSION 3.19.0
+ENV TRUFFLEHOG_VERSION 3.29.1
 ENV TRUFFLEHOG_TARBALL trufflehog_${TRUFFLEHOG_VERSION}_linux_amd64.tar.gz
 ENV TRUFFLEHOG_DOWNLOAD_URL https://github.com/trufflesecurity/trufflehog/releases/download/v${TRUFFLEHOG_VERSION}/${TRUFFLEHOG_TARBALL}
-ENV TRUFFLEHOG_DOWNLOAD_SHA c481e856e90af1a19ee847838adaa15220c3b0cf147ba940f88c23fb067bdcf3
+ENV TRUFFLEHOG_DOWNLOAD_SHA 7baf586edb3fda4954366afa121290a40f1cc60bef48d1deeff40a5415cdb6e9
 
 RUN mkdir /root/trufflehog_files
 RUN curl -fsSL "$TRUFFLEHOG_DOWNLOAD_URL" -o trufflehog.tar.gz \
diff --git a/lib/salus/scanners/cargo_audit.rb b/lib/salus/scanners/cargo_audit.rb
index cbd1d45b..152d1e7a 100644
--- a/lib/salus/scanners/cargo_audit.rb
+++ b/lib/salus/scanners/cargo_audit.rb
@@ -62,7 +62,7 @@ def run
     end
 
     def version
-      shell_return = run_shell('cargo audit --version')
+      shell_return = run_shell('cargo-audit --version')
       # stdout looks like "cargo-audit 0.12.0\n"
       shell_return.stdout&.split&.dig(1)
     end
@@ -110,7 +110,7 @@ def command
       opts << "-c never" # to prevent color chars in stderr upon failure
       opts += fetch_exception_ids.map { |id| "--ignore #{id}" }
 
-      "cargo audit #{opts.join(' ')}"
+      "cargo-audit audit #{opts.join(' ')}"
     end
   end
 end
diff --git a/lib/salus/scanners/trufflehog.rb b/lib/salus/scanners/trufflehog.rb
index e593b442..33d7e75f 100644
--- a/lib/salus/scanners/trufflehog.rb
+++ b/lib/salus/scanners/trufflehog.rb
@@ -27,7 +27,7 @@ def self.supported_languages
     end
 
     def command
-      cmd = "trufflehog filesystem --directory=. --json --no-update"
+      cmd = "trufflehog filesystem --json --no-update ."
       # default to true
       if @config['only-verified'].to_s == 'true' || @config['only-verified'].to_s == ''
         cmd += ' --only-verified'
diff --git a/spec/lib/salus/scanners/cargo_audit_spec.rb b/spec/lib/salus/scanners/cargo_audit_spec.rb
index c4c8ee23..60b8fc4e 100644
--- a/spec/lib/salus/scanners/cargo_audit_spec.rb
+++ b/spec/lib/salus/scanners/cargo_audit_spec.rb
@@ -122,8 +122,8 @@
       expect(scanner).not_to receive(:report_stdout)
       expect(scanner).not_to receive(:log)
       expect(scanner).to receive(:report_error).and_call_original
-      error = "error: Couldn't load Cargo.lock: I/O error: I/O operation failed: " \
-              "couldn't open Cargo.lock: No such file or directory (os error 2)\n"
+      error = "error: not found: Couldn't load Cargo.lock: I/O operation failed: " \
+              "I/O operation failed: NotFound\n"
       expect(scanner).to receive(:report_stderr).with(error)
 
       scanner.run