Skip to content
This repository has been archived by the owner on Nov 27, 2023. It is now read-only.

login: Remove the PAT message #2261

Merged
merged 1 commit into from
Aug 2, 2023
Merged
Show file tree
Hide file tree
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
2 changes: 0 additions & 2 deletions cli/mobycli/exec.go
Original file line number Diff line number Diff line change
Expand Up @@ -117,8 +117,6 @@ func Exec(_ *cobra.Command) {
displayScoutQuickViewSuggestMsgOnBuild(commandArgs)
case "pull":
displayScoutQuickViewSuggestMsgOnPull(commandArgs)
case "login":
displayPATSuggestMsg(commandArgs)
default:
}
}
Expand Down
27 changes: 0 additions & 27 deletions cli/mobycli/pat_suggest.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,43 +17,16 @@
package mobycli

import (
"fmt"
"os"
"strings"

"github.com/docker/cli/cli/config"
"github.com/docker/docker/registry"
"github.com/hashicorp/go-uuid"
)

const (
// patSuggestMsg is a message to suggest the use of PAT (personal access tokens).
patSuggestMsg = `Logging in with your password grants your terminal complete access to your account.
For better security, log in with a limited-privilege personal access token. Learn more at https://docs.docker.com/go/access-tokens/`
)

var (
patPrefixes = []string{"dckrp_", "dckr_pat_"}
)

// displayPATSuggestMsg displays a message suggesting users to use PATs instead of passwords to reduce scope.
func displayPATSuggestMsg(cmdArgs []string) {
if os.Getenv("DOCKER_PAT_SUGGEST") == "false" {
return
}
if !isUsingDefaultRegistry(cmdArgs) {
return
}
authCfg, err := config.LoadDefaultConfigFile(os.Stderr).GetAuthConfig(registry.IndexServer)
if err != nil {
return
}
if !isUsingPassword(authCfg.Password) {
return
}
fmt.Fprintf(os.Stderr, "\n"+patSuggestMsg+"\n")
}

func isUsingDefaultRegistry(cmdArgs []string) bool {
for i := 1; i < len(cmdArgs); i++ {
if strings.HasPrefix(cmdArgs[i], "-") {
Expand Down
Loading