opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-21 09:28:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1905 from umohnani8/login

Browse Source 
Pick registry to login from full image name as well
This commit is contained in:
OpenShift Merge Robot
2018-12-06 12:08:49 -08:00
committed by GitHub
parent 5c6e02b55b a75b397ac1
commit fb3ceeb385
1 changed files with 37 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
cmd/podman/login.go
View File

@ -2,7 +2,6 @@ package main
import ( import (
"bufio" "bufio"
"context"
"fmt" "fmt"
"os" "os"
"strings" "strings"
@ -60,27 +59,48 @@ func loginCmd(c *cli.Context) error {
if len(args) == 0 { if len(args) == 0 {
return errors.Errorf("registry must be given") return errors.Errorf("registry must be given")
} }
server := scrubServer(args[0]) server := registryFromFullName(scrubServer(args[0]))
authfile := getAuthFile(c.String("authfile")) authfile := getAuthFile(c.String("authfile"))
sc := common.GetSystemContext("", authfile, false) sc := common.GetSystemContext("", authfile, false)
// username of user logged in to server (if one exists) // username of user logged in to server (if one exists)
userFromAuthFile, err := config.GetUserLoggedIn(sc, server) userFromAuthFile, passFromAuthFile, err := config.GetAuthentication(sc, server)
if err != nil { if err != nil {
return errors.Wrapf(err, "error getting logged-in user") return errors.Wrapf(err, "error getting logged-in user")
} }
username, password, err := getUserAndPass(c.String("username"), c.String("password"), userFromAuthFile)
ctx := getContext()
var (
username string
password string
)
if userFromAuthFile != "" {
username = userFromAuthFile
password = passFromAuthFile
fmt.Println("Authenticating with existing credentials...")
if err := docker.CheckAuth(ctx, sc, username, password, server); err == nil {
fmt.Println("Existing credentials are valid. Already logged in to", server)
return nil
}
fmt.Println("Existing credentials are invalid, please enter valid username and password")
}
username, password, err = getUserAndPass(c.String("username"), c.String("password"), userFromAuthFile)
if err != nil { if err != nil {
return errors.Wrapf(err, "error getting username and password") return errors.Wrapf(err, "error getting username and password")
} }
sc.DockerInsecureSkipTLSVerify = !c.BoolT("tls-verify") sc.DockerInsecureSkipTLSVerify = !c.BoolT("tls-verify")
if c.String("cert-dir") != "" { if c.String("cert-dir") != "" {
sc.DockerCertPath = c.String("cert-dir") sc.DockerCertPath = c.String("cert-dir")
} }
if err = docker.CheckAuth(context.TODO(), sc, username, password, server); err == nil { if err = docker.CheckAuth(ctx, sc, username, password, server); err == nil {
if err := config.SetAuthentication(sc, server, username, password); err != nil { // Write the new credentials to the authfile
if err = config.SetAuthentication(sc, server, username, password); err != nil {
return err return err
} }
} }
@ -126,3 +146,14 @@ func getUserAndPass(username, password, userFromAuthFile string) (string, string
} }
return strings.TrimSpace(username), password, err return strings.TrimSpace(username), password, err
} }
// registryFromFullName gets the registry from the input. If the input is of the form
// quay.io/myuser/myimage, it will parse it and just return quay.io
// It also returns true if a full image name was given
func registryFromFullName(input string) string {
split := strings.Split(input, "/")
if len(split) > 1 {
return split[0]
}
return split[0]
}