mirror of
https://github.com/kubernetes/sample-controller.git
synced 2025-02-08 06:52:56 +08:00
96b07c14ac
Automatic merge from submit-queue (batch tested with PRs 61818, 61800). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Replace gopass.GetPasswdMasked() by terminal.ReadPassword() **What this PR does / why we need it**: Replace `gopass.GetPasswdMasked()` used for reading passwords from the terminal with [`terminal.ReadPassword()`](https://godoc.org/golang.org/x/crypto/ssh/terminal#ReadPassword). This removes the `gopass` import. **Special notes for your reviewer**: Ran the following commands to update `godep` files: ``` ./hack/godep-restore.sh -v ./hack/godep-save.sh ./hack/update-staging-godeps.sh ./hack/update-bazel.sh ``` /sig auth /kind enhancement /assign @ericchiang ```release-note NONE ``` Kubernetes-commit: a5133305a9f347c79c20c5785d41cc9400be895e
112 lines
3.1 KiB
Go
112 lines
3.1 KiB
Go
/*
|
|
Copyright 2014 The Kubernetes Authors.
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
*/
|
|
|
|
package clientcmd
|
|
|
|
import (
|
|
"encoding/json"
|
|
"fmt"
|
|
"io"
|
|
"io/ioutil"
|
|
"os"
|
|
|
|
"golang.org/x/crypto/ssh/terminal"
|
|
|
|
clientauth "k8s.io/client-go/tools/auth"
|
|
)
|
|
|
|
// AuthLoaders are used to build clientauth.Info objects.
|
|
type AuthLoader interface {
|
|
// LoadAuth takes a path to a config file and can then do anything it needs in order to return a valid clientauth.Info
|
|
LoadAuth(path string) (*clientauth.Info, error)
|
|
}
|
|
|
|
// default implementation of an AuthLoader
|
|
type defaultAuthLoader struct{}
|
|
|
|
// LoadAuth for defaultAuthLoader simply delegates to clientauth.LoadFromFile
|
|
func (*defaultAuthLoader) LoadAuth(path string) (*clientauth.Info, error) {
|
|
return clientauth.LoadFromFile(path)
|
|
}
|
|
|
|
type PromptingAuthLoader struct {
|
|
reader io.Reader
|
|
}
|
|
|
|
// LoadAuth parses an AuthInfo object from a file path. It prompts user and creates file if it doesn't exist.
|
|
func (a *PromptingAuthLoader) LoadAuth(path string) (*clientauth.Info, error) {
|
|
// Prompt for user/pass and write a file if none exists.
|
|
if _, err := os.Stat(path); os.IsNotExist(err) {
|
|
authPtr, err := a.Prompt()
|
|
auth := *authPtr
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
data, err := json.Marshal(auth)
|
|
if err != nil {
|
|
return &auth, err
|
|
}
|
|
err = ioutil.WriteFile(path, data, 0600)
|
|
return &auth, err
|
|
}
|
|
authPtr, err := clientauth.LoadFromFile(path)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return authPtr, nil
|
|
}
|
|
|
|
// Prompt pulls the user and password from a reader
|
|
func (a *PromptingAuthLoader) Prompt() (*clientauth.Info, error) {
|
|
var err error
|
|
auth := &clientauth.Info{}
|
|
auth.User, err = promptForString("Username", a.reader, true)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
auth.Password, err = promptForString("Password", nil, false)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return auth, nil
|
|
}
|
|
|
|
func promptForString(field string, r io.Reader, show bool) (result string, err error) {
|
|
fmt.Printf("Please enter %s: ", field)
|
|
if show {
|
|
_, err = fmt.Fscan(r, &result)
|
|
} else {
|
|
var data []byte
|
|
if terminal.IsTerminal(int(os.Stdin.Fd())) {
|
|
data, err = terminal.ReadPassword(int(os.Stdin.Fd()))
|
|
result = string(data)
|
|
} else {
|
|
return "", fmt.Errorf("error reading input for %s", field)
|
|
}
|
|
}
|
|
return result, err
|
|
}
|
|
|
|
// NewPromptingAuthLoader is an AuthLoader that parses an AuthInfo object from a file path. It prompts user and creates file if it doesn't exist.
|
|
func NewPromptingAuthLoader(reader io.Reader) *PromptingAuthLoader {
|
|
return &PromptingAuthLoader{reader}
|
|
}
|
|
|
|
// NewDefaultAuthLoader returns a default implementation of an AuthLoader that only reads from a config file
|
|
func NewDefaultAuthLoader() AuthLoader {
|
|
return &defaultAuthLoader{}
|
|
}
|