Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adjusted version range computation to deal with multiple equals. #133

Merged
merged 1 commit into from
Jan 26, 2024
+41 −6
Merged

Adjusted version range computation to deal with multiple equals. #133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 14 additions & 6 deletions src/main/java/eu/fasten/vulnerabilityproducer/utils/mappers/VersionRanger.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@
package eu.fasten.vulnerabilityproducer.utils.mappers;

import com.google.common.collect.Lists;
import com.google.common.collect.Sets;

import eu.fasten.vulnerabilityproducer.utils.Vulnerability;
import eu.fasten.vulnerabilityproducer.utils.connections.JavaHttpClient;
import org.apache.commons.lang3.tuple.ImmutablePair;
Expand Down Expand Up @@ -341,18 +343,20 @@ public List<String> getVulnerableVersionsYAML(List<String> encodedRangeVersions,

public List<String> getVulnerableVersionsJSON(String encodedRangeVersions, List<String> allVersions) {
var allParsedVersions = allVersions.stream().map(ComparableVersion::new).collect(Collectors.toList());
var vulnerableVersions = Lists.newArrayList(allVersions);
Set<String> vulnerableVersions = Sets.newLinkedHashSet(allVersions);

List<Integer> versionIndicesToRemove = Lists.newArrayList();
List<Integer> versionIndicesToKeep = Lists.newArrayList();

for (String range : encodedRangeVersions.split(",")) {
String operator = range.strip().split("[0-9]")[0].strip();
var versionFromRange = range.strip().substring(operator.length()).strip();
var parsedVersionFromRange = new ComparableVersion(versionFromRange);

List<Integer> versionIndicesToRemove = Lists.newArrayList();
switch (operator) {
case "==":
case "=": {
versionIndicesToRemove = findUnequalVersions(parsedVersionFromRange, allParsedVersions);
versionIndicesToKeep.addAll(findEqualVersions(parsedVersionFromRange, allParsedVersions));
break;
}
case "<=": {
Expand All @@ -374,10 +378,14 @@ public List<String> getVulnerableVersionsJSON(String encodedRangeVersions, List<
default:
logger.warn("getVulnerableVersionsJSON: unknown operator " + operator);
}
versionIndicesToRemove.stream().map(allVersions::get).forEach(vulnerableVersions::remove);
// If we only have some specific versions in the spec, only those should be kept.
if(versionIndicesToRemove.size() == 0 && versionIndicesToKeep.size() > 0) {
vulnerableVersions.clear();
}
versionIndicesToRemove.stream().map(allVersions::get).forEach(vulnerableVersions::remove);
versionIndicesToKeep.stream().map(allVersions::get).forEach(vulnerableVersions::add);
}

return vulnerableVersions;
return vulnerableVersions.stream().collect(Collectors.toList());
}

private List<Integer> findUnequalVersions(ComparableVersion v, List<ComparableVersion> allVersions) {
Expand Down
27 changes: 27 additions & 0 deletions src/test/java/eu/fasten/vulnerabilityproducer/mappers/VersionRangerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,20 @@ public void testVulnerableVersionsJSON_Equal() {
assertEquals(vvCheck, vv);
}

@Test
public void testVulnerableVersionsJSON_EqualTwice() {
when(clientMock.sendGet("https://pypi.org/pypi/mock/json")).thenReturn(pythonPgk);

var allVersions = vr.getVersions("pkg:pypi/mock");
String encodedRange = "==1.0.1rc,=2.0";
List<String> vv = vr.getVulnerableVersionsJSON(encodedRange, allVersions);
List<String> vvCheck = new ArrayList<>();
vvCheck.add("1.0.1rc");
vvCheck.add("2.0");

assertEquals(vvCheck, vv);
}

@Test
public void testVulnerableVersionsJSON_SmallerThanOrEqual() {
when(clientMock.sendGet("https://pypi.org/pypi/mock/json")).thenReturn(pythonPgk);
Expand Down Expand Up @@ -296,6 +310,19 @@ public void testVulnerableVersionJSON_Compound2() {
assertEquals(vvCheck, vv);
}

@Test
public void testVulnerableVersionJSON_Compound3() {
when(clientMock.sendGet("https://pypi.org/pypi/mock/json")).thenReturn(pythonPgk);
List<String> allVersions = vr.getVersions("pkg:pypi/mock");
String encodedRange = ">1.0.2, <=2.0, =2.0.2";
List<String> vv = vr.getVulnerableVersionsJSON(encodedRange, allVersions);
List<String> vvCheck = new ArrayList<>();
vvCheck.add("1.0.9");
vvCheck.add("2.0");
vvCheck.add("2.0.2");
assertEquals(vvCheck, vv);
}

@Test
public void testVulnerableVersionsYAMLPartOne() {
when(clientMock.sendGet("https://pypi.org/pypi/mock/json")).thenReturn(pythonPgk);
Expand Down
Loading