From 94acc82bf5265344a54eaf6c4e5b7d4bca1d9c82 Mon Sep 17 00:00:00 2001 From: Will Stranathan Date: Sat, 1 Mar 2014 07:13:00 -0500 Subject: [PATCH 1/5] Fixed logging to JULI Former-commit-id: 76cd085130357fc9187f0af43b9670370a261026 --- .../dependencycheck/analyzer/AssemblyAnalyzerTest.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/AssemblyAnalyzerTest.java b/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/AssemblyAnalyzerTest.java index facb498be..a81d10395 100644 --- a/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/AssemblyAnalyzerTest.java +++ b/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/AssemblyAnalyzerTest.java @@ -17,7 +17,6 @@ */ package org.owasp.dependencycheck.analyzer; -import org.mortbay.log.Log; import org.owasp.dependencycheck.analyzer.exception.AnalysisException; import java.io.File; @@ -36,6 +35,8 @@ import org.owasp.dependencycheck.dependency.Dependency; import org.owasp.dependencycheck.dependency.Evidence; import org.owasp.dependencycheck.utils.Settings; +import com.sun.istack.internal.logging.Logger; + /** * Tests for the AssemblyAnalyzer. * @@ -43,6 +44,8 @@ import org.owasp.dependencycheck.utils.Settings; * */ public class AssemblyAnalyzerTest { + + private static final Logger LOGGER = Logger.getLogger(AssemblyAnalyzerTest.class); AssemblyAnalyzer analyzer; @@ -57,7 +60,7 @@ public class AssemblyAnalyzerTest { analyzer = new AssemblyAnalyzer(); analyzer.initialize(); } catch (Exception e) { - Log.warn("Exception setting up AssemblyAnalyzer. Tests will be incomplete"); + LOGGER.warning("Exception setting up AssemblyAnalyzer. Tests will be incomplete", e); Assume.assumeNoException("Is mono installed? TESTS WILL BE INCOMPLETE", e); } } From f80ff31412fc9fa01afd5642093f304265ff1c63 Mon Sep 17 00:00:00 2001 From: Will Stranathan Date: Sat, 1 Mar 2014 07:16:38 -0500 Subject: [PATCH 2/5] Fixed JULI Logging (stupid fix imports) Former-commit-id: ca5b3b5ad64defefccea4c445414595208205957 --- .../analyzer/AssemblyAnalyzerTest.java | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/AssemblyAnalyzerTest.java b/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/AssemblyAnalyzerTest.java index a81d10395..d640f9cb8 100644 --- a/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/AssemblyAnalyzerTest.java +++ b/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/AssemblyAnalyzerTest.java @@ -17,26 +17,24 @@ */ package org.owasp.dependencycheck.analyzer; -import org.owasp.dependencycheck.analyzer.exception.AnalysisException; - -import java.io.File; - -import org.junit.After; - import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.junit.Assume.assumeFalse; +import java.io.File; +import java.util.logging.Level; +import java.util.logging.Logger; + +import org.junit.After; import org.junit.Assume; import org.junit.Before; import org.junit.Test; +import org.owasp.dependencycheck.analyzer.exception.AnalysisException; import org.owasp.dependencycheck.dependency.Confidence; import org.owasp.dependencycheck.dependency.Dependency; import org.owasp.dependencycheck.dependency.Evidence; import org.owasp.dependencycheck.utils.Settings; -import com.sun.istack.internal.logging.Logger; - /** * Tests for the AssemblyAnalyzer. * @@ -45,7 +43,7 @@ import com.sun.istack.internal.logging.Logger; */ public class AssemblyAnalyzerTest { - private static final Logger LOGGER = Logger.getLogger(AssemblyAnalyzerTest.class); + private static final Logger LOGGER = Logger.getLogger(AssemblyAnalyzerTest.class.getName()); AssemblyAnalyzer analyzer; @@ -60,7 +58,7 @@ public class AssemblyAnalyzerTest { analyzer = new AssemblyAnalyzer(); analyzer.initialize(); } catch (Exception e) { - LOGGER.warning("Exception setting up AssemblyAnalyzer. Tests will be incomplete", e); + LOGGER.log(Level.WARNING, "Exception setting up AssemblyAnalyzer. Tests will be incomplete", e); Assume.assumeNoException("Is mono installed? TESTS WILL BE INCOMPLETE", e); } } From 86a49231571d87cd2dd1639f595c698a68485a42 Mon Sep 17 00:00:00 2001 From: Will Stranathan Date: Sat, 1 Mar 2014 07:13:00 -0500 Subject: [PATCH 3/5] Fixed logging to JULI Former-commit-id: ab31241151a610fa67bc8102bded86db2250a9fd --- .../dependencycheck/analyzer/AssemblyAnalyzerTest.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/AssemblyAnalyzerTest.java b/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/AssemblyAnalyzerTest.java index facb498be..a81d10395 100644 --- a/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/AssemblyAnalyzerTest.java +++ b/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/AssemblyAnalyzerTest.java @@ -17,7 +17,6 @@ */ package org.owasp.dependencycheck.analyzer; -import org.mortbay.log.Log; import org.owasp.dependencycheck.analyzer.exception.AnalysisException; import java.io.File; @@ -36,6 +35,8 @@ import org.owasp.dependencycheck.dependency.Dependency; import org.owasp.dependencycheck.dependency.Evidence; import org.owasp.dependencycheck.utils.Settings; +import com.sun.istack.internal.logging.Logger; + /** * Tests for the AssemblyAnalyzer. * @@ -43,6 +44,8 @@ import org.owasp.dependencycheck.utils.Settings; * */ public class AssemblyAnalyzerTest { + + private static final Logger LOGGER = Logger.getLogger(AssemblyAnalyzerTest.class); AssemblyAnalyzer analyzer; @@ -57,7 +60,7 @@ public class AssemblyAnalyzerTest { analyzer = new AssemblyAnalyzer(); analyzer.initialize(); } catch (Exception e) { - Log.warn("Exception setting up AssemblyAnalyzer. Tests will be incomplete"); + LOGGER.warning("Exception setting up AssemblyAnalyzer. Tests will be incomplete", e); Assume.assumeNoException("Is mono installed? TESTS WILL BE INCOMPLETE", e); } } From be68f8c3f7c91e9d71a6d5e5783d4c121df45a31 Mon Sep 17 00:00:00 2001 From: Will Stranathan Date: Sat, 1 Mar 2014 07:16:38 -0500 Subject: [PATCH 4/5] Fixed JULI Logging (stupid fix imports) Former-commit-id: 75036170c113718e2265dad4c2b436b1613e0da7 --- .../analyzer/AssemblyAnalyzerTest.java | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/AssemblyAnalyzerTest.java b/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/AssemblyAnalyzerTest.java index a81d10395..d640f9cb8 100644 --- a/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/AssemblyAnalyzerTest.java +++ b/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/AssemblyAnalyzerTest.java @@ -17,26 +17,24 @@ */ package org.owasp.dependencycheck.analyzer; -import org.owasp.dependencycheck.analyzer.exception.AnalysisException; - -import java.io.File; - -import org.junit.After; - import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.junit.Assume.assumeFalse; +import java.io.File; +import java.util.logging.Level; +import java.util.logging.Logger; + +import org.junit.After; import org.junit.Assume; import org.junit.Before; import org.junit.Test; +import org.owasp.dependencycheck.analyzer.exception.AnalysisException; import org.owasp.dependencycheck.dependency.Confidence; import org.owasp.dependencycheck.dependency.Dependency; import org.owasp.dependencycheck.dependency.Evidence; import org.owasp.dependencycheck.utils.Settings; -import com.sun.istack.internal.logging.Logger; - /** * Tests for the AssemblyAnalyzer. * @@ -45,7 +43,7 @@ import com.sun.istack.internal.logging.Logger; */ public class AssemblyAnalyzerTest { - private static final Logger LOGGER = Logger.getLogger(AssemblyAnalyzerTest.class); + private static final Logger LOGGER = Logger.getLogger(AssemblyAnalyzerTest.class.getName()); AssemblyAnalyzer analyzer; @@ -60,7 +58,7 @@ public class AssemblyAnalyzerTest { analyzer = new AssemblyAnalyzer(); analyzer.initialize(); } catch (Exception e) { - LOGGER.warning("Exception setting up AssemblyAnalyzer. Tests will be incomplete", e); + LOGGER.log(Level.WARNING, "Exception setting up AssemblyAnalyzer. Tests will be incomplete", e); Assume.assumeNoException("Is mono installed? TESTS WILL BE INCOMPLETE", e); } } From 887a5d50a4d997c629fd91b776471982b540d713 Mon Sep 17 00:00:00 2001 From: Will Stranathan Date: Sat, 1 Mar 2014 07:23:46 -0500 Subject: [PATCH 5/5] Added proper waitfor to the process. Need to add a watchdog to this Former-commit-id: 51bea69bb73e379fa7aac776171110fa1f75b8d4 --- .../org/owasp/dependencycheck/analyzer/AssemblyAnalyzer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/AssemblyAnalyzer.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/AssemblyAnalyzer.java index 063a89f7f..b2c38857a 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/AssemblyAnalyzer.java +++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/AssemblyAnalyzer.java @@ -200,7 +200,7 @@ public class AssemblyAnalyzer extends AbstractAnalyzer { final Document doc = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(p.getInputStream()); final XPath xpath = XPathFactory.newInstance().newXPath(); final String error = xpath.evaluate("/assembly/error", doc); - if (p.exitValue() != 1 || error == null || "".equals(error)) { + if (p.waitFor() != 1 || error == null || "".equals(error)) { LOG.warning("An error occured with the .NET AssemblyAnalyzer, please see the log for more details."); LOG.fine("GrokAssembly.exe is not working properly"); grokAssemblyExe = null;