laminelam commented on code in PR #857: URL: https://github.com/apache/solr/pull/857#discussion_r887944716
########## solr/solrj/src/java/org/apache/solr/common/cloud/acl/DigestZkCredentialsProvider.java: ########## @@ -0,0 +1,67 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.solr.common.cloud.acl; + +import java.lang.invoke.MethodHandles; +import java.nio.charset.StandardCharsets; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import org.apache.solr.common.StringUtils; +import org.apache.solr.common.cloud.DefaultZkCredentialsProvider; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * A class that expects a {@link ZkCredentialsInjector} to create Zookeeper credentials using digest + * scheme + */ +public class DigestZkCredentialsProvider extends DefaultZkCredentialsProvider { + + private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass()); + + public DigestZkCredentialsProvider() { + this(new DefaultZkCredentialsInjector()); + } + + public DigestZkCredentialsProvider(ZkCredentialsInjector zkCredentialsInjector) { + this.zkCredentialsInjector = zkCredentialsInjector; + } + + @Override + protected Collection<ZkCredentials> createCredentials() { + List<ZkCredentials> result = new ArrayList<>(1); + List<ZkCredentialsInjector.ZkCredential> zkCredentials = + zkCredentialsInjector.getZkCredentials(); + log.debug("createCredentials using zkCredentials: {}", zkCredentials); + for (ZkCredentialsInjector.ZkCredential zkCredential : zkCredentials) { + if (zkCredential.isAll()) { + // this is the "user" with all perms that SolrZooKeeper uses to connect to zookeeper + if (!StringUtils.isEmpty(zkCredential.getUsername()) + && !StringUtils.isEmpty(zkCredential.getPassword())) { + result.add( + new ZkCredentials( + "digest", + (zkCredential.getUsername() + ":" + zkCredential.getPassword()) Review Comment: No, this is not needed. See the [existing](https://github.com/apache/solr/blob/e8437d6616d8639b4d4255c9d81c3285bb6cdaef/solr/solrj/src/java/org/apache/solr/common/cloud/VMParamsSingleSetCredentialsDigestZkCredentialsProvider.java#L75) code. -- 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
