ZOOKEEPER-5023: Allow to set TLS version and ciphers for AdminServer#2359
Conversation
TestingTested this locally as follows: Created keystore: Created truststore: Added these to Started ZooKeeper: ZooKeeper log: Call AdminServer: |
92a6b05 to
fe714fc
Compare
fe714fc to
af277a6
Compare
anmolnar
left a comment
There was a problem hiding this comment.
Please don't reuse existing properties for this purpose. Historically we use separate TLS settings for the different protocols is ZooKeeper, so I recommend introducing the following settings:
- admin.ssl.ciphersuites
- admin.ssl.enabledProtocols
Check the following documentation as a reference:
https://zookeeper.apache.org/doc/r3.9.5/zookeeperAdmin.html#sc_adminserver_config
Thanks!
anmolnar
left a comment
There was a problem hiding this comment.
Changed my mind. Since we're already reusing quorum SSL properties in Admin server, it's okay to keep following that road.
Patch lgtm, just a nitpick. Thanks!
zookeeper-server/src/main/java/org/apache/zookeeper/server/admin/JettyAdminServer.java
Outdated
Show resolved
Hide resolved
zookeeper-server/src/main/java/org/apache/zookeeper/server/admin/JettyAdminServer.java
Outdated
Show resolved
Hide resolved
The logging of setting the enabled protocols and ciphers in JettyAdminServer is now changed to DEBUG.
Reviewers: meszibalu, anmolnar Author: PDavid Closes apache#2359 from PDavid/ZOOKEEPER-5023-AdminServer-TLS-proto-ciphers (cherry picked from commit eab1659)
Reviewers: meszibalu, anmolnar Author: PDavid Closes apache#2359 from PDavid/ZOOKEEPER-5023-AdminServer-TLS-proto-ciphers (cherry picked from commit eab1659)
Reviewers: meszibalu, anmolnar Author: PDavid Closes apache#2359 from PDavid/ZOOKEEPER-5023-AdminServer-TLS-proto-ciphers (cherry picked from commit eab1659)
Reviewers: meszibalu, anmolnar Author: PDavid Closes #2359 from PDavid/ZOOKEEPER-5023-AdminServer-TLS-proto-ciphers (cherry picked from commit eab1659) Signed-off-by: Andor Molnar <andor@cloudera.com>
|
Merged to |
Use the already existing properties for this in AdminServer: