Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4410 from mitake/security-options

Browse Source 
etcdctlv3: handle empty options related to security
This commit is contained in:
Xiang Li 2016-02-05 20:56:27 -08:00
commit e7a5899582
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
etcdctlv3/command/global.go
View File

@ -15,6 +15,7 @@
package command package command
import ( import (
"errors"
"time" "time"
"github.com/coreos/etcd/Godeps/_workspace/src/github.com/spf13/cobra" "github.com/coreos/etcd/Godeps/_workspace/src/github.com/spf13/cobra"
@ -38,15 +39,28 @@ func mustClient(cmd *cobra.Command) *clientv3.Client {
// set tls if any one tls option set // set tls if any one tls option set
var cfgtls *transport.TLSInfo var cfgtls *transport.TLSInfo
tls := transport.TLSInfo{} tls := transport.TLSInfo{}
if tls.CertFile, err = cmd.Flags().GetString("cert"); err == nil { var file string
if file, err = cmd.Flags().GetString("cert"); err == nil && file != "" {
tls.CertFile = file
cfgtls = &tls cfgtls = &tls
} else if cmd.Flags().Changed("cert") {
ExitWithError(ExitBadArgs, errors.New("empty string is passed to --cert option"))
} }
if tls.KeyFile, err = cmd.Flags().GetString("key"); err == nil {
if file, err = cmd.Flags().GetString("key"); err == nil && file != "" {
tls.KeyFile = file
cfgtls = &tls cfgtls = &tls
} else if cmd.Flags().Changed("key") {
ExitWithError(ExitBadArgs, errors.New("empty string is passed to --key option"))
} }
if tls.CAFile, err = cmd.Flags().GetString("cacert"); err == nil {
if file, err = cmd.Flags().GetString("cacert"); err == nil && file != "" {
tls.CAFile = file
cfgtls = &tls cfgtls = &tls
} else if cmd.Flags().Changed("cacert") {
ExitWithError(ExitBadArgs, errors.New("empty string is passed to --cacert option"))
} }
cfg := clientv3.Config{ cfg := clientv3.Config{
Endpoints: []string{endpoint}, Endpoints: []string{endpoint},
TLS: cfgtls, TLS: cfgtls,