laminelam commented on code in PR #857: URL: https://github.com/apache/solr/pull/857#discussion_r939580999
########## solr/solrj/src/java/org/apache/solr/common/cloud/SolrZkClient.java: ########## @@ -256,18 +261,44 @@ protected ZkACLProvider createZkACLProvider() { if (!StringUtils.isEmpty(zkACLProviderClassName)) { try { log.info("Using ZkACLProvider: {}", zkACLProviderClassName); - return (ZkACLProvider) Class.forName(zkACLProviderClassName).getConstructor().newInstance(); + ZkACLProvider zkACLProvider = + (ZkACLProvider) Class.forName(zkACLProviderClassName).getConstructor().newInstance(); + zkACLProvider.setZkCredentialsInjector(zkCredentialsInjector); + return zkACLProvider; } catch (Throwable t) { // just ignore - go default log.warn( "VM param zkACLProvider does not point to a class implementing ZkACLProvider and with a non-arg constructor", t); } } - log.debug("Using default ZkACLProvider"); + log.warn( + "Using default ZkACLProvider. DefaultZkACLProvider is not secure, it creates 'OPEN_ACL_UNSAFE' ACLs to Zookeeper nodes"); return new DefaultZkACLProvider(); } + public static final String ZK_CREDENTIALS_INJECTOR_CLASS_NAME_VM_PARAM_NAME = + "zkCredentialsInjector"; + + protected ZkCredentialsInjector createZkCredentialsInjector() { + String zkCredentialsInjectorClassName = + System.getProperty(ZK_CREDENTIALS_INJECTOR_CLASS_NAME_VM_PARAM_NAME); + if (!StringUtils.isEmpty(zkCredentialsInjectorClassName)) { + try { + log.info("Using ZkCredentialsInjector: {}", zkCredentialsInjectorClassName); + return (ZkCredentialsInjector) + Class.forName(zkCredentialsInjectorClassName).getConstructor().newInstance(); + } catch (Throwable t) { Review Comment: Done (including the 2 other usages). -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org --------------------------------------------------------------------- To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org For additional commands, e-mail: issues-h...@solr.apache.org