mirror of
https://github.com/etcd-io/etcd.git
synced 2024-09-27 06:25:44 +00:00
7abd21ee44
Current etcdctlv3 doesn't handle options related to security when they are not passed. Connections cannot be established and etcd produces logs like this: ``` 14:09:07 etcd1 | 2016/02/04 14:09:07 transport: http2Server.HandleStreams received bogus greeting from client: "\x16\x03\x01\x00\x9a\x01\x00\x00\x96\x03\x03\xf6\t\xda\x06QV\xb4\xdd\xc1gF\x1cC" ``` This commit fixes the problem. In addition, a case that empty strings are passed to the options (e.g. --key="") are treated as error.
76 lines
2.1 KiB
Go
76 lines
2.1 KiB
Go
// Copyright 2015 CoreOS, Inc.
|
|
//
|
|
// 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 command
|
|
|
|
import (
|
|
"errors"
|
|
"time"
|
|
|
|
"github.com/coreos/etcd/Godeps/_workspace/src/github.com/spf13/cobra"
|
|
"github.com/coreos/etcd/clientv3"
|
|
"github.com/coreos/etcd/pkg/transport"
|
|
)
|
|
|
|
// GlobalFlags are flags that defined globally
|
|
// and are inherited to all sub-commands.
|
|
type GlobalFlags struct {
|
|
Endpoints string
|
|
TLS transport.TLSInfo
|
|
}
|
|
|
|
func mustClient(cmd *cobra.Command) *clientv3.Client {
|
|
endpoint, err := cmd.Flags().GetString("endpoint")
|
|
if err != nil {
|
|
ExitWithError(ExitError, err)
|
|
}
|
|
|
|
// set tls if any one tls option set
|
|
var cfgtls *transport.TLSInfo
|
|
tls := transport.TLSInfo{}
|
|
var file string
|
|
if file, err = cmd.Flags().GetString("cert"); err == nil && file != "" {
|
|
tls.CertFile = file
|
|
cfgtls = &tls
|
|
} else if cmd.Flags().Changed("cert") {
|
|
ExitWithError(ExitBadArgs, errors.New("empty string is passed to --cert option"))
|
|
}
|
|
|
|
if file, err = cmd.Flags().GetString("key"); err == nil && file != "" {
|
|
tls.KeyFile = file
|
|
cfgtls = &tls
|
|
} else if cmd.Flags().Changed("key") {
|
|
ExitWithError(ExitBadArgs, errors.New("empty string is passed to --key option"))
|
|
}
|
|
|
|
if file, err = cmd.Flags().GetString("cacert"); err == nil && file != "" {
|
|
tls.CAFile = file
|
|
cfgtls = &tls
|
|
} else if cmd.Flags().Changed("cacert") {
|
|
ExitWithError(ExitBadArgs, errors.New("empty string is passed to --cacert option"))
|
|
}
|
|
|
|
cfg := clientv3.Config{
|
|
Endpoints: []string{endpoint},
|
|
TLS: cfgtls,
|
|
DialTimeout: 20 * time.Second,
|
|
}
|
|
|
|
client, err := clientv3.New(cfg)
|
|
if err != nil {
|
|
ExitWithError(ExitBadConnection, err)
|
|
}
|
|
return client
|
|
}
|