Skip to content
Merged
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
13 changes: 11 additions & 2 deletions src/main/java/land/oras/auth/HttpClient.java
Original file line number Diff line number Diff line change
Expand Up @@ -525,7 +525,7 @@ private <T> ResponseWrapper<T> executeRequest(
newScopes,
authProvider);
}
return redoRequest(response, builder, handler, newScopes, authProvider);
return redoRequest(uri, response, builder, handler, newScopes, authProvider);
} catch (Exception e) {
if (e instanceof OrasException) {
throw (OrasException) e;
Expand All @@ -542,6 +542,7 @@ private <T> String getLocationHeader(HttpResponse<T> response) {
}

private <T> ResponseWrapper<T> redoRequest(
URI originUri,
HttpResponse<T> response,
HttpRequest.Builder builder,
HttpResponse.BodyHandler<T> handler,
Expand Down Expand Up @@ -572,7 +573,15 @@ private <T> ResponseWrapper<T> redoRequest(
// Follow redirect
if (shouldRedirect(newResponse)) {
String location = getLocationHeader(newResponse);
LOG.debug("Redirecting after auth to {}", location);
URI redirectUri = URI.create(location);
LOG.debug("Redirecting to {} from domain {} to domain {}", location, originUri, redirectUri);
boolean includeAuthHeaderForRedirect = isSameOrigin(originUri, redirectUri);
if (!includeAuthHeaderForRedirect) {
LOG.debug("Skipping auth header for redirect from {} to {}", originUri, redirectUri);
builder = HttpRequest.newBuilder(
builder.build(), (name, value) -> !name.equalsIgnoreCase(Const.AUTHORIZATION_HEADER));
}

return toResponseWrapper(
client.send(builder.uri(URI.create(location)).build(), handler));
}
Expand Down