github-mirrors/DependencyCheck
1
0
Fork 0
mirror of https://github.com/ysoftdevs/DependencyCheck.git synced 2026-03-24 18:11:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

updated error reporting for non-existent files

Browse Source
This commit is contained in:
Jeremy Long
2017-07-06 06:05:26 -04:00
parent 756d39df9a
commit d5503ff615
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/AssemblyAnalyzer.java
View File

@@ -113,6 +113,13 @@ public class AssemblyAnalyzer extends AbstractFileTypeAnalyzer {
@Override @Override
public void analyzeDependency(Dependency dependency, Engine engine) public void analyzeDependency(Dependency dependency, Engine engine)
throws AnalysisException { 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) { if (grokAssemblyExe == null) {
LOGGER.warn("GrokAssembly didn't get deployed"); LOGGER.warn("GrokAssembly didn't get deployed");
return; return;

2
dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/AssemblyAnalyzerTest.java
View File

@@ -173,7 +173,7 @@ public class AssemblyAnalyzerTest extends BaseTest {
analyzer.analyze(d, null); analyzer.analyze(d, null);
fail("Expected an AnalysisException"); fail("Expected an AnalysisException");
} catch (AnalysisException ae) { } 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 { } finally {
System.setProperty(LOG_KEY, oldProp); System.setProperty(LOG_KEY, oldProp);
} }