Commit [cli@27b2797] forked the AuthConfig type from the API, and changed
existing code to do a direct cast / convert of the forked type to the API
type. This can cause issues if the API types diverges, such as the removal
of the Email field.
This patch explicitly maps each field to the corresponding API type, but
adds some TODOs, because various code-paths only included a subset of the
fields, which may be intentional for fields that were meant to be handled
on the daemon / registry-client only.
We should evaluate these conversions to make sure these fields should
be sent from the client or not (and possibly even removed from the API
type).
[cli@27b2797]: 27b2797f7d
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
236 lines
8.2 KiB
Go
236 lines
8.2 KiB
Go
package command
|
|
|
|
import (
|
|
"context"
|
|
"errors"
|
|
"fmt"
|
|
"os"
|
|
"runtime"
|
|
"strings"
|
|
|
|
"github.com/distribution/reference"
|
|
"github.com/docker/cli/cli/config/configfile"
|
|
"github.com/docker/cli/cli/config/credentials"
|
|
configtypes "github.com/docker/cli/cli/config/types"
|
|
"github.com/docker/cli/cli/hints"
|
|
"github.com/docker/cli/cli/streams"
|
|
"github.com/docker/cli/internal/prompt"
|
|
"github.com/docker/cli/internal/tui"
|
|
"github.com/moby/moby/api/pkg/authconfig"
|
|
registrytypes "github.com/moby/moby/api/types/registry"
|
|
"github.com/morikuni/aec"
|
|
)
|
|
|
|
const (
|
|
registerSuggest = "Log in with your Docker ID or email address to push and pull images from Docker Hub. " +
|
|
"If you don't have a Docker ID, head over to https://hub.docker.com/ to create one."
|
|
patSuggest = "You can log in with your password or a Personal Access " +
|
|
"Token (PAT). Using a limited-scope PAT grants better security and is required " +
|
|
"for organizations using SSO. Learn more at https://docs.docker.com/go/access-tokens/"
|
|
)
|
|
|
|
// authConfigKey is the key used to store credentials for Docker Hub. It is
|
|
// a copy of [registry.IndexServer].
|
|
//
|
|
// [registry.IndexServer]: https://pkg.go.dev/github.com/docker/docker@v28.3.3+incompatible/registry#IndexServer
|
|
const authConfigKey = "https://index.docker.io/v1/"
|
|
|
|
// ResolveAuthConfig returns auth-config for the given registry from the
|
|
// credential-store. It returns an empty AuthConfig if no credentials were
|
|
// found.
|
|
//
|
|
// It is similar to [registry.ResolveAuthConfig], but uses the credentials-
|
|
// store, instead of looking up credentials from a map.
|
|
//
|
|
// [registry.ResolveAuthConfig]: https://pkg.go.dev/github.com/docker/docker@v28.3.3+incompatible/registry#ResolveAuthConfig
|
|
func ResolveAuthConfig(cfg *configfile.ConfigFile, index *registrytypes.IndexInfo) registrytypes.AuthConfig {
|
|
configKey := index.Name
|
|
if index.Official {
|
|
configKey = authConfigKey
|
|
}
|
|
|
|
a, _ := cfg.GetAuthConfig(configKey)
|
|
return registrytypes.AuthConfig{
|
|
Username: a.Username,
|
|
Password: a.Password,
|
|
ServerAddress: a.ServerAddress,
|
|
|
|
// TODO(thaJeztah): Are these expected to be included?
|
|
Auth: a.Auth,
|
|
IdentityToken: a.IdentityToken,
|
|
RegistryToken: a.RegistryToken,
|
|
}
|
|
}
|
|
|
|
// GetDefaultAuthConfig gets the default auth config given a serverAddress
|
|
// If credentials for given serverAddress exists in the credential store, the configuration will be populated with values in it
|
|
func GetDefaultAuthConfig(cfg *configfile.ConfigFile, checkCredStore bool, serverAddress string, isDefaultRegistry bool) (registrytypes.AuthConfig, error) {
|
|
if !isDefaultRegistry {
|
|
serverAddress = credentials.ConvertToHostname(serverAddress)
|
|
}
|
|
authCfg := configtypes.AuthConfig{}
|
|
var err error
|
|
if checkCredStore {
|
|
authCfg, err = cfg.GetAuthConfig(serverAddress)
|
|
if err != nil {
|
|
return registrytypes.AuthConfig{
|
|
ServerAddress: serverAddress,
|
|
}, err
|
|
}
|
|
}
|
|
|
|
return registrytypes.AuthConfig{
|
|
Username: authCfg.Username,
|
|
Password: authCfg.Password,
|
|
ServerAddress: serverAddress,
|
|
|
|
// TODO(thaJeztah): Are these expected to be included?
|
|
Auth: authCfg.Auth,
|
|
IdentityToken: "",
|
|
RegistryToken: authCfg.RegistryToken,
|
|
}, nil
|
|
}
|
|
|
|
// PromptUserForCredentials handles the CLI prompt for the user to input
|
|
// credentials.
|
|
// If argUser is not empty, then the user is only prompted for their password.
|
|
// If argPassword is not empty, then the user is only prompted for their username
|
|
// If neither argUser nor argPassword are empty, then the user is not prompted and
|
|
// an AuthConfig is returned with those values.
|
|
// If defaultUsername is not empty, the username prompt includes that username
|
|
// and the user can hit enter without inputting a username to use that default
|
|
// username.
|
|
func PromptUserForCredentials(ctx context.Context, cli Cli, argUser, argPassword, defaultUsername, serverAddress string) (registrytypes.AuthConfig, error) {
|
|
// On Windows, force the use of the regular OS stdin stream.
|
|
//
|
|
// See:
|
|
// - https://github.com/moby/moby/issues/14336
|
|
// - https://github.com/moby/moby/issues/14210
|
|
// - https://github.com/moby/moby/pull/17738
|
|
//
|
|
// TODO(thaJeztah): we need to confirm if this special handling is still needed, as we may not be doing this in other places.
|
|
if runtime.GOOS == "windows" {
|
|
cli.SetIn(streams.NewIn(os.Stdin))
|
|
}
|
|
|
|
argUser = strings.TrimSpace(argUser)
|
|
if argUser == "" {
|
|
if serverAddress == authConfigKey {
|
|
// When signing in to the default (Docker Hub) registry, we display
|
|
// hints for creating an account, and (if hints are enabled), using
|
|
// a token instead of a password.
|
|
_, _ = fmt.Fprintln(cli.Out(), registerSuggest)
|
|
if hints.Enabled() {
|
|
_, _ = fmt.Fprintln(cli.Out(), patSuggest)
|
|
_, _ = fmt.Fprintln(cli.Out())
|
|
}
|
|
}
|
|
|
|
var msg string
|
|
defaultUsername = strings.TrimSpace(defaultUsername)
|
|
if defaultUsername == "" {
|
|
msg = "Username: "
|
|
} else {
|
|
msg = fmt.Sprintf("Username (%s): ", defaultUsername)
|
|
}
|
|
|
|
var err error
|
|
argUser, err = prompt.ReadInput(ctx, cli.In(), cli.Out(), msg)
|
|
if err != nil {
|
|
return registrytypes.AuthConfig{}, err
|
|
}
|
|
if argUser == "" {
|
|
argUser = defaultUsername
|
|
}
|
|
if argUser == "" {
|
|
return registrytypes.AuthConfig{}, errors.New("error: username is required")
|
|
}
|
|
}
|
|
|
|
argPassword = strings.TrimSpace(argPassword)
|
|
if argPassword == "" {
|
|
restoreInput, err := prompt.DisableInputEcho(cli.In())
|
|
if err != nil {
|
|
return registrytypes.AuthConfig{}, err
|
|
}
|
|
defer func() {
|
|
if err := restoreInput(); err != nil {
|
|
// TODO(thaJeztah): we should consider printing instructions how
|
|
// to restore this manually (other than restarting the shell).
|
|
// e.g., 'run stty echo' when in a Linux or macOS shell, but
|
|
// PowerShell and CMD.exe may need different instructions.
|
|
_, _ = fmt.Fprintln(cli.Err(), "Error: failed to restore terminal state to echo input:", err)
|
|
}
|
|
}()
|
|
|
|
if serverAddress == authConfigKey {
|
|
out := tui.NewOutput(cli.Err())
|
|
out.PrintNote("A Personal Access Token (PAT) can be used instead.\n" +
|
|
"To create a PAT, visit " + aec.Underline.Apply("https://app.docker.com/settings") + "\n\n")
|
|
}
|
|
|
|
argPassword, err = prompt.ReadInput(ctx, cli.In(), cli.Out(), "Password: ")
|
|
if err != nil {
|
|
return registrytypes.AuthConfig{}, err
|
|
}
|
|
_, _ = fmt.Fprintln(cli.Out())
|
|
if argPassword == "" {
|
|
return registrytypes.AuthConfig{}, errors.New("error: password is required")
|
|
}
|
|
}
|
|
|
|
return registrytypes.AuthConfig{
|
|
Username: argUser,
|
|
Password: argPassword,
|
|
ServerAddress: serverAddress,
|
|
}, nil
|
|
}
|
|
|
|
// RetrieveAuthTokenFromImage retrieves an encoded auth token given a
|
|
// complete image reference. The auth configuration is serialized as a
|
|
// base64url encoded ([RFC 4648, Section 5]) JSON string for sending through
|
|
// the "X-Registry-Auth" header.
|
|
//
|
|
// [RFC 4648, Section 5]: https://tools.ietf.org/html/rfc4648#section-5
|
|
func RetrieveAuthTokenFromImage(cfg *configfile.ConfigFile, image string) (string, error) {
|
|
registryRef, err := reference.ParseNormalizedNamed(image)
|
|
if err != nil {
|
|
return "", err
|
|
}
|
|
configKey := getAuthConfigKey(reference.Domain(registryRef))
|
|
authConfig, err := cfg.GetAuthConfig(configKey)
|
|
if err != nil {
|
|
return "", err
|
|
}
|
|
|
|
encodedAuth, err := authconfig.Encode(registrytypes.AuthConfig{
|
|
Username: authConfig.Username,
|
|
Password: authConfig.Password,
|
|
ServerAddress: authConfig.ServerAddress,
|
|
|
|
// TODO(thaJeztah): Are these expected to be included?
|
|
Auth: authConfig.Auth,
|
|
IdentityToken: authConfig.IdentityToken,
|
|
RegistryToken: authConfig.RegistryToken,
|
|
})
|
|
if err != nil {
|
|
return "", err
|
|
}
|
|
return encodedAuth, nil
|
|
}
|
|
|
|
// getAuthConfigKey special-cases using the full index address of the official
|
|
// index as the AuthConfig key, and uses the (host)name[:port] for private indexes.
|
|
//
|
|
// It is similar to [registry.GetAuthConfigKey], but does not require on
|
|
// [registrytypes.IndexInfo] as intermediate.
|
|
//
|
|
// [registry.GetAuthConfigKey]: https://pkg.go.dev/github.com/docker/docker@v28.3.3+incompatible/registry#GetAuthConfigKey
|
|
// [registrytypes.IndexInfo]: https://pkg.go.dev/github.com/docker/docker@v28.3.3+incompatible/api/types/registry#IndexInfo
|
|
func getAuthConfigKey(domainName string) string {
|
|
if domainName == "docker.io" || domainName == "index.docker.io" {
|
|
return authConfigKey
|
|
}
|
|
return domainName
|
|
}
|