Skip to content
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

Checking for multiple registries when login/logout #24888

Closed
wants to merge 1 commit into from
Closed

Checking for multiple registries when login/logout #24888

Show file tree
Hide file tree
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
5 changes: 5 additions & 0 deletions cmd/podman/login.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (

"github.com/containers/common/pkg/auth"
"github.com/containers/common/pkg/completion"
"github.com/containers/image/v5/pkg/sysregistriesv2"
"github.com/containers/image/v5/types"
"github.com/containers/podman/v5/cmd/podman/common"
"github.com/containers/podman/v5/cmd/podman/registry"
Expand Down Expand Up @@ -99,6 +100,10 @@ func login(cmd *cobra.Command, args []string) error {
DockerInsecureSkipTLSVerify: skipTLS,
}
common.SetRegistriesConfPath(sysCtx)
registriesFromFile, _ := sysregistriesv2.UnqualifiedSearchRegistries(sysCtx)
if len(registriesFromFile) > 1 {
return errors.New("multiple registries in registry.conf, a registry must be provided")
}
Comment on lines +103 to +106
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a breaking change so we cannot accept this until a 6.0 IMO.
And most importantly this code is broken. You always reject more than one registry even if one was specifed as argument on the cli (in the args array)

Any the login code seem shared between buildah and skopeo as well so if we decide to fix this we should fix this for all in https://github.com/containers/common/blob/main/pkg/auth/auth.go

And if you look into that code you see there is already an AcceptUnspecifiedRegistry option which is quite whay you do here but it we can add another case there for this new behavior.
https://github.com/containers/common/blob/514bf04d8e6a6ac19b71147b534875ca8001785f/pkg/auth/auth.go#L137

Copy link
Author

@lslavkov lslavkov Jan 9, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So if I understand correctly that registriesFromFile is gonna fail regardless if we add which registry we wish to login?

I understand your point now. The approach there is more elegant that this one. Do you want me to modify to something similar to that? https://github.com/containers/common/blob/514bf04d8e6a6ac19b71147b534875ca8001785f/pkg/auth/auth.go#L137

loginOptions.GetLoginSet = cmd.Flag("get-login").Changed
return auth.Login(context.Background(), sysCtx, &loginOptions.LoginOptions, args)
}
6 changes: 6 additions & 0 deletions cmd/podman/logout.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
package main

import (
"errors"
"os"

"github.com/containers/common/pkg/auth"
"github.com/containers/common/pkg/completion"
"github.com/containers/image/v5/pkg/sysregistriesv2"
"github.com/containers/image/v5/types"
"github.com/containers/podman/v5/cmd/podman/common"
"github.com/containers/podman/v5/cmd/podman/registry"
Expand Down Expand Up @@ -50,5 +52,9 @@ func init() {
func logout(cmd *cobra.Command, args []string) error {
sysCtx := &types.SystemContext{}
common.SetRegistriesConfPath(sysCtx)
registriesFromFile, _ := sysregistriesv2.UnqualifiedSearchRegistries(sysCtx)
if len(registriesFromFile) > 1 {
return errors.New("multiple registries in registry.conf, a registry must be provided")
}
return auth.Logout(sysCtx, &logoutOptions, args)
}
Loading