HoustonPutman commented on code in PR #857:
URL: https://github.com/apache/solr/pull/857#discussion_r891373297
##########
solr/solrj/src/java/org/apache/solr/common/cloud/SolrZkClient.java:
##########
@@ -236,8 +240,11 @@ protected ZkCredentialsProvider
createZkCredentialsToAddAutomatically() {
if (!StringUtils.isEmpty(zkCredentialsProviderClassName)) {
try {
log.info("Using ZkCredentialsProvider: {}",
zkCredentialsProviderClassName);
- return (ZkCredentialsProvider)
-
Class.forName(zkCredentialsProviderClassName).getConstructor().newInstance();
+ ZkCredentialsProvider zkCredentialsProvider =
+ (ZkCredentialsProvider)
+
Class.forName(zkCredentialsProviderClassName).getConstructor().newInstance();
Review Comment:
Fair enough, we can do that separately.
##########
solr/core/src/java/org/apache/solr/core/SolrXmlConfig.java:
##########
@@ -529,6 +529,9 @@ private static CloudConfig fillSolrCloudSection(
case "zkCredentialsProvider":
builder.setZkCredentialsProviderClass(value);
break;
+ case "zkCredentialsInjector":
Review Comment:
Ok as long as it gets added before merging.
##########
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:
Ahh ok, might be worth switching over in case `generateDigest()` is
ultimately the same. But it can be done separately
##########
solr/solrj/src/java/org/apache/solr/common/cloud/acl/package-info.java:
##########
@@ -0,0 +1,19 @@
+/*
+ * 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.
+ */
+
+/** Classes for managing ACLs to Zookeeper */
+package org.apache.solr.common.cloud.acl;
Review Comment:
I like creds better, because ACLs are a form of credentials, and so are the
ZK Auth stuff.
Let's do it all in one package for now and move to a separate package when
we break back-compat
--
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
