Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
36 changes: 26 additions & 10 deletions src/main/java/land/oras/Registry.java
Original file line number Diff line number Diff line change
Expand Up @@ -536,20 +536,23 @@ public Tags getTags(ContainerRef containerRef) {
logResponse(response);
handleError(response);
Tags page = JsonUtils.fromJson(response.response(), Tags.class)
.withLast(getLastFromLink(response).orElse(null));
.withLast(getLastParamFromLink(response))
.withN(getNParamFromLink(response));
if (page.last() == null) {
return page;
}
// Follow pagination links, accumulating all tags, guarded against unbounded loops.
List<String> allTags = new ArrayList<>(page.tags());
String last = page.last();
Integer n = page.n();
for (int pageNum = 1; last != null; pageNum++) {
if (tagListMaxPages > 0 && pageNum >= tagListMaxPages) {
throw new OrasException(
"Tag listing exceeded %d pages: possible self-referential Link header from a rogue registry"
.formatted(tagListMaxPages));
}
Tags nextPage = getTags(ref, Integer.MAX_VALUE, last);

Tags nextPage = getTags(ref, n == null ? Integer.MAX_VALUE : n, last);
allTags.addAll(nextPage.tags());
last = nextPage.last();
}
Expand All @@ -571,7 +574,8 @@ public Tags getTags(ContainerRef containerRef, int n, @Nullable String last) {
logResponse(response);
handleError(response);
return JsonUtils.fromJson(response.response(), Tags.class)
.withLast(getLastFromLink(response).orElse(null));
.withLast(getLastParamFromLink(response))
.withN(getNParamFromLink(response));
}

@Override
Expand Down Expand Up @@ -615,7 +619,7 @@ public Referrers getReferrers(ContainerRef containerRef, @Nullable ArtifactType
logResponse(response);
handleError(response);
Referrers page = JsonUtils.fromJson(response.response(), Referrers.class);
String last = getLastFromLink(response).orElse(null);
String last = getLastParamFromLink(response);
if (last == null) {
return page;
}
Expand All @@ -634,7 +638,7 @@ public Referrers getReferrers(ContainerRef containerRef, @Nullable ArtifactType
handleError(nextResponse);
Referrers nextPage = JsonUtils.fromJson(nextResponse.response(), Referrers.class);
allManifests.addAll(nextPage.getManifests());
last = getLastFromLink(nextResponse).orElse(null);
last = getLastParamFromLink(response);
}
return Referrers.from(allManifests);
}
Expand Down Expand Up @@ -1716,7 +1720,19 @@ ResolvedRegistry getResolvedHeaders(ContainerRef containerRef) {
return new ResolvedRegistry(ref.getRegistry(), response.headers());
}

private Optional<String> getLastFromLink(HttpClient.ResponseWrapper<String> response) {
private @Nullable String getLastParamFromLink(HttpClient.ResponseWrapper<String> response) {
return getParamFromLink(response, Const.QUERY_PARAM_LAST).orElse(null);
}

private @Nullable Integer getNParamFromLink(HttpClient.ResponseWrapper<String> response) {
Optional<String> n = getParamFromLink(response, Const.QUERY_PARAM_N);
if (n.isPresent()) {
return Integer.parseInt(n.get());
}
return null;
}

private Optional<String> getParamFromLink(HttpClient.ResponseWrapper<String> response, String param) {
String linkHeader = response.headers().get(Const.LINK_HEADER.toLowerCase());
if (linkHeader == null) {
return Optional.empty();
Expand All @@ -1735,10 +1751,10 @@ private Optional<String> getLastFromLink(HttpClient.ResponseWrapper<String> resp
}

String query = uri.substring(q + 1);
for (String param : query.split("&")) {
int eq = param.indexOf('=');
if (eq > 0 && "last".equals(param.substring(0, eq))) {
return Optional.of(param.substring(eq + 1));
for (String p : query.split("&")) {
int eq = p.indexOf('=');
if (eq > 0 && param.equals(p.substring(0, eq))) {
return Optional.of(p.substring(eq + 1));
}
}

Expand Down
16 changes: 13 additions & 3 deletions src/main/java/land/oras/Tags.java
Original file line number Diff line number Diff line change
Expand Up @@ -30,19 +30,20 @@
* @param name The name
* @param tags The tags
* @param last The last tag index, to iterate
* @param n The n parameter, to iterate. As part of link response
*/
@NullMarked
@OrasModel
@JsonInclude(JsonInclude.Include.NON_NULL)
public record Tags(String name, List<String> tags, @Nullable String last) {
public record Tags(String name, List<String> tags, @Nullable String last, @Nullable Integer n) {

/**
* Constructor without last
* @param name The name
* @param tags The tags
*/
public Tags(String name, List<String> tags) {
this(name, tags, null);
this(name, tags, null, null);
}

/**
Expand All @@ -51,6 +52,15 @@ public Tags(String name, List<String> tags) {
* @return A new Tags object with the last index
*/
public Tags withLast(@Nullable String last) {
return new Tags(this.name, this.tags, last);
return new Tags(this.name, this.tags, last, n);
}

/**
* With n param
* @param n The n param
* @return A new Tags object with the n param
*/
public Tags withN(@Nullable Integer n) {
return new Tags(this.name, this.tags, last, n);
}
}
7 changes: 5 additions & 2 deletions src/main/java/land/oras/auth/HttpClient.java
Original file line number Diff line number Diff line change
Expand Up @@ -766,7 +766,7 @@ private <T> ResponseWrapper<T> executeRequest(
continue;
}

return redoRequest(uri, response, builder, handler, newScopes, authProvider);
return redoRequest(uri, response, builder, body, handler, newScopes, authProvider);

} catch (InterruptedException e) {
Thread.currentThread().interrupt();
Expand Down Expand Up @@ -855,6 +855,7 @@ private <T> ResponseWrapper<T> redoRequest(
URI originUri,
HttpResponse<T> response,
HttpRequest.Builder builder,
byte[] body,
HttpResponse.BodyHandler<T> handler,
Scopes scopes,
AuthProvider authProvider) {
Expand All @@ -873,7 +874,9 @@ private <T> ResponseWrapper<T> redoRequest(
String service = token.service();
try {
builder = builder.setHeader(Const.AUTHORIZATION_HEADER, "Bearer " + bearerToken);
HttpResponse<T> newResponse = executeAndRecordRequest(builder.build(), handler);
HttpRequest request = builder.build();
logRequest(request, body);
HttpResponse<T> newResponse = executeAndRecordRequest(request, handler);

// Follow redirect
if (shouldRedirect(newResponse)) {
Expand Down
10 changes: 10 additions & 0 deletions src/main/java/land/oras/utils/Const.java
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,16 @@ private Const() {
*/
public static final String DEFAULT_REGISTRY = "docker.io";

/**
* Last query param for tag iteration
*/
public static final String QUERY_PARAM_LAST = "last";

/**
* The N query param
*/
public static final String QUERY_PARAM_N = "n";

/**
* Default tag
*/
Expand Down
42 changes: 42 additions & 0 deletions src/test/java/land/oras/AgentGatewayDevITCase.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
/*-
* =LICENSE=
* ORAS Java SDK
* ===
* Copyright (C) 2024 - 2026 ORAS
* ===
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* =LICENSEEND=
*/

package land.oras;

import static org.junit.jupiter.api.Assertions.assertTrue;

import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.parallel.Execution;
import org.junit.jupiter.api.parallel.ExecutionMode;
import org.testcontainers.junit.jupiter.Testcontainers;

@Testcontainers
@Execution(ExecutionMode.CONCURRENT)
class AgentGatewayDevITCase {

@Test
void shouldGetTags() {
Registry registry = Registry.builder().build();
ContainerRef containerRef = ContainerRef.parse("cr.agentgateway.dev/agentgateway");
Tags tags = registry.getTags(containerRef);
assertTrue(tags.tags().contains("v1.3.0"), "Tag v1.3.0 must exists");
assertTrue(tags.tags().size() > 400, "More that 400 must be returned");
}
}
9 changes: 9 additions & 0 deletions src/test/java/land/oras/GitHubContainerRegistryITCase.java
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,15 @@ class GitHubContainerRegistryITCase {
@TempDir
Path tempDir;

@Test
void shouldGetTags() {
Registry registry = Registry.builder().build();
ContainerRef containerRef = ContainerRef.parse("ghcr.io/jenkinsci/helm-charts/jenkins");
Tags tags = registry.getTags(containerRef);
assertTrue(tags.tags().contains("5.9.40"), "Tag 5.9.40 must exists");
assertTrue(tags.tags().size() > 50, "More that 50 must be returned");
}

@Test
void shouldPullIndex() {
Registry registry = Registry.builder().build();
Expand Down
Loading