From d5503ff6150ab11fc3462e2236b476d0e6b59c78 Mon Sep 17 00:00:00 2001 From: Jeremy Long Date: Thu, 6 Jul 2017 06:05:26 -0400 Subject: [PATCH] updated error reporting for non-existent files --- .../owasp/dependencycheck/analyzer/AssemblyAnalyzer.java | 7 +++++++ .../dependencycheck/analyzer/AssemblyAnalyzerTest.java | 2 +- 2 files changed, 8 insertions(+), 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 a977d76c6..4f57dd6a7 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 @@ -113,6 +113,13 @@ public class AssemblyAnalyzer extends AbstractFileTypeAnalyzer { @Override public void analyzeDependency(Dependency dependency, Engine engine) throws AnalysisException { + + File test = new File(dependency.getActualFilePath()); + if (!test.isFile()) { + throw new AnalysisException(String.format("%s does not exist and cannot be analyzed by dependency-check", + dependency.getActualFilePath())); + } + if (grokAssemblyExe == null) { LOGGER.warn("GrokAssembly didn't get deployed"); return; 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 a9c045ea2..d3e67b3fc 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 @@ -173,7 +173,7 @@ public class AssemblyAnalyzerTest extends BaseTest { analyzer.analyze(d, null); fail("Expected an AnalysisException"); } catch (AnalysisException ae) { - assertEquals("File does not exist", ae.getMessage()); + assertTrue(ae.getMessage().contains("nonexistent.dll does not exist and cannot be analyzed by dependency-check")); } finally { System.setProperty(LOG_KEY, oldProp); }