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

Jump to bottom

Port : Exclude pre-releases from NuGet latest version check #1595

Merged
merged 1 commit into from
Nov 22, 2024
Merged

Port : Exclude pre-releases from NuGet latest version check #1595

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
24 changes: 18 additions & 6 deletions ...er/src/main/java/org/dependencytrack/repometaanalyzer/repositories/NugetMetaAnalyzer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@
import org.apache.http.client.methods.CloseableHttpResponse;
import org.apache.http.util.EntityUtils;
import org.apache.maven.artifact.versioning.ComparableVersion;
import org.dependencytrack.repometaanalyzer.model.MetaAnalyzerException;
import org.dependencytrack.repometaanalyzer.model.MetaModel;
import org.dependencytrack.persistence.model.Component;
import org.dependencytrack.persistence.model.RepositoryType;
import org.dependencytrack.repometaanalyzer.model.MetaAnalyzerException;
import org.dependencytrack.repometaanalyzer.model.MetaModel;
import org.json.JSONArray;
import org.json.JSONObject;
import org.slf4j.Logger;
Expand Down Expand Up @@ -128,14 +128,16 @@ private boolean performVersionCheck(final MetaModel meta, final Component compon
}

private String findLatestVersion(JSONArray versions) {
if (versions.length() < 1) {
JSONArray filteredVersions = filterPreReleaseVersions(versions);

if (filteredVersions.length() < 1) {
return null;
}

ComparableVersion latestVersion = new ComparableVersion(versions.getString(0));
ComparableVersion latestVersion = new ComparableVersion(filteredVersions.getString(0));

for (int i = 1; i < versions.length(); i++) {
ComparableVersion version = new ComparableVersion(versions.getString(i));
for (int i = 1; i < filteredVersions.length(); i++) {
ComparableVersion version = new ComparableVersion(filteredVersions.getString(i));
if (version.compareTo(latestVersion) > 0) {
latestVersion = version;
}
Expand All @@ -144,6 +146,16 @@ private String findLatestVersion(JSONArray versions) {
return latestVersion.toString();
}

private JSONArray filterPreReleaseVersions(JSONArray versions) {
JSONArray filteredVersions = new JSONArray();
for (int i = 0; i < versions.length(); i++) {
if (!versions.getString(i).contains("-")) {
filteredVersions.put(versions.getString(i));
}
}
return filteredVersions;
}

private boolean performLastPublishedCheck(final MetaModel meta, final Component component) {
final String url = String.format(registrationUrl, component.getPurl().getName().toLowerCase(), meta.getLatestVersion());
try (final CloseableHttpResponse response = processHttpRequest(url)) {
Expand Down
36 changes: 36 additions & 0 deletions ...rc/test/java/org/dependencytrack/repometaanalyzer/repositories/NugetMetaAnalyzerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,4 +187,40 @@ void testPublishedDateTimeFormat() throws ParseException {
private String readResourceFileToString(String fileName) throws Exception {
return Files.readString(Paths.get(getClass().getResource(fileName).toURI()));
}

// This test is to check if the analyzer is excluding pre-release versions
// The test is transitent depending on the current version of the package
// retrieved from the repository at the time of running.
// When it was created, the latest release version was 9.0.0-preview.1.24080.9
@Test
public void testAnalyzerExcludingPreRelease() throws Exception {
Component component = new Component();
component.setPurl(new PackageURL("pkg:nuget/[email protected]"));

analyzer.setRepositoryBaseUrl("https://api.nuget.org");
MetaModel metaModel = analyzer.analyze(component);

Assertions.assertTrue(analyzer.isApplicable(component));
Assertions.assertEquals(RepositoryType.NUGET, analyzer.supportedRepositoryType());
Assertions.assertNotNull(metaModel.getLatestVersion());
Assertions.assertFalse(metaModel.getLatestVersion().contains("-"));
}

// This test is to check if the analyzer is including pre-release versions
// The test is transitent depending on the current version of the package
// retrieved from the repository at the time of running.
// When it was created, the latest release version was 9.0.0-preview.1.24080.9
@Test
public void testAnalyzerIncludingPreRelease() throws Exception {
Component component = new Component();
component.setPurl(new PackageURL("pkg:nuget/[email protected]"));

analyzer.setRepositoryBaseUrl("https://api.nuget.org");
MetaModel metaModel = analyzer.analyze(component);

Assertions.assertTrue(analyzer.isApplicable(component));
Assertions.assertEquals(RepositoryType.NUGET, analyzer.supportedRepositoryType());
Assertions.assertNotNull(metaModel.getLatestVersion());
Assertions.assertFalse(metaModel.getLatestVersion().contains("-"));
}
}
Loading