-
Notifications
You must be signed in to change notification settings - Fork 9.7k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
etcdctl: set TLS servername on discovery #6084
Merged
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
cd781bf
transport: add ServerName to TLSConfig and add ValidateSecureEndpoints
e218834
etcdctl: set ServerName for TLS when using --discovery-srv
ab4ac82
etcdmain: check TLS on gateway SRV records
d180983
embed: use ServerName on TLS DNS discovery without CA file
a752338
Documentation: update clustering guide about PKI SRV record forging
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -21,15 +21,18 @@ import ( | |
"time" | ||
|
||
"github.com/coreos/etcd/client" | ||
"github.com/coreos/etcd/pkg/transport" | ||
"github.com/coreos/etcd/proxy/tcpproxy" | ||
"github.com/spf13/cobra" | ||
) | ||
|
||
var ( | ||
gatewayListenAddr string | ||
gatewayEndpoints []string | ||
gatewayDNSCluster string | ||
getewayRetryDelay time.Duration | ||
gatewayListenAddr string | ||
gatewayEndpoints []string | ||
gatewayDNSCluster string | ||
gatewayInsecureDiscovery bool | ||
getewayRetryDelay time.Duration | ||
gatewayCA string | ||
) | ||
|
||
var ( | ||
|
@@ -64,6 +67,8 @@ func newGatewayStartCommand() *cobra.Command { | |
|
||
cmd.Flags().StringVar(&gatewayListenAddr, "listen-addr", "127.0.0.1:23790", "listen address") | ||
cmd.Flags().StringVar(&gatewayDNSCluster, "discovery-srv", "", "DNS domain used to bootstrap initial cluster") | ||
cmd.Flags().BoolVar(&gatewayInsecureDiscovery, "insecure-discovery", false, "accept insecure SRV records") | ||
cmd.Flags().StringVar(&gatewayCA, "trusted-ca-file", "", "path to the client server TLS CA file.") | ||
|
||
cmd.Flags().StringSliceVar(&gatewayEndpoints, "endpoints", []string{"127.0.0.1:2379"}, "comma separated etcd cluster endpoints") | ||
|
||
|
@@ -81,6 +86,23 @@ func startGateway(cmd *cobra.Command, args []string) { | |
os.Exit(1) | ||
} | ||
plog.Infof("discovered the cluster %s from %s", eps, gatewayDNSCluster) | ||
// confirm TLS connections are good | ||
if !gatewayInsecureDiscovery { | ||
tlsInfo := transport.TLSInfo{ | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. probably log that we are verifying discovered endpoints a,b,c here |
||
TrustedCAFile: gatewayCA, | ||
ServerName: gatewayDNSCluster, | ||
} | ||
plog.Infof("validating discovered endpoints %v", eps) | ||
endpoints, err = transport.ValidateSecureEndpoints(tlsInfo, eps) | ||
if err != nil { | ||
plog.Warningf("%v", err) | ||
} | ||
plog.Infof("using discovered endpoints %v", endpoints) | ||
} | ||
} | ||
|
||
if len(endpoints) == 0 { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. log the valid endpoints we found? |
||
plog.Fatalf("no endpoints found") | ||
} | ||
|
||
l, err := net.Listen("tcp", gatewayListenAddr) | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,49 @@ | ||
// Copyright 2016 The etcd 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 transport | ||
|
||
import ( | ||
"fmt" | ||
"strings" | ||
"time" | ||
) | ||
|
||
// ValidateSecureEndpoints scans the given endpoints against tls info, returning only those | ||
// endpoints that could be validated as secure. | ||
func ValidateSecureEndpoints(tlsInfo TLSInfo, eps []string) ([]string, error) { | ||
t, err := NewTransport(tlsInfo, 5*time.Second) | ||
if err != nil { | ||
return nil, err | ||
} | ||
var errs []string | ||
var endpoints []string | ||
for _, ep := range eps { | ||
if !strings.HasPrefix(ep, "https://") { | ||
errs = append(errs, fmt.Sprintf("%q is insecure", ep)) | ||
continue | ||
} | ||
conn, cerr := t.Dial("tcp", ep[len("https://"):]) | ||
if cerr != nil { | ||
errs = append(errs, fmt.Sprintf("%q failed to dial (%v)", ep, cerr)) | ||
continue | ||
} | ||
conn.Close() | ||
endpoints = append(endpoints, ep) | ||
} | ||
if len(errs) != 0 { | ||
err = fmt.Errorf("%s", strings.Join(errs, ",")) | ||
} | ||
return endpoints, err | ||
} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
log the endpoints that we skipped?