mirror of
https://github.com/ysoftdevs/DependencyCheck.git
synced 2026-03-18 07:14:09 +01:00
bug fix - reported by Dan Cornell
Former-commit-id: 6d6d48bff5884c644f6db12b37cbaddaa81ca82b
This commit is contained in:
@@ -25,6 +25,7 @@ import java.io.IOException;
|
|||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.Map.Entry;
|
import java.util.Map.Entry;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
|
import java.util.StringTokenizer;
|
||||||
import java.util.jar.Attributes;
|
import java.util.jar.Attributes;
|
||||||
import java.util.jar.JarFile;
|
import java.util.jar.JarFile;
|
||||||
import java.util.jar.Manifest;
|
import java.util.jar.Manifest;
|
||||||
@@ -366,7 +367,7 @@ public class JarAnalyzer extends AbstractAnalyzer {
|
|||||||
key = key.toLowerCase();
|
key = key.toLowerCase();
|
||||||
|
|
||||||
if (!IGNORE_LIST.contains(key) && !key.contains("license") && !key.endsWith("jdk")
|
if (!IGNORE_LIST.contains(key) && !key.contains("license") && !key.endsWith("jdk")
|
||||||
&& !key.contains("lastmodified")) {
|
&& !key.contains("lastmodified") && !key.endsWith("package")) {
|
||||||
|
|
||||||
if (key.contains("version")) {
|
if (key.contains("version")) {
|
||||||
versionEvidence.addEvidence(source, key, value, Evidence.Confidence.MEDIUM);
|
versionEvidence.addEvidence(source, key, value, Evidence.Confidence.MEDIUM);
|
||||||
@@ -381,7 +382,14 @@ public class JarAnalyzer extends AbstractAnalyzer {
|
|||||||
productEvidence.addEvidence(source, key, value, Evidence.Confidence.LOW);
|
productEvidence.addEvidence(source, key, value, Evidence.Confidence.LOW);
|
||||||
vendorEvidence.addEvidence(source, key, value, Evidence.Confidence.LOW);
|
vendorEvidence.addEvidence(source, key, value, Evidence.Confidence.LOW);
|
||||||
if (value.matches(".*\\d.*")) {
|
if (value.matches(".*\\d.*")) {
|
||||||
versionEvidence.addEvidence(source, key, value, Evidence.Confidence.LOW);
|
StringTokenizer tokenizer = new StringTokenizer(value," ");
|
||||||
|
while (tokenizer.hasMoreElements()) {
|
||||||
|
String s = tokenizer.nextToken();
|
||||||
|
if (s.matches("^[0-9.]+$")) {
|
||||||
|
versionEvidence.addEvidence(source, key, s, Evidence.Confidence.LOW);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
//versionEvidence.addEvidence(source, key, value, Evidence.Confidence.LOW);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user