Add TLS cipher suite options and CA path support #2963
Merged
Conversation
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
kyhavlov
force-pushed
the
tls-improvements
branch
from
2c3a023
to
f0578fe
Compare
magiconair
suggested changes
Apr 26, 2017
command/agent/config.go
Outdated
| @@ -17,6 +17,7 @@ import ( | |||
| "github.com/hashicorp/consul/types" | |||
| "github.com/hashicorp/consul/watch" | |||
| "github.com/mitchellh/mapstructure" | |||
| "github.com/hashicorp/consul/tlsutil" | |||
There was a problem hiding this comment.
Use goimports for sorting imports correctly
command/agent/config_test.go
Outdated
| @@ -13,6 +13,7 @@ import ( | |||
| "time" | |||
|
|
|||
| "github.com/hashicorp/consul/lib" | |||
| "crypto/tls" | |||
| } | ||
|
|
||
| return suites, nil | ||
| } |
tlsutil/config_test.go
Outdated
| @@ -9,6 +9,7 @@ import ( | |||
| "testing" | |||
|
|
|||
| "github.com/hashicorp/yamux" | |||
| "reflect" | |||
tlsutil/config_test.go
Outdated
| @@ -494,3 +509,26 @@ func TestConfig_IncomingTLS_TLSMinVersion(t *testing.T) { | |||
| } | |||
| } | |||
| } | |||
|
|
|||
| func TestConfig_ParseCiphers(t *testing.T) { | |||
| testOk := "TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA,TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_RSA_WITH_AES_128_CBC_SHA,TLS_RSA_WITH_AES_128_GCM_SHA256,TLS_RSA_WITH_AES_256_CBC_SHA,TLS_RSA_WITH_AES_256_GCM_SHA384" | |||
There was a problem hiding this comment.
I suggest to join a []string{...} to keep it readable
tlsutil/config_test.go
Outdated
| if err != nil { | ||
| t.Fatal(err) | ||
| } | ||
| if len(v) != 12 { |
There was a problem hiding this comment.
If you compare the values instead of the lengths you get a more robust test.
ciphers := []uint16{...}
if got, want := v, ciphers; !reflect.DeepEqual(got, want) {
t.Fatalf("got ciphers %#v want %#v", got, want)
}
tlsutil/config_test.go
Outdated
| t.Fatal("should fail on unsupported cipherX") | ||
| } | ||
|
|
||
| testOrder := "TLS_RSA_WITH_AES_256_GCM_SHA384,TLS_RSA_WITH_AES_128_GCM_SHA256" |
There was a problem hiding this comment.
This test becomes redundant if you do the other test.
magiconair
reviewed
Apr 26, 2017
command/agent/config_test.go
Outdated
| @@ -12,8 +12,8 @@ import ( | |||
| "testing" | |||
| "time" | |||
|
|
|||
There was a problem hiding this comment.
remove blank line and goimports
|
LGTM. Please squash and merge :) |
magiconair
approved these changes
Apr 27, 2017
|
Just realized that I could also do this myself. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Resolves #2959