Skip to content

Re-authenticate against OCI registry after 403 error #945

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

Merged
chrmarti merged 1 commit into from
Jan 22, 2025
Merged

Re-authenticate against OCI registry after 403 error #945

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
10 changes: 5 additions & 5 deletions src/spec-configuration/httpOCIRegistry.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ const scopeRegex = /scope="([^"]+)"/;

// https://docs.docker.com/registry/spec/auth/token/#how-to-authenticate
export async function requestEnsureAuthenticated(params: CommonParams, httpOptions: { type: string; url: string; headers: HEADERS; data?: Buffer }, ociRef: OCIRef | OCICollectionRef) {
// If needed, Initialize the Authorization header cache.
// If needed, Initialize the Authorization header cache.
if (!params.cachedAuthHeader) {
params.cachedAuthHeader = {};
}
Expand All @@ -54,14 +54,14 @@ export async function requestEnsureAuthenticated(params: CommonParams, httpOptio

const initialAttemptRes = await requestResolveHeaders(httpOptions, output);

// For anything except a 401 response
// Simply return the original response to the caller.
if (initialAttemptRes.statusCode !== 401) {
// For anything except a 401 (invalid/no token) or 403 (insufficient scope)
// response simply return the original response to the caller.
if (initialAttemptRes.statusCode !== 401 && initialAttemptRes.statusCode !== 403) {
output.write(`[httpOci] ${initialAttemptRes.statusCode} (${maybeCachedAuthHeader ? 'Cached' : 'NoAuth'}): ${httpOptions.url}`, LogLevel.Trace);
return initialAttemptRes;
}

// -- 'responseAttempt' status code was 401 at this point.
// -- 'responseAttempt' status code was 401 or 403 at this point.

// Attempt to authenticate via WWW-Authenticate Header.
const wwwAuthenticate = initialAttemptRes.resHeaders['WWW-Authenticate'] || initialAttemptRes.resHeaders['www-authenticate'];
Expand Down
Loading