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

Fixed bug when analyzing maven repositories - related JARs would not get bundled

Browse Source 
Former-commit-id: a63d04d7d3674f1df6a98f7741867841f40093f9
This commit is contained in:
Jeremy Long
2013-05-09 23:03:03 -04:00
parent 2e3331f568
commit 55e61caf39
1 changed files with 42 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/main/java/org/owasp/dependencycheck/analyzer/DependencyBundlingAnalyzer.java
View File

@@ -153,6 +153,32 @@ public class DependencyBundlingAnalyzer extends AbstractAnalyzer implements Anal
} }
} }
/**
* Attempts to trim a maven repo to a common base path. This is typically
* [drive]\[repolocation\repository\[path1]\[path2].
*
* @param path the path to trim
* @return a string representing the base path.
*/
private String getBaseRepoPath(final String path) {
int pos = path.indexOf("repository") + 10;
if (pos<0) {
return path;
}
int tmp = path.indexOf(File.separator, pos);
if (tmp<=0) {
return path;
}
if (tmp>0) {
pos = tmp + 1;
}
tmp = path.indexOf(File.separator, pos);
if (tmp>0) {
pos = tmp + 1;
}
return path.substring(0, pos);
}
/** /**
* Returns true if the identifiers in the two supplied dependencies are equal. * Returns true if the identifiers in the two supplied dependencies are equal.
* @param dependency1 a dependency2 to compare * @param dependency1 a dependency2 to compare
@@ -179,15 +205,29 @@ public class DependencyBundlingAnalyzer extends AbstractAnalyzer implements Anal
return false; return false;
} }
final File lFile = new File(dependency1.getFilePath()); final File lFile = new File(dependency1.getFilePath());
final String left = lFile.getParent(); String left = lFile.getParent();
final File rFile = new File(dependency2.getFilePath()); final File rFile = new File(dependency2.getFilePath());
final String right = rFile.getParent(); String right = rFile.getParent();
if (left == null) { if (left == null) {
if (right == null) { if (right == null) {
return true; return true;
} }
return false; return false;
} }
if (left.equalsIgnoreCase(right)) {
return true;
}
if (dependency1.getFileName().contains("RELEASE") && dependency2.getFileName().contains("RELEASE")) {
System.out.println(dependency1.getFilePath());
System.out.println(dependency2.getFilePath());
System.out.println("Path=" + left.equalsIgnoreCase(right));
System.out.println();
}
if (left.matches(".*[/\\\\]repository[/\\\\].*") && right.matches(".*[/\\\\]repository[/\\\\].*")) {
left = getBaseRepoPath(left);
right = getBaseRepoPath(right);
System.out.println("found a repo");
}
return left.equalsIgnoreCase(right); return left.equalsIgnoreCase(right);
} }