diff options
author | Jhon Honce <jhonce@redhat.com> | 2020-06-04 11:51:29 -0700 |
---|---|---|
committer | Jhon Honce <jhonce@redhat.com> | 2020-06-23 08:18:53 -0700 |
commit | 7377e578a9402a416579be92cee44c3b3786f81a (patch) | |
tree | c1424a43cc606ed11c8b0b5fb5f9f199ab0d83c5 /pkg/bindings/bindings.go | |
parent | b2c42a0993d2129c910036d4054ec25129d09f18 (diff) | |
download | podman-7377e578a9402a416579be92cee44c3b3786f81a.tar.gz podman-7377e578a9402a416579be92cee44c3b3786f81a.tar.bz2 podman-7377e578a9402a416579be92cee44c3b3786f81a.zip |
V2 podman system connection
* Implement command
* Refactor podman-remote to pull from containers.conf by default
* podman-remote defaults to --remote being true
* Write podman-system-connection.1.md
Signed-off-by: Jhon Honce <jhonce@redhat.com>
Diffstat (limited to 'pkg/bindings/bindings.go')
-rw-r--r-- | pkg/bindings/bindings.go | 43 |
1 files changed, 0 insertions, 43 deletions
diff --git a/pkg/bindings/bindings.go b/pkg/bindings/bindings.go index 94f7a45d0..ae5610b0f 100644 --- a/pkg/bindings/bindings.go +++ b/pkg/bindings/bindings.go @@ -8,13 +8,7 @@ package bindings import ( - "errors" - "fmt" - "io" - "os" - "github.com/blang/semver" - "golang.org/x/crypto/ssh/terminal" ) var ( @@ -30,40 +24,3 @@ var ( // APIVersion - podman will fail to run if this value is wrong APIVersion = semver.MustParse("1.0.0") ) - -// readPassword prompts for a secret and returns value input by user from stdin -// Unlike terminal.ReadPassword(), $(echo $SECRET | podman...) is supported. -// Additionally, all input after `<secret>/n` is queued to podman command. -func readPassword(prompt string) (pw []byte, err error) { - fd := int(os.Stdin.Fd()) - if terminal.IsTerminal(fd) { - fmt.Fprint(os.Stderr, prompt) - pw, err = terminal.ReadPassword(fd) - fmt.Fprintln(os.Stderr) - return - } - - var b [1]byte - for { - n, err := os.Stdin.Read(b[:]) - // terminal.ReadPassword discards any '\r', so we do the same - if n > 0 && b[0] != '\r' { - if b[0] == '\n' { - return pw, nil - } - pw = append(pw, b[0]) - // limit size, so that a wrong input won't fill up the memory - if len(pw) > 1024 { - err = errors.New("password too long, 1024 byte limit") - } - } - if err != nil { - // terminal.ReadPassword accepts EOF-terminated passwords - // if non-empty, so we do the same - if err == io.EOF && len(pw) > 0 { - err = nil - } - return pw, err - } - } -} |