Tweak pom.xml so Contrast config also works with Contrast CE and

eliminate a few misc TODOs.

Author: davewichers

pom.xml

@@ -296,11 +296,11 @@
 										-Xmx4G
 										-javaagent:${basedir}/tools/Contrast/contrast.jar
 										-Dcontrast.dir=${basedir}/tools/Contrast/working
-										-Dcontrast.log.daily=true
-										-Dcontrast.level=debug
-										-Dcontrast.assess.threshold.entries=100000
-										-Dcontrast.agent.java.standalone_app_name=OWASPBenchmark
+										-Dcontrast.application.name=OWASPBenchmark
 										-Dcontrast.assess.rules.disabled_rules="autocomplete-missing,cache-controls-missing,clickjacking-control-missing,csrf"
+										-Dcontrast.assess.threshold.entries=100000
+										-Dcontrast.level=debug
+										-Dcontrast.log.daily=true
 									</cargo.jvmargs>
 									<cargo.servlet.port>8443</cargo.servlet.port>
 									<cargo.protocol>https</cargo.protocol>

src/main/java/org/owasp/benchmark/helpers/LDAPManager.java

@@ -66,7 +66,7 @@ public LDAPManager() {
 		try {
 			initDirectoryService(workDir);
 		} catch (Exception e1) {
-			// TODO Auto-generated catch block
+			// Auto-generated catch block
 			e1.printStackTrace();
 		}
 */
@@ -226,7 +226,7 @@ public static void main(String[] args){
 				ads.closeDirContext();
 				ads.stopServer();
 			} catch (Exception e) {
-				// TODO Auto-generated catch block
+				// Auto-generated catch block
 				e.printStackTrace();
 			}
 		}*/

src/main/java/org/owasp/benchmark/tools/NoisyCricket.java

@@ -42,6 +42,7 @@
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
 
+import org.owasp.benchmark.helpers.Utils;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
@@ -65,7 +66,7 @@ public static void main(String[] args) {
             Element version = report.createElement("meta");
             version.setAttribute("tool", "NoisyCricket");
             version.setAttribute("version", "8.1");
-            version.setAttribute("url", "http://owasp.org/benchmark");
+            version.setAttribute("url", "https://owasp.org/benchmark");
             docroot.appendChild( version );
 
             vulns = report.createElement("vulnerabilities");
@@ -82,10 +83,10 @@ public FileVisitResult visitFile(Path path, BasicFileAttributes attrs) throws IO
                     return FileVisitResult.CONTINUE;
                 }
             };
-            // TODO - Change user.home to be the home directory of the Benchmark project.
-            Path p = FileSystems.getDefault().getPath( System.getProperty("user.home") );
+
+            Path p = FileSystems.getDefault().getPath( Utils.USERDIR );
             Files.walkFileTree(p, visitor);
-            
+
             TransformerFactory transformerFactory = TransformerFactory.newInstance();
             Transformer transformer = transformerFactory.newTransformer();
             transformer.setOutputProperty(OutputKeys.INDENT, "yes");