ATLAS-5362: fix Solr Kerberos client + SSL cipher list parsing for AMRA - #1
Closed
saksenasonali wants to merge 3 commits into
Closed
Conversation
Two fixes found while deploying the AMRA (ATLAS-5362) WAR on a Kerberos+TLS CDP cluster running on JDK 17: 1. Solr6Index did not configure SolrJ for Kerberos, so index bootstrap (e.g. vertex_index) failed with HTTP 401 from a Kerberized Solr. Register Krb5HttpClientBuilder at class load (before any SolrClient is built) when a JAAS login config is present, so SolrJ performs SPNego negotiation using the 'Client' JAAS entry. 2. SecureEmbeddedServer read atlas.ssl.enabled.algorithms via Configuration.getList(), which only splits on ','. Existing CDP/CDH configs are ':'-delimited, so the entire joined string was treated as a single (invalid) cipher name and the TLS listener started with zero usable ciphers (handshake failed / SSL_ERROR_ZERO_RETURN). Split each entry on both ':' and ',' so both delimiters are honored. Co-authored-by: Cursor <cursoragent@cursor.com>
jackhalfalltrades
force-pushed
the
ATLAS-5362
branch
from
August 17, 2026 18:29
877182f to
9ff5c76
Compare
This file contains hidden or 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
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.
Two fixes found while deploying the AMRA (ATLAS-5362) WAR on a Kerberos+TLS CDP cluster running on JDK 17:
Solr6Index did not configure SolrJ for Kerberos, so index bootstrap (e.g. vertex_index) failed with HTTP 401 from a Kerberized Solr. Register Krb5HttpClientBuilder at class load (before any SolrClient is built) when a JAAS login config is present, so SolrJ performs SPNego negotiation using the 'Client' JAAS entry.
SecureEmbeddedServer read atlas.ssl.enabled.algorithms via Configuration.getList(), which only splits on ','. Existing CDP/CDH configs are ':'-delimited, so the entire joined string was treated as a single (invalid) cipher name and the TLS listener started with zero usable ciphers (handshake failed / SSL_ERROR_ZERO_RETURN). Split each entry on both ':' and ',' so both delimiters are honored.
What changes were proposed in this pull request?
Two targeted fixes on top of the AMRA (ATLAS-5362) branch, discovered while deploying the AMRA WAR to a Kerberos + auto-TLS CDP cluster on JDK 17. Both are backward-compatible and only change behavior on Kerberized / TLS-enabled clusters.
1.
graphdb/janus/.../solr/Solr6Index.java— register SolrJ Kerberos client (+1 import, +14 lines)import org.apache.solr.client.solrj.impl.Krb5HttpClientBuilder;java.security.auth.login.configis set (i.e. Kerberos is in effect), callsHttpClientUtil.setHttpClientBuilder(new Krb5HttpClientBuilder().getBuilder())before anySolrClientis constructed.ClientJAAS entry, so the JanusGraph index bootstrap (e.g.vertex_index) no longer fails with HTTP 401 against a Kerberized Solr. The JAAS app name remains configurable via-Dsolr.kerberos.jaas.appname(defaultClient).2.
server-common/.../service/SecureEmbeddedServer.java— tolerate ':'-delimited cipher lists (+24 / -1 lines)config.getList(ATLAS_SSL_ENABLED_ALGORITHMS)from commons-configuration only splits on ','. Legacy CDP/CDH deployments supplyatlas.ssl.enabled.algorithmsas a ':'-delimited string, so the whole joined value was treated as one bogus cipher name → the TLS listener started with zero usable ciphers and every HTTPS handshake failed.:and,(split("[,:]")), trimmed, and empty tokens are dropped, before callingsetIncludeCipherSuites(...). Comma-only lists continue to work unchanged.No new config keys, no API changes; both changes are no-ops on non-Kerberos / comma-delimited-cipher clusters.
How was this patch tested?
Manual, end-to-end on a real cluster (
quasar-towojm, CDP 7.3.2, Kerberos + auto-TLS, Atlas on JDK 17):9548b54) with these two fixes applied and deployed it to a 2-node Atlas topology (dual-ACTIVE:METADATA_SERVER+NOTIFICATION_PROCESSOR).vertex_indexand the other Solr collections bootstrap cleanly and both Atlas nodes reachStatus: ACTIVE.SSL_ERROR_ZERO_RETURN, zero enabled ciphers). After the change,curl -k https://<host>:31443/api/atlas/admin/statusand/admin/versionreturn200withStatus: ACTIVEand the correct buildRevision.