Skip to content
This repository has been archived by the owner on Oct 23, 2024. It is now read-only.

[INFINITY-3520] Make Kafka ciphers configurable and have a secure default. #2483

Merged
merged 5 commits into from
Apr 18, 2018
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Plumb cipher configuration through.
  • Loading branch information
mpereira committed Apr 17, 2018
commit 0a9f13983fea04096cfd9b0e2c48690e6df46838
4 changes: 4 additions & 0 deletions frameworks/kafka/src/main/dist/server.properties.mustache
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,10 @@ ssl.truststore.password=notsecure

ssl.enabled.protocols=TLSv1.2

{{#SECURITY_TRANSPORT_ENCRYPTION_CIPHERS}}
ssl.cipher.suites={{SECURITY_TRANSPORT_ENCRYPTION_CIPHERS}}
{{/SECURITY_TRANSPORT_ENCRYPTION_CIPHERS}}

# If Kerberos is NOT enabled, then SSL authentication can be turned on.
{{^SECURITY_KERBEROS_ENABLED}}
{{#SECURITY_SSL_AUTHENTICATION_ENABLED}}
Expand Down
5 changes: 5 additions & 0 deletions frameworks/kafka/universe/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,11 @@
"description": "Allow plaintext alongside encrypted traffic",
"type": "boolean",
"default": false
},
"ciphers": {
"description": "Comma-separated list of cipher suites. Note that Kafka requires cipher suite names to be prefixed with \"TLS_\".",
"type": "string",
"default": "TLS_AES128-GCM-SHA256,TLS_AES128-SHA256,TLS_AES256-GCM-SHA384,TLS_AES256-SHA256,TLS_DHE-RSA-AES128-GCM-SHA256,TLS_DHE-RSA-AES128-SHA256,TLS_DHE-RSA-AES256-GCM-SHA384,TLS_DHE-RSA-AES256-SHA256,TLS_ECDHE-RSA-AES128-GCM-SHA256,TLS_ECDHE-RSA-AES128-SHA256,TLS_ECDHE-RSA-AES256-GCM-SHA384,TLS_ECDHE-RSA-AES256-SHA384"
}
}
},
Expand Down
4 changes: 4 additions & 0 deletions frameworks/kafka/universe/marathon.json.mustache
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,10 @@
"TASKCFG_ALL_SECURITY_TRANSPORT_ENCRYPTION_ALLOW_PLAINTEXT": "{{service.security.transport_encryption.allow_plaintext}}",
{{/service.security.transport_encryption.allow_plaintext}}

{{#service.security.transport_encryption.ciphers}}
"TASKCFG_ALL_SECURITY_TRANSPORT_ENCRYPTION_CIPHERS": "{{service.security.transport_encryption.ciphers}}",
{{/service.security.transport_encryption.ciphers}}

{{#service.security.ssl_authentication.enabled}}
"TASKCFG_ALL_SECURITY_SSL_AUTHENTICATION_ENABLED": "{{service.security.ssl_authentication.enabled}}",
{{/service.security.ssl_authentication.enabled}}
Expand Down