Enhance Crawler to Support Unix and Windows.

Author: davewichers

createScorecards.bat

@@ -23,7 +23,7 @@
 									<goal>java</goal>
 								</goals>
 								<configuration>
-									<mainClass>org.owasp.benchmark.tools.BenchmarkRunner</mainClass>
+									<mainClass>org.owasp.benchmark.tools.BenchmarkCrawler</mainClass>
 								</configuration>
 							</execution>
 						</executions>
@@ -279,7 +279,8 @@
                                             -Xmx4G
                                             -javaagent:${basedir}/tools/Contrast/contrast.jar=${basedir}/tools/Contrast/contrast.config
                                             -Dcontrast.dir=${basedir}/tools/Contrast/working
-                                            -Dcontrast.saveresults=always
+                                            -Dcontrast.log.daily=true
+                                            -Dcontrast.level=debug
                                             -Dcontrast.noteamserver.enable=true
                                             -Dcontrast.teamserver.suppress=true
                                     </cargo.jvmargs>

pom.xml

@@ -0,0 +1,22 @@
+@ECHO OFF
+IF EXIST tools\Contrast\contrast.jar (
+  IF EXIST tools\Contrast\findings (
+        DEL \F \Q tools\Contrast\findings
+
+        RMDIR \S tools\Contrast\working
+
+        ECHO ""
+
+        ECHO Previous Contrast results have been removed
+
+        ECHO ""
+    )
+    CALL mvn clean package cargo:run -Pdeploywcontrast
+
+    ECHO Copying Contrast reports to results directory
+
+    COPY tools\Contrast\working\contrast.log results\Benchmark_1.2beta-Contrast.log
+
+) ELSE (
+    ECHO Given that Contrast is a commercial product, you have to have a licensed version of Contrast in order to run it on the Benchmark. If you have access to Contrast, download the Java 1.5 version of contrast.jar from the Team Server and put it into the /tools/Contrast folder, and then rerun this script.
+)

prepareContrastResults.sh

@@ -15,6 +15,9 @@ if [ -f tools/Contrast/contrast.jar ]; then
   chmod 755 src/main/resources/insecureCmd.sh
   mvn clean package cargo:run -Pdeploywcontrast
 
+  echo "Copying Contrast report to results directory"
+  cp tools/Contrast/working/contrast.log results/Benchmark_1.2beta-Contrast.log
+
 else 
 
   echo "Given that Contrast is a commercial product, you have to have a licensed version of Contrast in order to run it on the Benchmark. If you have access to Contrast, download the Java 1.5 version of contrast.jar from the Team Server and put it into the /tools/Contrast folder, and then rerun this script."

runBenchmark_wContrast.bat

@@ -1,6 +1,2 @@
-echo
-echo "NOTE: This crawler requires Firefox. Please install it if you don’t have it already."
-echo "ALSO: This crawler will sometimes stop if Firefox is not the window in focus. Be sure to keep Firefox in the foreground during the entire crawl in order to get the best results."
-echo
-
-call mvn install -Pcrawler
+
+CALL mvn install -Pcrawler

runBenchmark_wContrast.sh

@@ -1,8 +1,3 @@
 #!/bin/sh
 
-echo
-echo "NOTE: This crawler requires Firefox. Please install it if you don’t have it already."
-echo "ALSO: This crawler will sometimes stop if Firefox is not the window in focus. Be sure to keep Firefox in the foreground during the entire crawl in order to get the best results."
-echo
-
 mvn install -Pcrawler

runCrawler.bat

@@ -59,11 +59,11 @@
 import org.owasp.benchmark.score.parsers.CoverityReader;
 import org.owasp.benchmark.score.parsers.FindbugsReader;
 import org.owasp.benchmark.score.parsers.FortifyReader;
+import org.owasp.benchmark.score.parsers.NoisyCricketReader;
 import org.owasp.benchmark.score.parsers.OverallResult;
 import org.owasp.benchmark.score.parsers.OverallResults;
 import org.owasp.benchmark.score.parsers.PMDReader;
 import org.owasp.benchmark.score.parsers.ParasoftReader;
-import org.owasp.benchmark.score.parsers.NoisyCricketReader;
 import org.owasp.benchmark.score.parsers.Rapid7Reader;
 import org.owasp.benchmark.score.parsers.SonarQubeReader;
 import org.owasp.benchmark.score.parsers.SourceMeterReader;
@@ -746,7 +746,7 @@ else if ( filename.endsWith( ".fpr" ) ) {
 			}
 		}
 
-        else if ( filename.endsWith( ".zip") ) {
+        else if ( filename.endsWith( ".log") ) {
             tr = new ContrastReader().parse( fileToParse );
         }