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

changed display name of files contained in archives so that it doesn't look like an invalid path

Browse Source 
Former-commit-id: db3a7edadef81dd7e66c68cf0f4cdf43e12936b6
This commit is contained in:
Jeremy Long
2014-10-25 08:03:47 -04:00
parent 766b7a940c
commit 70667814f6
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/ArchiveAnalyzer.java
View File

@@ -110,7 +110,7 @@ public class ArchiveAnalyzer extends AbstractFileTypeAnalyzer {
static { static {
final String additionalZipExt = Settings.getString(Settings.KEYS.ADDITIONAL_ZIP_EXTENSIONS); final String additionalZipExt = Settings.getString(Settings.KEYS.ADDITIONAL_ZIP_EXTENSIONS);
if (additionalZipExt != null) { if (additionalZipExt != null) {
final HashSet ext = new HashSet<String>(Arrays.asList(additionalZipExt)); final HashSet<String> ext = new HashSet<String>(Arrays.asList(additionalZipExt));
ZIPPABLES.addAll(ext); ZIPPABLES.addAll(ext);
} }
EXTENSIONS.addAll(ZIPPABLES); EXTENSIONS.addAll(ZIPPABLES);
@@ -221,9 +221,8 @@ public class ArchiveAnalyzer extends AbstractFileTypeAnalyzer {
final String displayPath = String.format("%s%s", final String displayPath = String.format("%s%s",
dependency.getFilePath(), dependency.getFilePath(),
d.getActualFilePath().substring(tmpDir.getAbsolutePath().length())); d.getActualFilePath().substring(tmpDir.getAbsolutePath().length()));
final String displayName = String.format("%s[%s]", final String displayName = String.format("%s: %s",
dependency.getFileName(), dependency.getFileName(),
File.separator,
d.getFileName()); d.getFileName());
d.setFilePath(displayPath); d.setFilePath(displayPath);
d.setFileName(displayName); d.setFileName(displayName);