Skip to content

Fix(PypiMetaAnalyzer): Compliant with the Simple Repository API (PEP 503|691) [DependencyTrack#5735] #5778

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

Open
ch8matt wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix(PypiMetaAnalyzer): Compliant with the Simple Repository API (PEP 503|691) [DependencyTrack#5735] #5778

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e9915cd
Fix(PypiMetaAnalyzer): Compliant with the Simple Repository API (PEP …
ch8matt Jan 27, 2026
d8bf4a2
Merge branch 'DependencyTrack:master' into patch-4
ch8matt Feb 3, 2026
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
6 changes: 6 additions & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,12 @@
<artifactId>cyclonedx-core-java</artifactId>
<version>${lib.cyclonedx-java.version}</version>
</dependency>
<!-- HTML parsing -->
<dependency>
<groupId>org.jsoup</groupId>
<artifactId>jsoup</artifactId>
<version>1.22.1</version>
</dependency>

<!-- org.json
This was previously transitively included with Unirest. However, Unirest v3.x removed reliance on org.json
Expand Down
35 changes: 26 additions & 9 deletions src/main/java/org/dependencytrack/tasks/repositories/AbstractMetaAnalyzer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
import org.apache.commons.lang3.StringUtils;
import org.apache.http.client.methods.CloseableHttpResponse;
import org.apache.http.client.methods.HttpGet;
import org.apache.http.client.methods.HttpUriRequest;
import org.apache.http.client.utils.URIBuilder;
import org.dependencytrack.common.HttpClientPool;
import org.dependencytrack.model.Component;
Expand Down Expand Up @@ -111,22 +110,40 @@ protected void handleRequestException(final Logger logger, final Exception e) {
.level(NotificationLevel.ERROR));
}

protected CloseableHttpResponse processHttpRequest(String url) throws IOException {
protected CloseableHttpResponse processHttpRequest(final String url) throws IOException {
return processHttpRequest(url, "application/json");
}

protected CloseableHttpResponse processHttpRequest(final String url, final String acceptValue) throws IOException {
final Logger logger = Logger.getLogger(getClass());
try {
URIBuilder uriBuilder = new URIBuilder(url);
final HttpUriRequest request = new HttpGet(uriBuilder.build().toString());
request.addHeader("accept", "application/json");
if (!StringUtils.isEmpty(username)) { // for some reason there is a testcase for password being null
request.addHeader("Authorization", HttpUtil.basicAuthHeaderValue(username, password));
} else if (!StringUtils.isEmpty(password)) {
request.addHeader("Authorization", "Bearer " + password);
final HttpGet request = new HttpGet(new URIBuilder(url).build());

if (acceptValue != null && !acceptValue.isBlank()) {
request.addHeader("Accept", acceptValue);
}

final String authHeader = buildAuthHeaderValue();
if (authHeader != null) {
request.addHeader("Authorization", authHeader);
}

return HttpClientPool.getClient().execute(request);

} catch (URISyntaxException ex) {
handleRequestException(logger, ex);
return null;
}
}

private String buildAuthHeaderValue() {
if (StringUtils.isNotEmpty(username)) { // for some reason there is a testcase for password being null
return HttpUtil.basicAuthHeaderValue(username, password);
}
if (StringUtils.isNotEmpty(password)) {
return "Bearer " + password;
}
return null;
}
}

Loading
Loading