Fix runContrastCodeSec_OnSource.sh script. Add Snyk version to runSnyk

scripts. Delete all the .xml metadata files for each test case .java file as they aren't needed. All that info is in the expectedresults.csv file for the entire test suite.
OWASP-Benchmark · Jan 24, 2025 · f190e05 · f190e05
1 parent 00931b7
commit f190e05
Show file tree

Hide file tree

Showing 2,744 changed files with 20 additions and 19,184 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,12 +6,12 @@
 .settings/
 .idea/
 *.iml
+.scannerwork/
 
 data/out.csv
 owasp-benchmark/
 reports/
-.scannerwork/
-scripts/SonarQubeCredentials.sh
+src.zip
 src/main/resources/benchmark.properties
 target/
 testfiles/

diff --git a/scripts/runContrastCodeSec_OnSource.sh b/scripts/runContrastCodeSec_OnSource.sh
@@ -5,9 +5,17 @@
 # brew tap contrastsecurity/tap
 # brew install contrast
 
+# To scan the source code you have to create a .zip of the src/ directory so src.zip exists in the project's root folder.
+
+if [ -f "./src.zip" ]; then
+
 # Note: you have to do 'contrast auth' first, and successfully authenticate before you can run this.
 benchmark_version=$(scripts/getBenchmarkVersion.sh)
 
-contrast scan -f src --save
+contrast scan -f src.zip --timeout=10000 --save
 mv results.sarif results/Benchmark_$benchmark_version-ContrastCodeSec_OnSrc.sarif
 
+else
+  echo "ERROR: You must create a .zip of the src directory first, before running this script."
+fi
+
diff --git a/scripts/runSnykSAST.sh b/scripts/runSnykSAST.sh
@@ -1,4 +1,6 @@
 # Install Snyk per: https://docs.snyk.io/snyk-cli/install-or-update-the-snyk-cli
 benchmark_version=$(scripts/getBenchmarkVersion.sh)
-snyk code test --sarif-file-output=results/Benchmark_$benchmark_version-snykCodeCli.sarif
+Snyk_version=$(snyk -v)
+
+snyk code --sarif-file-output=results/Benchmark_$benchmark_version-snykCodeCli-v$Snyk_version.sarif
 
