-
Notifications
You must be signed in to change notification settings - Fork 2.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add support for ciphersuites in tls config (#3564)
* Add support for ciphersuites in tls config Signed-off-by: Ashmita <ashmita.bohara@logz.io> * Feedbacks Signed-off-by: Ashmita152 <ashmita.bohara@logz.io> * Feedbacks Signed-off-by: Ashmita152 <ashmita.bohara@logz.io> * Feedbacks Signed-off-by: Ashmita152 <ashmita.bohara@logz.io>
- Loading branch information
1 parent
c156ebd
commit df44af3
Showing
6 changed files
with
139 additions
and
1 deletion.
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,42 @@ | ||
// Copyright (c) 2022 The Jaeger 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 tlscfg | ||
|
||
import ( | ||
"crypto/tls" | ||
"fmt" | ||
) | ||
|
||
func allCiphers() map[string]uint16 { | ||
acceptedCiphers := make(map[string]uint16) | ||
for _, suite := range tls.CipherSuites() { | ||
acceptedCiphers[suite.Name] = suite.ID | ||
} | ||
return acceptedCiphers | ||
} | ||
|
||
// CipherSuiteNamesToIDs returns a list of cipher suite IDs from the cipher suite names passed. | ||
func CipherSuiteNamesToIDs(cipherNames []string) ([]uint16, error) { | ||
var ciphersIDs []uint16 | ||
possibleCiphers := allCiphers() | ||
for _, cipher := range cipherNames { | ||
intValue, ok := possibleCiphers[cipher] | ||
if !ok { | ||
return nil, fmt.Errorf("cipher suite %s not supported or doesn't exist", cipher) | ||
} | ||
ciphersIDs = append(ciphersIDs, intValue) | ||
} | ||
return ciphersIDs, nil | ||
} |
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,70 @@ | ||
// Copyright (c) 2022 The Jaeger 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 tlscfg | ||
|
||
import ( | ||
"crypto/tls" | ||
"reflect" | ||
"testing" | ||
) | ||
|
||
func TestTLSCipherSuites(t *testing.T) { | ||
tests := []struct { | ||
flag []string | ||
expected []uint16 | ||
expectedError bool | ||
}{ | ||
{ | ||
// Happy case | ||
flag: []string{"TLS_AES_128_GCM_SHA256", "TLS_AES_256_GCM_SHA384", "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA", "TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384"}, | ||
expected: []uint16{tls.TLS_AES_128_GCM_SHA256, tls.TLS_AES_256_GCM_SHA384, tls.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA, tls.TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384}, | ||
expectedError: false, | ||
}, | ||
{ | ||
// One flag only | ||
flag: []string{"TLS_AES_128_GCM_SHA256"}, | ||
expected: []uint16{tls.TLS_AES_128_GCM_SHA256}, | ||
expectedError: false, | ||
}, | ||
{ | ||
// Empty flag | ||
flag: []string{}, | ||
expected: nil, | ||
expectedError: false, | ||
}, | ||
{ | ||
// Duplicated flag | ||
flag: []string{"TLS_AES_128_GCM_SHA256", "TLS_AES_256_GCM_SHA384", "TLS_AES_128_GCM_SHA256"}, | ||
expected: []uint16{tls.TLS_AES_128_GCM_SHA256, tls.TLS_AES_256_GCM_SHA384, tls.TLS_AES_128_GCM_SHA256}, | ||
expectedError: false, | ||
}, | ||
{ | ||
// Invalid flag | ||
flag: []string{"TLS_INVALID_CIPHER_SUITE"}, | ||
expected: nil, | ||
expectedError: true, | ||
}, | ||
} | ||
|
||
for i, test := range tests { | ||
uIntFlags, err := CipherSuiteNamesToIDs(test.flag) | ||
if !reflect.DeepEqual(uIntFlags, test.expected) { | ||
t.Errorf("%d: expected %+v, got %+v", i, test.expected, uIntFlags) | ||
} | ||
if test.expectedError && err == nil { | ||
t.Errorf("%d: expecting error, got %+v", i, err) | ||
} | ||
} | ||
} |
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