Skip to content

Commit a5ca5f8

Browse files
committed
limit tls cipher selection
Signed-off-by: Tuomas Katila <[email protected]>
1 parent 8387a11 commit a5ca5f8

File tree

4 files changed

+27
-4
lines changed

4 files changed

+27
-4
lines changed

cmd/fpga_admissionwebhook/main.go

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,15 @@ func main() {
5555
ctrl.SetLogger(textlogger.NewLogger(tlConf))
5656

5757
tlsCfgFunc := func(cfg *tls.Config) {
58-
cfg.MinVersion = tls.VersionTLS13
58+
// fix TLS version to 1.2 as 1.3 doesn't allow cipher selection
59+
cfg.MinVersion = tls.VersionTLS12
60+
cfg.MaxVersion = tls.VersionTLS12
61+
cfg.CipherSuites = []uint16{
62+
tls.TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,
63+
tls.TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,
64+
tls.TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,
65+
tls.TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,
66+
}
5967
}
6068

6169
webhookOptions := webhook.Options{

cmd/operator/main.go

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,14 @@ func main() {
135135
}
136136

137137
tlsCfgFunc := func(cfg *tls.Config) {
138-
cfg.MinVersion = tls.VersionTLS13
138+
cfg.MinVersion = tls.VersionTLS12
139+
cfg.MaxVersion = tls.VersionTLS12
140+
cfg.CipherSuites = []uint16{
141+
tls.TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,
142+
tls.TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,
143+
tls.TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,
144+
tls.TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,
145+
}
139146
}
140147

141148
webhookOptions := webhook.Options{

cmd/sgx_admissionwebhook/main.go

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,15 @@ func main() {
3737
ctrl.SetLogger(textlogger.NewLogger(tlConf))
3838

3939
tlsCfgFunc := func(cfg *tls.Config) {
40-
cfg.MinVersion = tls.VersionTLS13
40+
// fix TLS version to 1.2 as 1.3 doesn't allow cipher selection
41+
cfg.MinVersion = tls.VersionTLS12
42+
cfg.MaxVersion = tls.VersionTLS12
43+
cfg.CipherSuites = []uint16{
44+
tls.TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,
45+
tls.TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,
46+
tls.TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,
47+
tls.TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,
48+
}
4149
}
4250

4351
webhookOptions := webhook.Options{

deployments/operator/default/manager_auth_proxy_patch.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ spec:
1515
- "--secure-listen-address=0.0.0.0:8443"
1616
- "--upstream=http://127.0.0.1:8080/"
1717
- "--logtostderr=true"
18-
- "--tls-cipher-suites=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305"
18+
- "--tls-cipher-suites=TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305"
1919
- "--v=10"
2020
ports:
2121
- containerPort: 8443

0 commit comments

Comments
 (0)