Skip to content

fix: surface HTTP fallback error when HTTPS registry login fails #6882

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
vatsalgargg wants to merge 1 commit into
base: master
Choose a base branch
from
+7 −0
Open

fix: surface HTTP fallback error when HTTPS registry login fails #6882

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
7 changes: 7 additions & 0 deletions cli/command/registry/login.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,8 +169,15 @@ func runLogin(ctx context.Context, dockerCLI command.Cli, opts loginOptions) err
// if we failed to authenticate with stored credentials (or didn't have stored credentials),
// prompt the user for new credentials
if err != nil || authConfig.Username == "" || authConfig.Password == "" {
msg, err = loginUser(ctx, dockerCLI, opts, authConfig.Username, authConfig.ServerAddress)
msg, err = loginUser(ctx, dockerCLI, opts, authConfig.Username, authConfig.ServerAddress)
if err != nil {
// --- PATCH START: Expose HTTPS to HTTP fallback failures ---
if strings.HasPrefix(opts.serverAddress, "https://") && strings.Contains(err.Error(), "http://") {
return fmt.Errorf("login failed: you requested HTTPS, but the daemon fell back to HTTP (insecure registry) and was rejected.\nDaemon error: %w", err)
}
// --- PATCH END ---

return err
}
}
Expand Down