mirror of
https://github.com/containers/podman.git
synced 2026-02-01 09:52:16 -05:00
5cbb0b8a66
If the first time you run podman in a user account you do a su - USER, and the second time, you run as the logged in USER podman fails, because it is not handling the tmpdir definition in the database. This PR fixes this problem. vendor containers/common v0.11.1 This should fix a couple of issues we have seen in podman 1.9.1 with handling of libpod.conf. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
59 lines
2.5 KiB
Go
59 lines
2.5 KiB
Go
package auth
|
|
|
|
import (
|
|
"io"
|
|
|
|
"github.com/spf13/pflag"
|
|
)
|
|
|
|
// LoginOptions represents common flags in login
|
|
// In addition, the caller should probably provide a --tls-verify flag (that affects the provided
|
|
// *types.SystemContest)
|
|
type LoginOptions struct {
|
|
// CLI flags managed by the FlagSet returned by GetLoginFlags
|
|
// Callers that use GetLoginFlags should not need to touch these values at all; callers that use
|
|
// other CLI frameworks should set them based on user input.
|
|
AuthFile string
|
|
CertDir string
|
|
Password string
|
|
Username string
|
|
StdinPassword bool
|
|
GetLoginSet bool
|
|
// Options caller can set
|
|
Stdin io.Reader // set to os.Stdin
|
|
Stdout io.Writer // set to os.Stdout
|
|
AcceptUnspecifiedRegistry bool // set to true if allows login with unspecified registry
|
|
}
|
|
|
|
// LogoutOptions represents the results for flags in logout
|
|
type LogoutOptions struct {
|
|
// CLI flags managed by the FlagSet returned by GetLogoutFlags
|
|
// Callers that use GetLogoutFlags should not need to touch these values at all; callers that use
|
|
// other CLI frameworks should set them based on user input.
|
|
AuthFile string
|
|
All bool
|
|
// Options caller can set
|
|
Stdout io.Writer // set to os.Stdout
|
|
AcceptUnspecifiedRegistry bool // set to true if allows logout with unspecified registry
|
|
}
|
|
|
|
// GetLoginFlags defines and returns login flags for containers tools
|
|
func GetLoginFlags(flags *LoginOptions) *pflag.FlagSet {
|
|
fs := pflag.FlagSet{}
|
|
fs.StringVar(&flags.AuthFile, "authfile", GetDefaultAuthFile(), "path of the authentication file. Use REGISTRY_AUTH_FILE environment variable to override")
|
|
fs.StringVar(&flags.CertDir, "cert-dir", "", "use certificates at the specified path to access the registry")
|
|
fs.StringVarP(&flags.Password, "password", "p", "", "Password for registry")
|
|
fs.StringVarP(&flags.Username, "username", "u", "", "Username for registry")
|
|
fs.BoolVar(&flags.StdinPassword, "password-stdin", false, "Take the password from stdin")
|
|
fs.BoolVar(&flags.GetLoginSet, "get-login", false, "Return the current login user for the registry")
|
|
return &fs
|
|
}
|
|
|
|
// GetLogoutFlags defines and returns logout flags for containers tools
|
|
func GetLogoutFlags(flags *LogoutOptions) *pflag.FlagSet {
|
|
fs := pflag.FlagSet{}
|
|
fs.StringVar(&flags.AuthFile, "authfile", GetDefaultAuthFile(), "path of the authentication file. Use REGISTRY_AUTH_FILE environment variable to override")
|
|
fs.BoolVarP(&flags.All, "all", "a", false, "Remove the cached credentials for all registries in the auth file")
|
|
return &fs
|
|
}
|