diff --git a/README.md b/README.md index f69af9f..83ae723 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ encrypted config. | Goal | Progress | Comment | | --- | :---: | --- | -| Support credentials CRUD via gRPC. | 80% | TODO: Update | +| Support credentials CRUD via gRPC. | 100% | | | Support mutual TLS. | 100% | | | Support storage of certs, PK, and host in AES-CBC encrypted config. | 100% | | | Support AES-GCM encryption of passes and OTP secrets, using MP and PK. | 100% | | diff --git a/cli/commands/root.go b/cli/commands/root.go index d1d04f0..50f3f02 100644 --- a/cli/commands/root.go +++ b/cli/commands/root.go @@ -34,9 +34,9 @@ can interact with the entire Selfpass API.`, rootCmd.AddCommand(makeDecryptCfg(mgr)) rootCmd.AddCommand(commands.MakeList(makeInitClient(mgr, clientInit))) rootCmd.AddCommand(commands.MakeCreate(mgr, makeInitClient(mgr, clientInit))) + rootCmd.AddCommand(commands.MakeUpdate(mgr, makeInitClient(mgr, clientInit))) rootCmd.AddCommand(commands.MakeGet(mgr, makeInitClient(mgr, clientInit))) rootCmd.AddCommand(commands.MakeDelete(makeInitClient(mgr, clientInit))) - rootCmd.AddCommand(commands.MakeCBCtoGCM(mgr, makeInitClient(mgr, clientInit))) check(rootCmd.Execute()) } diff --git a/credentials/commands/cbc_to_gcm.go b/credentials/commands/cbc_to_gcm.go deleted file mode 100644 index 8796daa..0000000 --- a/credentials/commands/cbc_to_gcm.go +++ /dev/null @@ -1,94 +0,0 @@ -package commands - -import ( - "context" - "encoding/base64" - "encoding/hex" - "fmt" - "time" - - "github.com/spf13/cobra" - - clitypes "github.com/mitchell/selfpass/cli/types" - "github.com/mitchell/selfpass/credentials/types" - "github.com/mitchell/selfpass/crypto" -) - -func MakeCBCtoGCM(repo clitypes.ConfigRepo, initClient CredentialClientInit) *cobra.Command { - cbcToGCM := &cobra.Command{ - Use: "cbc-to-gcm", - Hidden: true, - Run: func(cmd *cobra.Command, args []string) { - masterpass, cfg, err := repo.OpenConfig() - check(err) - - key, err := hex.DecodeString(cfg.GetString(clitypes.KeyPrivateKey)) - check(err) - - keypass, err := crypto.CombinePasswordAndKey([]byte(masterpass), key) - check(err) - - ctx, cancel := context.WithTimeout(context.Background(), time.Second*60) - defer cancel() - - client := initClient(ctx) - - mdch, errch := client.GetAllMetadata(ctx, "") - - for { - select { - case err := <-errch: - check(err) - case md, ok := <-mdch: - if !ok { - fmt.Println("All done.") - return - } - - cred, err := client.Get(ctx, md.ID) - check(err) - - passbytes, err := base64.StdEncoding.DecodeString(cred.Password) - check(err) - - plainpass, err := crypto.CBCDecrypt(keypass, passbytes) - check(err) - - passbytes, err = crypto.GCMEncrypt(keypass, plainpass) - check(err) - - cred.Password = base64.StdEncoding.EncodeToString(passbytes) - - if cred.OTPSecret != "" { - passbytes, err := base64.StdEncoding.DecodeString(cred.OTPSecret) - check(err) - - plainpass, err := crypto.CBCDecrypt(keypass, passbytes) - check(err) - - passbytes, err = crypto.GCMEncrypt(keypass, plainpass) - check(err) - - cred.OTPSecret = base64.StdEncoding.EncodeToString(passbytes) - } - - _, err = client.Update(ctx, cred.ID, types.CredentialInput{ - MetadataInput: types.MetadataInput{ - Tag: cred.Tag, - SourceHost: cred.SourceHost, - LoginURL: cred.LoginURL, - Primary: cred.Primary, - }, - OTPSecret: cred.OTPSecret, - Password: cred.Password, - Email: cred.Email, - Username: cred.Username, - }) - check(err) - } - } - }, - } - - return cbcToGCM -} diff --git a/credentials/commands/commands.go b/credentials/commands/commands.go index 844f960..2e252f1 100644 --- a/credentials/commands/commands.go +++ b/credentials/commands/commands.go @@ -4,6 +4,10 @@ import ( "context" "fmt" "os" + "sort" + "time" + + "gopkg.in/AlecAivazis/survey.v1" "github.com/mitchell/selfpass/credentials/types" ) @@ -16,3 +20,81 @@ func check(err error) { os.Exit(1) } } + +func selectCredential(client types.CredentialClient) types.Credential { + var ( + idKey string + source string + prompt survey.Prompt + ) + + ctx, cancel := context.WithTimeout(context.Background(), time.Second*5) + defer cancel() + + mdch, errch := client.GetAllMetadata(ctx, "") + mds := map[string][]types.Metadata{} + + fmt.Println() + +receive: + for { + select { + case <-ctx.Done(): + check(ctx.Err()) + + case err := <-errch: + check(err) + + case md, ok := <-mdch: + if !ok { + break receive + } + + mds[md.SourceHost] = append(mds[md.SourceHost], md) + } + } + + sources := []string{} + for source := range mds { + sources = append(sources, source) + } + + sort.Strings(sources) + + prompt = &survey.Select{ + Message: "Source host:", + Options: sources, + PageSize: 20, + VimMode: true, + } + + check(survey.AskOne(prompt, &source, nil)) + + keys := []string{} + keyIDMap := map[string]string{} + for _, md := range mds[source] { + key := md.Primary + if md.Tag != "" { + key += "-" + md.Tag + } + keys = append(keys, key) + keyIDMap[key] = md.ID + } + + prompt = &survey.Select{ + Message: "Primary user key (and tag):", + Options: keys, + PageSize: 20, + VimMode: true, + } + + check(survey.AskOne(prompt, &idKey, nil)) + + ctx, cancel = context.WithTimeout(context.Background(), time.Second*5) + defer cancel() + + cred, err := client.Get(ctx, keyIDMap[idKey]) + check(err) + + return cred +} diff --git a/credentials/commands/create.go b/credentials/commands/create.go index 4c663db..828c115 100644 --- a/credentials/commands/create.go +++ b/credentials/commands/create.go @@ -30,6 +30,13 @@ func MakeCreate(repo clitypes.ConfigRepo, initClient CredentialClientInit) *cobr password.`, Run: func(_ *cobra.Command, args []string) { + var ( + otp bool + cleancb bool + newpass bool + ci types.CredentialInput + ) + masterpass, cfg, err := repo.OpenConfig() check(err) @@ -61,7 +68,6 @@ password.`, Prompt: &survey.Input{Message: "Email:"}, }, } - var ci types.CredentialInput check(survey.Ask(mdqs, &ci.MetadataInput)) check(survey.Ask(cqs, &ci)) @@ -71,7 +77,6 @@ password.`, keypass, err := crypto.CombinePasswordAndKey([]byte(masterpass), []byte(key)) check(err) - var newpass bool prompt := &survey.Confirm{Message: "Do you want a random password?", Default: true} check(survey.AskOne(prompt, &newpass, nil)) @@ -104,7 +109,6 @@ password.`, ci.Password = base64.StdEncoding.EncodeToString(cipherpass) - var otp bool prompt = &survey.Confirm{Message: "Do you have an OTP/MFA secret?", Default: true} check(survey.AskOne(prompt, &otp, nil)) @@ -138,7 +142,6 @@ password.`, fmt.Println(c) - var cleancb bool prompt = &survey.Confirm{Message: "Do you want to clear the clipboard?", Default: true} check(survey.AskOne(prompt, &cleancb, nil)) diff --git a/credentials/commands/delete.go b/credentials/commands/delete.go index cd731d0..042930f 100644 --- a/credentials/commands/delete.go +++ b/credentials/commands/delete.go @@ -2,20 +2,29 @@ package commands import ( "context" + "fmt" "time" "github.com/spf13/cobra" "gopkg.in/AlecAivazis/survey.v1" ) -func MakeDelete(initConfig CredentialClientInit) *cobra.Command { +func MakeDelete(initClient CredentialClientInit) *cobra.Command { deleteCmd := &cobra.Command{ - Use: "delete [id]", + Use: "delete", Short: "Delete a credential using the given ID", Long: `Delete a credential using the given ID, permanently. THERE IS NO UNDOING THIS ACTION.`, - Args: cobra.ExactArgs(1), Run: func(cmd *cobra.Command, args []string) { + ctx, cancel := context.WithTimeout(context.Background(), time.Second*15) + defer cancel() + + client := initClient(ctx) + + cred := selectCredential(client) + + fmt.Println(cred) + var confirmed bool prompt := &survey.Confirm{Message: "Are you sure you want to permanently delete this credential?"} check(survey.AskOne(prompt, &confirmed, nil)) @@ -24,7 +33,7 @@ func MakeDelete(initConfig CredentialClientInit) *cobra.Command { ctx, cancel := context.WithTimeout(context.Background(), time.Second*25) defer cancel() - check(initConfig(ctx).Delete(ctx, args[0])) + check(initClient(ctx).Delete(ctx, cred.ID)) } }, } diff --git a/credentials/commands/get.go b/credentials/commands/get.go index c017850..4c40e71 100644 --- a/credentials/commands/get.go +++ b/credentials/commands/get.go @@ -5,7 +5,6 @@ import ( "encoding/base64" "encoding/hex" "fmt" - "sort" "time" "github.com/atotto/clipboard" @@ -14,7 +13,6 @@ import ( "gopkg.in/AlecAivazis/survey.v1" clitypes "github.com/mitchell/selfpass/cli/types" - "github.com/mitchell/selfpass/credentials/types" "github.com/mitchell/selfpass/crypto" ) @@ -26,6 +24,12 @@ func MakeGet(repo clitypes.ConfigRepo, initClient CredentialClientInit) *cobra.C decrypting password.`, Run: func(cmd *cobra.Command, args []string) { + var ( + copyPass bool + cleancb bool + prompt survey.Prompt + ) + ctx, cancel := context.WithTimeout(context.Background(), time.Second*15) defer cancel() @@ -33,76 +37,7 @@ decrypting password.`, masterpass, cfg, err := repo.OpenConfig() check(err) - ctx, cancel = context.WithTimeout(context.Background(), time.Second*5) - defer cancel() - - mdch, errch := client.GetAllMetadata(ctx, "") - mds := map[string][]types.Metadata{} - - fmt.Println() - - receive: - for count := 0; ; count++ { - select { - case <-ctx.Done(): - check(ctx.Err()) - - case err := <-errch: - check(err) - - case md, ok := <-mdch: - if !ok { - break receive - } - - mds[md.SourceHost] = append(mds[md.SourceHost], md) - } - } - - sources := []string{} - for source := range mds { - sources = append(sources, source) - } - - sort.Strings(sources) - - var prompt survey.Prompt - prompt = &survey.Select{ - Message: "Source host:", - Options: sources, - PageSize: 20, - VimMode: true, - } - - var source string - check(survey.AskOne(prompt, &source, nil)) - - keys := []string{} - keyIDMap := map[string]string{} - for _, md := range mds[source] { - key := md.Primary - if md.Tag != "" { - key += "-" + md.Tag - } - keys = append(keys, key) - keyIDMap[key] = md.ID - } - - prompt = &survey.Select{ - Message: "Primary user key (and tag):", - Options: keys, - PageSize: 20, - VimMode: true, - } - - var idKey string - check(survey.AskOne(prompt, &idKey, nil)) - - ctx, cancel = context.WithTimeout(context.Background(), time.Second*5) - defer cancel() - - cred, err := client.Get(ctx, keyIDMap[idKey]) - check(err) + cred := selectCredential(client) fmt.Println(cred) @@ -116,7 +51,6 @@ decrypting password.`, passkey, err := crypto.CombinePasswordAndKey([]byte(masterpass), key) check(err) - var copyPass bool prompt = &survey.Confirm{Message: "Copy password to clipboard?", Default: true} check(survey.AskOne(prompt, ©Pass, nil)) @@ -151,7 +85,6 @@ decrypting password.`, } } - var cleancb bool prompt = &survey.Confirm{Message: "Do you want to clear the clipboard?", Default: true} check(survey.AskOne(prompt, &cleancb, nil)) diff --git a/credentials/commands/list.go b/credentials/commands/list.go index 23d8d50..2fc3073 100644 --- a/credentials/commands/list.go +++ b/credentials/commands/list.go @@ -31,7 +31,7 @@ includes almost all the information but the most sensitive.`, fmt.Println() receive: - for count := 0; ; count++ { + for { select { case <-ctx.Done(): check(ctx.Err()) diff --git a/credentials/commands/update.go b/credentials/commands/update.go new file mode 100644 index 0000000..f343d98 --- /dev/null +++ b/credentials/commands/update.go @@ -0,0 +1,194 @@ +package commands + +import ( + "context" + "encoding/base64" + "encoding/hex" + "fmt" + "os" + "time" + + "github.com/atotto/clipboard" + "github.com/pquerna/otp/totp" + "github.com/spf13/cobra" + "gopkg.in/AlecAivazis/survey.v1" + + clitypes "github.com/mitchell/selfpass/cli/types" + "github.com/mitchell/selfpass/credentials/types" + "github.com/mitchell/selfpass/crypto" +) + +func MakeUpdate(repo clitypes.ConfigRepo, initClient CredentialClientInit) *cobra.Command { + var length uint + var numbers bool + var specials bool + + updateCmd := &cobra.Command{ + Use: "update", + Short: "Update a credential in Selfpass", + Long: `Update a credential in Selfpass, and save it to the server after encrypting the +password.`, + + Run: func(_ *cobra.Command, args []string) { + var ( + newpass bool + otp bool + cleancb bool + prompt survey.Prompt + ci types.CredentialInput + ) + + masterpass, cfg, err := repo.OpenConfig() + check(err) + + ctx, cancel := context.WithTimeout(context.Background(), time.Second*15) + defer cancel() + + client := initClient(ctx) + + cred := selectCredential(client) + + mdqs := []*survey.Question{ + { + Name: "primary", + Prompt: &survey.Input{ + Message: "Primary user key:", + Default: cred.Primary, + }, + }, + { + Name: "sourceHost", + Prompt: &survey.Input{ + Message: "Source host:", + Default: cred.SourceHost, + }, + }, + { + Name: "loginURL", + Prompt: &survey.Input{ + Message: "Login url:", + Default: cred.LoginURL, + }, + }, + { + Name: "tag", + Prompt: &survey.Input{ + Message: "Tag:", + Default: cred.Tag, + }, + }, + } + cqs := []*survey.Question{ + { + Name: "username", + Prompt: &survey.Input{ + Message: "Username:", + Default: cred.Username, + }, + }, + { + Name: "email", + Prompt: &survey.Input{ + Message: "Email:", + Default: cred.Email, + }, + }, + } + check(survey.Ask(mdqs, &ci.MetadataInput)) + check(survey.Ask(cqs, &ci)) + + ci.Password = cred.Password + ci.OTPSecret = cred.OTPSecret + + key, err := hex.DecodeString(cfg.GetString(clitypes.KeyPrivateKey)) + check(err) + + keypass, err := crypto.CombinePasswordAndKey([]byte(masterpass), []byte(key)) + check(err) + + prompt = &survey.Confirm{Message: "Do you want a new password?", Default: true} + check(survey.AskOne(prompt, &newpass, nil)) + + if newpass { + var randpass bool + prompt = &survey.Confirm{Message: "Do you want a random password?", Default: true} + check(survey.AskOne(prompt, &randpass, nil)) + + if randpass { + ci.Password = crypto.GeneratePassword(int(length), numbers, specials) + + var copypass bool + prompt = &survey.Confirm{Message: "Copy new pass to clipboard?", Default: true} + check(survey.AskOne(prompt, ©pass, nil)) + + if copypass { + check(clipboard.WriteAll(ci.Password)) + } + } else { + prompt := &survey.Password{Message: "Password: "} + check(survey.AskOne(prompt, &ci.Password, nil)) + + var cpass string + prompt = &survey.Password{Message: "Confirm password: "} + check(survey.AskOne(prompt, &cpass, nil)) + + if ci.Password != cpass { + fmt.Println("passwords didn't match") + os.Exit(1) + } + } + + cipherpass, err := crypto.GCMEncrypt(keypass, []byte(ci.Password)) + check(err) + + ci.Password = base64.StdEncoding.EncodeToString(cipherpass) + } + + prompt = &survey.Confirm{Message: "Do you want to set a new OTP/MFA secret?", Default: true} + check(survey.AskOne(prompt, &otp, nil)) + + if otp { + var secret string + prompt := &survey.Password{Message: "OTP secret:"} + check(survey.AskOne(prompt, &secret, nil)) + + ciphersecret, err := crypto.GCMEncrypt(keypass, []byte(secret)) + check(err) + + ci.OTPSecret = base64.StdEncoding.EncodeToString(ciphersecret) + + var copyotp bool + prompt2 := &survey.Confirm{Message: "Copy new OTP to clipboard?", Default: true} + check(survey.AskOne(prompt2, ©otp, nil)) + + if copyotp { + otp, err := totp.GenerateCode(secret, time.Now()) + check(err) + + check(clipboard.WriteAll(otp)) + } + } + + ctx, cancel = context.WithTimeout(context.Background(), time.Second*25) + defer cancel() + + c, err := initClient(ctx).Update(ctx, cred.ID, ci) + check(err) + + fmt.Println(c) + + prompt = &survey.Confirm{Message: "Do you want to clear the clipboard?", Default: true} + check(survey.AskOne(prompt, &cleancb, nil)) + + if cleancb { + check(clipboard.WriteAll(" ")) + } + }, + } + + updateCmd.Flags().BoolVarP(&numbers, "numbers", "n", true, "use numbers in the generated password") + updateCmd.Flags().BoolVarP(&specials, "specials", "s", false, "use special characters in the generated password") + updateCmd.Flags().UintVarP(&length, "length", "l", 32, "length of the generated password") + + return updateCmd +} diff --git a/go.mod b/go.mod index b5f211d..ea4acfa 100644 --- a/go.mod +++ b/go.mod @@ -9,12 +9,23 @@ require ( github.com/go-kit/kit v0.8.0 github.com/golang/protobuf v1.3.1 github.com/google/uuid v1.1.1 + github.com/kr/pty v1.1.5 // indirect + github.com/magiconair/properties v1.8.1 // indirect + github.com/mattn/go-colorable v0.1.2 // indirect github.com/mediocregopher/radix/v3 v3.2.3 github.com/mitchellh/go-homedir v1.1.0 + github.com/pelletier/go-toml v1.4.0 // indirect github.com/pquerna/otp v1.1.0 - github.com/spf13/cobra v0.0.4 + github.com/spf13/afero v1.2.2 // indirect + github.com/spf13/cobra v0.0.5 + github.com/spf13/jwalterweatherman v1.1.0 // indirect github.com/spf13/viper v1.4.0 - golang.org/x/crypto v0.0.0-20190530122614-20be4c3c3ed5 // indirect - google.golang.org/grpc v1.21.0 + github.com/stretchr/testify v1.3.0 // indirect + golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8 // indirect + golang.org/x/net v0.0.0-20190613194153-d28f0bde5980 // indirect + golang.org/x/sys v0.0.0-20190614160838-b47fdc937951 // indirect + golang.org/x/text v0.3.2 // indirect + google.golang.org/genproto v0.0.0-20190611190212-a7e196e89fd3 // indirect + google.golang.org/grpc v1.21.1 gopkg.in/AlecAivazis/survey.v1 v1.8.5 ) diff --git a/go.sum b/go.sum index bf81e34..9709549 100644 --- a/go.sum +++ b/go.sum @@ -5,6 +5,7 @@ github.com/Netflix/go-expect v0.0.0-20180615182759-c93bf25de8e8 h1:xzYJEypr/85nB github.com/Netflix/go-expect v0.0.0-20180615182759-c93bf25de8e8/go.mod h1:oX5x61PbNXchhh0oikYAH+4Pcfw5LKv21+Jnpr6r6Pc= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= +github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf h1:qet1QNfXsQxTZqLG4oE62mJzwPIB8+Tee4RNCL9ulrY= github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= github.com/atotto/clipboard v0.1.2 h1:YZCtFu5Ie8qX2VmVTBnrqLSiU9XOWwqNRmdT3gIQzbY= @@ -40,6 +41,7 @@ github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V github.com/go-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= +github.com/gogo/protobuf v1.2.1 h1:/s5zKNz0uPFCZ5hddgPdo2TK2TVrUNMn0OOX8/aZMTE= github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= @@ -67,6 +69,7 @@ github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7V github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 h1:Z9n2FFNUXsshfwJMBgNA0RU6/i7WVaAegv3PtuIHPMs= github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8= github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= +github.com/kisielk/gotool v1.0.0 h1:AV2c/EiW3KqPNT9ZKl07ehoAGi4C5/01Cfbblndcapg= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515 h1:T+h1c/A9Gawja4Y9mFVWj2vyii2bbUNDw3kt9VxK2EY= @@ -75,14 +78,22 @@ github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pty v1.1.1 h1:VkoXIwSboBpnk99O/KFauAEILuNHv5DVFKZMBN/gUgw= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/pty v1.1.5 h1:hyz3dwM5QLc1Rfoz4FuWJQG5BN7tc6K1MndAUnGpQr4= +github.com/kr/pty v1.1.5/go.mod h1:9r2w37qlBe7rQ6e1fg1S/9xpWHSnaqNdHD3WcMdbPDA= github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/magiconair/properties v1.8.0 h1:LLgXmsheXeRoUOBOjtwPQCWIYqM/LU1ayDtDePerRcY= github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= +github.com/magiconair/properties v1.8.1 h1:ZC2Vc7/ZFkGmsVC9KvOjumD+G5lXy2RtTKyzRKO2BQ4= +github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= github.com/mattn/go-colorable v0.0.9 h1:UVL0vNpWh04HeJXV0KLcaT7r06gOH2l4OW6ddYRUIY4= github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= +github.com/mattn/go-colorable v0.1.2 h1:/bC9yWikZXAL9uJdulbSfyVNIR3n3trXl+v8+1sx8mU= +github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= github.com/mattn/go-isatty v0.0.3 h1:ns/ykhmWi7G9O+8a448SecJU3nSMBXJfqQkl0upE1jI= github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= +github.com/mattn/go-isatty v0.0.8 h1:HLtExJ+uU2HOZ+wI0Tt5DtUDrx8yhUqDcp7fYERX4CE= +github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/mediocregopher/mediocre-go-lib v0.0.0-20181029021733-cb65787f37ed h1:3dQJqqDouawQgl3gBE1PNHKFkJYGEuFb1DbSlaxdosE= github.com/mediocregopher/mediocre-go-lib v0.0.0-20181029021733-cb65787f37ed/go.mod h1:dSsfyI2zABAdhcbvkXqgxOxrCsbYeHCPgrZkku60dSg= @@ -98,6 +109,8 @@ github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRW github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= github.com/pelletier/go-toml v1.2.0 h1:T5zMGML61Wp+FlcbWjRDT7yAxhJNAiPPLOFECq181zc= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= +github.com/pelletier/go-toml v1.4.0 h1:u3Z1r+oOXJIkxqw34zVhyPgjBsm6X2wn21NWs/HfSeg= +github.com/pelletier/go-toml v1.4.0/go.mod h1:PN7xzY2wHTK0K9p34ErDQMlFxa51Fk0OUruD3k1mMwo= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= @@ -119,21 +132,28 @@ github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4k github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/spf13/afero v1.1.2 h1:m8/z1t7/fwjysjQRYbP0RD+bUIF/8tJwPdEZsI83ACI= github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= +github.com/spf13/afero v1.2.2 h1:5jhuqJyZCZf2JRofRvN/nIFgIWNzPa3/Vz8mYylgbWc= +github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk= github.com/spf13/cast v1.3.0 h1:oget//CVOEoFewqQxwr0Ej5yjygnqGkvggSE/gB35Q8= github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= -github.com/spf13/cobra v0.0.4 h1:S0tLZ3VOKl2Te0hpq8+ke0eSJPfCnNTPiDlsfwi1/NE= -github.com/spf13/cobra v0.0.4/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU= +github.com/spf13/cobra v0.0.5 h1:f0B+LkLX6DtmRH1isoNA9VTtNUK9K8xYd28JNNfOv/s= +github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU= github.com/spf13/jwalterweatherman v1.0.0 h1:XHEdyB+EcvlqZamSM4ZOMGlc93t6AcsBEu9Gc1vn7yk= github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= +github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk= +github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo= github.com/spf13/pflag v1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg= github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s= github.com/spf13/viper v1.4.0 h1:yXHLWeravcrgGyFSyCgdYpXQ9dR9c/WED3pg1RhxqEU= github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.2.1/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= +github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q= +github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc= github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0= @@ -148,17 +168,23 @@ golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnf golang.org/x/crypto v0.0.0-20190123085648-057139ce5d2b/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 h1:VklqNMn3ovrHsnt90PveolxSbWFaJdECFbxSq0Mqo2M= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20190530122614-20be4c3c3ed5 h1:8dUaAV7K4uHsF56JQWkprecIQKdPHtR9jCHF5nB8uzc= -golang.org/x/crypto v0.0.0-20190530122614-20be4c3c3ed5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8 h1:1wopBVtVdWnn03fZelqdXTqk7U7zPQCb+T4rbU9ZEoU= +golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= +golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190522155817-f3200d17e092 h1:4QSRKanuywn15aTZvI/mIDEgPQpswuFndXpOj3rKEco= golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= +golang.org/x/net v0.0.0-20190613194153-d28f0bde5980 h1:dfGZHvZk057jK2MCeWus/TowKpJ8y4AmooUzdBSR9GU= +golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -171,20 +197,32 @@ golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5h golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a h1:1BGLXjeY4akVXGgbC9HugT3Jv3hCI0z56oJR5vAMgBU= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d h1:+R4KGOnez64A81RvjARKc4UT5/tI9ujCIVX+P5KiHuI= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190614160838-b47fdc937951 h1:ZUgGZ7PSkne6oY+VgAvayrB16owfm9/DKAtgWubzgzU= +golang.org/x/sys v0.0.0-20190614160838-b47fdc937951/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs= +golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= +google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8 h1:Nw54tB0rB7hY/N0NQvRW8DG4Yk3Q6T9cu9RcFQDu1tc= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= +google.golang.org/genproto v0.0.0-20190611190212-a7e196e89fd3 h1:0LGHEA/u5XLibPOx6D7D8FBT/ax6wT57vNKY0QckCwo= +google.golang.org/genproto v0.0.0-20190611190212-a7e196e89fd3/go.mod h1:z3L6/3dTEVtUr6QSP8miRzeRqwQOioJ9I66odjN4I7s= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.21.0 h1:G+97AoqBnmZIT91cLG/EkCoK9NSelj64P8bOHHNmGn0= google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= +google.golang.org/grpc v1.21.1 h1:j6XxA85m/6txkUCHvzlV5f+HBNl/1r5cZ2A/3IEFOO8= +google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= gopkg.in/AlecAivazis/survey.v1 v1.8.5 h1:QoEEmn/d5BbuPIL2qvXwzJdttFFhRQFkaq+tEKb7SMI= gopkg.in/AlecAivazis/survey.v1 v1.8.5/go.mod h1:iBNOmqKz/NUbZx3bA+4hAGLRC7fSK7tgtVDT4tB22XA= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=