You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by da...@apache.org on 2019/06/04 18:59:36 UTC
[lucene-solr] branch branch_8_1 updated: SOLR-13510: Intermittent
401's for internode requests with basicauth enabled
This is an automated email from the ASF dual-hosted git repository.
datcm pushed a commit to branch branch_8_1
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
The following commit(s) were added to refs/heads/branch_8_1 by this push:
new 7cc04f5 SOLR-13510: Intermittent 401's for internode requests with basicauth enabled
7cc04f5 is described below
commit 7cc04f5adcbf49786c10c80d885138d53f5e1321
Author: Cao Manh Dat <da...@apache.org>
AuthorDate: Tue Jun 4 16:12:49 2019 +0100
SOLR-13510: Intermittent 401's for internode requests with basicauth enabled
---
solr/CHANGES.txt | 16 ++++
.../solr/security/BasicAuthOnSingleNodeTest.java | 97 ++++++++++++++++++++++
.../solr/client/solrj/impl/Http2SolrClient.java | 2 +-
.../client/solrj/impl/HttpListenerFactory.java | 14 ++++
4 files changed, 128 insertions(+), 1 deletion(-)
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 15959bb..241eabf 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -16,6 +16,22 @@ In this release, there is an example Solr server including a bundled
servlet container in the directory named "example".
See the Solr tutorial at https://lucene.apache.org/solr/guide/solr-tutorial.html
+================== 8.1.2 ==================
+
+Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release.
+
+Versions of Major Components
+---------------------
+Apache Tika 1.19.1
+Carrot2 3.16.0
+Velocity 2.0 and Velocity Tools 3.0
+Apache ZooKeeper 3.4.14
+Jetty 9.4.14.v20181114
+
+Bug Fixes
+----------------------
+* SOLR-13510: Intermittent 401's for internode requests with basicauth enabled (Cao Manh Dat, Colvin Cowie)
+
================== 8.1.1 ==================
Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release.
diff --git a/solr/core/src/test/org/apache/solr/security/BasicAuthOnSingleNodeTest.java b/solr/core/src/test/org/apache/solr/security/BasicAuthOnSingleNodeTest.java
new file mode 100644
index 0000000..e6460f9
--- /dev/null
+++ b/solr/core/src/test/org/apache/solr/security/BasicAuthOnSingleNodeTest.java
@@ -0,0 +1,97 @@
+/*
+ * 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.security;
+
+import java.lang.invoke.MethodHandles;
+
+import org.apache.solr.client.solrj.SolrQuery;
+import org.apache.solr.client.solrj.embedded.JettySolrRunner;
+import org.apache.solr.client.solrj.impl.Http2SolrClient;
+import org.apache.solr.client.solrj.impl.PreemptiveBasicAuthClientBuilderFactory;
+import org.apache.solr.client.solrj.request.CollectionAdminRequest;
+import org.apache.solr.cloud.SolrCloudAuthTestCase;
+import org.junit.Before;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import static java.nio.charset.StandardCharsets.UTF_8;
+
+public class BasicAuthOnSingleNodeTest extends SolrCloudAuthTestCase {
+
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+ private static final String COLLECTION = "authCollection";
+
+ static {
+ System.setProperty("basicauth", "solr:solr");
+ }
+
+ @Before
+ public void setupCluster() throws Exception {
+ configureCluster(1)
+ .addConfig("conf", configset("cloud-minimal"))
+ .configure();
+ CollectionAdminRequest.createCollection(COLLECTION, "conf", 4, 1)
+ .setMaxShardsPerNode(100)
+ .process(cluster.getSolrClient());
+ cluster.waitForActiveCollection(COLLECTION, 4, 4);
+
+ zkClient().setData("/security.json", STD_CONF.getBytes(UTF_8), true);
+
+ JettySolrRunner jetty = cluster.getJettySolrRunner(0);
+ jetty.stop();
+ cluster.waitForJettyToStop(jetty);
+ jetty.start();
+ cluster.waitForAllNodes(30);
+ cluster.waitForActiveCollection(COLLECTION, 4, 4);
+ }
+
+ @Test
+ public void basicTest() throws Exception {
+ try (Http2SolrClient client = new Http2SolrClient.Builder(cluster.getJettySolrRunner(0).getBaseUrl().toString())
+ .build()){
+ PreemptiveBasicAuthClientBuilderFactory factory = new PreemptiveBasicAuthClientBuilderFactory();
+ factory.setup(client);
+
+ // SOLR-13510, this will be failed if the listener (handling inject credential in header) is called in another
+ // thread since SolrRequestInfo will return null in that case.
+ for (int i = 0; i < 30; i++) {
+ client.query(COLLECTION, new SolrQuery("*:*"));
+ }
+ }
+ }
+
+ protected static final String STD_CONF = "{\n" +
+ " \"authentication\":{\n" +
+ " \"blockUnknown\": true,\n" +
+ " \"class\":\"solr.BasicAuthPlugin\",\n" +
+ " \"credentials\":{\"solr\":\"EEKn7ywYk5jY8vG9TyqlG2jvYuvh1Q7kCCor6Hqm320= 6zkmjMjkMKyJX6/f0VarEWQujju5BzxZXub6WOrEKCw=\"}\n" +
+ " },\n" +
+ " \"authorization\":{\n" +
+ " \"class\":\"solr.RuleBasedAuthorizationPlugin\",\n" +
+ " \"permissions\":[\n" +
+ " {\"name\":\"security-edit\", \"role\":\"admin\"},\n" +
+ " {\"name\":\"collection-admin-edit\", \"role\":\"admin\"},\n" +
+ " {\"name\":\"core-admin-edit\", \"role\":\"admin\"}\n" +
+ " ],\n" +
+ " \"user-role\":{\"solr\":\"admin\"}\n" +
+ " }\n" +
+ "}";
+}
+
+
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/Http2SolrClient.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/Http2SolrClient.java
index 580a849..5597f04 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/Http2SolrClient.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/Http2SolrClient.java
@@ -465,7 +465,7 @@ public class Http2SolrClient extends SolrClient {
setBasicAuthHeader(solrRequest, req);
for (HttpListenerFactory factory : listenerFactory) {
HttpListenerFactory.RequestResponseListener listener = factory.get();
- req.onRequestQueued(listener);
+ listener.onQueued(req);
req.onRequestBegin(listener);
req.onComplete(listener);
}
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpListenerFactory.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpListenerFactory.java
index 41b58ae..73d512e 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpListenerFactory.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpListenerFactory.java
@@ -23,9 +23,23 @@ import org.eclipse.jetty.client.api.Result;
public interface HttpListenerFactory {
abstract class RequestResponseListener implements Request.BeginListener, Response.CompleteListener, Request.QueuedListener {
+
+ /**
+ * Callback method invoked when the request begins being processed in order to be sent.
+ * This is the last opportunity to modify the request.
+ * This method will NOT be ensured to be called on the same thread as the thread calling {@code Http2SolrClient} methods.
+ *
+ * @param request the request that begins being processed
+ */
@Override
public void onBegin(Request request){}
+ /**
+ * Callback method invoked when the request is queued, waiting to be sent.
+ * This method will be ensured to be called on the same thread as the thread calling {@code Http2SolrClient} methods.
+ *
+ * @param request the request being queued
+ */
@Override
public void onQueued(Request request) {}