github-mirrors/DependencyCheck
1
0
Fork 0
mirror of https://github.com/ysoftdevs/DependencyCheck.git synced 2026-01-14 07:43:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/fabio-boldrini/DependencyCheck into fabio-boldrini-master

Browse Source
This commit is contained in:
Jeremy Long
2017-10-13 06:28:46 -04:00
parent 667e784d06 2332c0fa5e
commit c484edf7ae
2 changed files with 61 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
dependency-check-core/src/main/java/org/owasp/dependencycheck/dependency/VulnerableSoftware.java
View File

@@ -20,12 +20,18 @@ package org.owasp.dependencycheck.dependency;
import java.io.Serializable;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import java.util.ArrayList;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import javax.annotation.concurrent.ThreadSafe;
import org.apache.commons.lang3.StringUtils;
import org.owasp.dependencycheck.data.cpe.IndexEntry;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* A record containing information about vulnerable software. This is referenced
* from a vulnerability.
@@ -186,7 +192,39 @@ public class VulnerableSoftware extends IndexEntry implements Serializable, Comp
public String toString() {
return "VulnerableSoftware{" + name + "[" + previousVersion + "]}";
}
/**
* Method that split versions for '.', '|' and '-".
* Then if a token start with a number and then contains letters, it will split it too.
* For example "12a" is splitted in ["12", "a"].
* This is done to support correct comparison of "5.0.3a", "5.0.9" and "5.0.30".
*
* @return an Array of String containing the tokens to be compared
*/
private String[] split(String s) {
String[] splitted = s.split("(\\.|-)");
ArrayList<String> res = new ArrayList<>();
for (String token : splitted) {
if (token.matches("^[\\d]+?[A-z]+")) {
Pattern pattern = Pattern.compile("^([\\d]+?)(.*)$");
Matcher matcher = pattern.matcher(token);
matcher.find();
String g1 = matcher.group(1);
String g2 = matcher.group(2);
res.add(g1);
res.add(g2);
continue;
}
res.add(token);
}
return res.toArray(new String[res.size()]);
}
/**
* Implementation of the comparable interface.
*
@@ -201,8 +239,8 @@ public class VulnerableSoftware extends IndexEntry implements Serializable, Comp
final int max = (left.length <= right.length) ? left.length : right.length;
if (max > 0) {
for (int i = 0; result == 0 && i < max; i++) {
final String[] subLeft = left[i].split("(\\.|-)");
final String[] subRight = right[i].split("(\\.|-)");
final String[] subLeft = split(left[i]);
final String[] subRight = split(right[i]);
final int subMax = (subLeft.length <= subRight.length) ? subLeft.length : subRight.length;
if (subMax > 0) {
for (int x = 0; result == 0 && x < subMax; x++) {

21
dependency-check-core/src/test/java/org/owasp/dependencycheck/dependency/VulnerableSoftwareTest.java
View File

@@ -174,4 +174,25 @@ public class VulnerableSoftwareTest extends BaseTest {
assertFalse(VulnerableSoftware.isPositiveInteger("01"));
assertFalse(VulnerableSoftware.isPositiveInteger("00"));
}
@Test
public void testVersionsWithLettersComparison() {
VulnerableSoftware a = new VulnerableSoftware();
a.setName("cpe:/a:mysql:mysql:5.0.3a");
VulnerableSoftware b = new VulnerableSoftware();
b.setName("cpe:/a:mysql:mysql:5.0.9");
VulnerableSoftware c = new VulnerableSoftware();
c.setName("cpe:/a:mysql:mysql:5.0.30");
assertTrue(a.compareTo(b) < 0);
assertTrue(a.compareTo(c) < 0);
assertTrue(b.compareTo(a) > 0);
assertTrue(b.compareTo(c) < 0);
assertTrue(c.compareTo(a) > 0);
assertTrue(c.compareTo(b) > 0);
}
}