diff --git a/scripts/runSnykSAST_OnWindows.sh b/scripts/runSnykSAST_OnWindows.sh
@@ -0,0 +1,6 @@
+# Install Snyk per: https://docs.snyk.io/snyk-cli/install-or-update-the-snyk-cli
+benchmark_version=$(scripts/getBenchmarkVersion.sh)
+Snyk_version=$(snyk-win -v)
+
+snyk-win code test --sarif-file-output=results/Benchmark_$benchmark_version-snykCodeCli-v$Snyk_version.sarif
+
diff --git a/src/main/java/org/owasp/benchmark/testcode/BenchmarkTest00001.xml b/src/main/java/org/owasp/benchmark/testcode/BenchmarkTest00001.xml
diff --git a/src/main/java/org/owasp/benchmark/testcode/BenchmarkTest00002.xml b/src/main/java/org/owasp/benchmark/testcode/BenchmarkTest00002.xml
diff --git a/src/main/java/org/owasp/benchmark/testcode/BenchmarkTest00003.xml b/src/main/java/org/owasp/benchmark/testcode/BenchmarkTest00003.xml
diff --git a/src/main/java/org/owasp/benchmark/testcode/BenchmarkTest00004.xml b/src/main/java/org/owasp/benchmark/testcode/BenchmarkTest00004.xml
diff --git a/src/main/java/org/owasp/benchmark/testcode/BenchmarkTest00005.xml b/src/main/java/org/owasp/benchmark/testcode/BenchmarkTest00005.xml
diff --git a/src/main/java/org/owasp/benchmark/testcode/BenchmarkTest00006.xml b/src/main/java/org/owasp/benchmark/testcode/BenchmarkTest00006.xml
diff --git a/src/main/java/org/owasp/benchmark/testcode/BenchmarkTest00007.xml b/src/main/java/org/owasp/benchmark/testcode/BenchmarkTest00007.xml
diff --git a/src/main/java/org/owasp/benchmark/testcode/BenchmarkTest00008.xml b/src/main/java/org/owasp/benchmark/testcode/BenchmarkTest00008.xml
diff --git a/src/main/java/org/owasp/benchmark/testcode/BenchmarkTest00009.xml b/src/main/java/org/owasp/benchmark/testcode/BenchmarkTest00009.xml
diff --git a/src/main/java/org/owasp/benchmark/testcode/BenchmarkTest00010.xml b/src/main/java/org/owasp/benchmark/testcode/BenchmarkTest00010.xml
diff --git a/src/main/java/org/owasp/benchmark/testcode/BenchmarkTest00011.xml b/src/main/java/org/owasp/benchmark/testcode/BenchmarkTest00011.xml
diff --git a/src/main/java/org/owasp/benchmark/testcode/BenchmarkTest00012.xml b/src/main/java/org/owasp/benchmark/testcode/BenchmarkTest00012.xml
diff --git a/src/main/java/org/owasp/benchmark/testcode/BenchmarkTest00013.xml b/src/main/java/org/owasp/benchmark/testcode/BenchmarkTest00013.xml
diff --git a/src/main/java/org/owasp/benchmark/testcode/BenchmarkTest00014.xml b/src/main/java/org/owasp/benchmark/testcode/BenchmarkTest00014.xml
diff --git a/src/main/java/org/owasp/benchmark/testcode/BenchmarkTest00015.xml b/src/main/java/org/owasp/benchmark/testcode/BenchmarkTest00015.xml
diff --git a/src/main/java/org/owasp/benchmark/testcode/BenchmarkTest00016.xml b/src/main/java/org/owasp/benchmark/testcode/BenchmarkTest00016.xml
diff --git a/src/main/java/org/owasp/benchmark/testcode/BenchmarkTest00017.xml b/src/main/java/org/owasp/benchmark/testcode/BenchmarkTest00017.xml
diff --git a/src/main/java/org/owasp/benchmark/testcode/BenchmarkTest00018.xml b/src/main/java/org/owasp/benchmark/testcode/BenchmarkTest00018.xml
diff --git a/src/main/java/org/owasp/benchmark/testcode/BenchmarkTest00019.xml b/src/main/java/org/owasp/benchmark/testcode/BenchmarkTest00019.xml
diff --git a/src/main/java/org/owasp/benchmark/testcode/BenchmarkTest00020.xml b/src/main/java/org/owasp/benchmark/testcode/BenchmarkTest00020.xml
diff --git a/src/main/java/org/owasp/benchmark/testcode/BenchmarkTest00021.xml b/src/main/java/org/owasp/benchmark/testcode/BenchmarkTest00021.xml
diff --git a/src/main/java/org/owasp/benchmark/testcode/BenchmarkTest00022.xml b/src/main/java/org/owasp/benchmark/testcode/BenchmarkTest00022.xml
diff --git a/src/main/java/org/owasp/benchmark/testcode/BenchmarkTest00023.xml b/src/main/java/org/owasp/benchmark/testcode/BenchmarkTest00023.xml
diff --git a/src/main/java/org/owasp/benchmark/testcode/BenchmarkTest00024.xml b/src/main/java/org/owasp/benchmark/testcode/BenchmarkTest00024.xml
diff --git a/src/main/java/org/owasp/benchmark/testcode/BenchmarkTest00025.xml b/src/main/java/org/owasp/benchmark/testcode/BenchmarkTest00025.xml
diff --git a/src/main/java/org/owasp/benchmark/testcode/BenchmarkTest00026.xml b/src/main/java/org/owasp/benchmark/testcode/BenchmarkTest00026.xml
diff --git a/src/main/java/org/owasp/benchmark/testcode/BenchmarkTest00027.xml b/src/main/java/org/owasp/benchmark/testcode/BenchmarkTest00027.xml
diff --git a/src/main/java/org/owasp/benchmark/testcode/BenchmarkTest00028.xml b/src/main/java/org/owasp/benchmark/testcode/BenchmarkTest00028.xml
diff --git a/src/main/java/org/owasp/benchmark/testcode/BenchmarkTest00029.xml b/src/main/java/org/owasp/benchmark/testcode/BenchmarkTest00029.xml
diff --git a/src/main/java/org/owasp/benchmark/testcode/BenchmarkTest00030.xml b/src/main/java/org/owasp/benchmark/testcode/BenchmarkTest00030.xml
diff --git a/src/main/java/org/owasp/benchmark/testcode/BenchmarkTest00031.xml b/src/main/java/org/owasp/benchmark/testcode/BenchmarkTest00031.xml
diff --git a/src/main/java/org/owasp/benchmark/testcode/BenchmarkTest00032.xml b/src/main/java/org/owasp/benchmark/testcode/BenchmarkTest00032.xml
diff --git a/src/main/java/org/owasp/benchmark/testcode/BenchmarkTest00033.xml b/src/main/java/org/owasp/benchmark/testcode/BenchmarkTest00033.xml
diff --git a/src/main/java/org/owasp/benchmark/testcode/BenchmarkTest00034.xml b/src/main/java/org/owasp/benchmark/testcode/BenchmarkTest00034.xml
diff --git a/src/main/java/org/owasp/benchmark/testcode/BenchmarkTest00035.xml b/src/main/java/org/owasp/benchmark/testcode/BenchmarkTest00035.xml
diff --git a/src/main/java/org/owasp/benchmark/testcode/BenchmarkTest00036.xml b/src/main/java/org/owasp/benchmark/testcode/BenchmarkTest00036.xml
diff --git a/src/main/java/org/owasp/benchmark/testcode/BenchmarkTest00037.xml b/src/main/java/org/owasp/benchmark/testcode/BenchmarkTest00037.xml
diff --git a/src/main/java/org/owasp/benchmark/testcode/BenchmarkTest00038.xml b/src/main/java/org/owasp/benchmark/testcode/BenchmarkTest00038.xml
diff --git a/src/main/java/org/owasp/benchmark/testcode/BenchmarkTest00039.xml b/src/main/java/org/owasp/benchmark/testcode/BenchmarkTest00039.xml
diff --git a/src/main/java/org/owasp/benchmark/testcode/BenchmarkTest00040.xml b/src/main/java/org/owasp/benchmark/testcode/BenchmarkTest00040.xml
diff --git a/src/main/java/org/owasp/benchmark/testcode/BenchmarkTest00041.xml b/src/main/java/org/owasp/benchmark/testcode/BenchmarkTest00041.xml
diff --git a/src/main/java/org/owasp/benchmark/testcode/BenchmarkTest00042.xml b/src/main/java/org/owasp/benchmark/testcode/BenchmarkTest00042.xml
diff --git a/src/main/java/org/owasp/benchmark/testcode/BenchmarkTest00043.xml b/src/main/java/org/owasp/benchmark/testcode/BenchmarkTest00043.xml