You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by yo...@apache.org on 2016/11/17 21:39:49 UTC
[5/5] lucene-solr:branch_6x: SOLR-9324 Fix
TestSolrCloudWithSecureImpersonation#testForwarding
SOLR-9324 Fix TestSolrCloudWithSecureImpersonation#testForwarding
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/f084e658
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/f084e658
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/f084e658
Branch: refs/heads/branch_6x
Commit: f084e658b77e1ec98021146318cc37772b73de51
Parents: 6428772
Author: Hrishikesh Gadre <hg...@cloudera.com>
Authored: Tue Nov 15 16:32:21 2016 -0800
Committer: yonik <yo...@apache.org>
Committed: Thu Nov 17 15:05:47 2016 -0500
----------------------------------------------------------------------
.../cloud/TestSolrCloudWithSecureImpersonation.java | 2 +-
.../security/HttpParamDelegationTokenPlugin.java | 15 +++++++++++----
2 files changed, 12 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/f084e658/solr/core/src/test/org/apache/solr/cloud/TestSolrCloudWithSecureImpersonation.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/TestSolrCloudWithSecureImpersonation.java b/solr/core/src/test/org/apache/solr/cloud/TestSolrCloudWithSecureImpersonation.java
index ef41e4d..8d7a1a6 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestSolrCloudWithSecureImpersonation.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestSolrCloudWithSecureImpersonation.java
@@ -343,7 +343,7 @@ public class TestSolrCloudWithSecureImpersonation extends SolrTestCaseJ4 {
@Test
public void testForwarding() throws Exception {
String collectionName = "forwardingCollection";
- File configDir = getFile("solr").toPath().resolve("collection1/conf").toFile();
+ File configDir = TEST_PATH().resolve("collection1/conf").toFile();
miniCluster.uploadConfigDir(configDir, "conf1");
create1ShardCollection(collectionName, "conf1", miniCluster);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/f084e658/solr/core/src/test/org/apache/solr/security/HttpParamDelegationTokenPlugin.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/security/HttpParamDelegationTokenPlugin.java b/solr/core/src/test/org/apache/solr/security/HttpParamDelegationTokenPlugin.java
index 7a4f69f..42d99a2 100644
--- a/solr/core/src/test/org/apache/solr/security/HttpParamDelegationTokenPlugin.java
+++ b/solr/core/src/test/org/apache/solr/security/HttpParamDelegationTokenPlugin.java
@@ -49,8 +49,9 @@ import org.apache.http.HttpRequestInterceptor;
import org.apache.http.NameValuePair;
import org.apache.http.client.utils.URLEncodedUtils;
import org.apache.http.protocol.HttpContext;
+import org.apache.solr.client.solrj.impl.HttpClientConfigurer;
import org.apache.solr.client.solrj.impl.HttpClientUtil;
-import org.apache.solr.client.solrj.impl.SolrHttpClientBuilder;
+import org.apache.solr.client.solrj.impl.Krb5HttpClientConfigurer;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.util.ExecutorUtil;
import org.apache.solr.core.CoreContainer;
@@ -97,6 +98,13 @@ public class HttpParamDelegationTokenPlugin extends KerberosPlugin {
}
};
+ private final HttpClientConfigurer configurer = new Krb5HttpClientConfigurer() {
+ public void configure(org.apache.http.impl.client.DefaultHttpClient httpClient, org.apache.solr.common.params.SolrParams config) {
+ super.configure(httpClient, config);
+ httpClient.addRequestInterceptor(interceptor);
+ };
+ };
+
public HttpParamDelegationTokenPlugin(CoreContainer coreContainer) {
super(coreContainer);
}
@@ -140,9 +148,8 @@ public class HttpParamDelegationTokenPlugin extends KerberosPlugin {
}
@Override
- public SolrHttpClientBuilder getHttpClientBuilder(SolrHttpClientBuilder builder) {
- HttpClientUtil.addRequestInterceptor(interceptor);
- return super.getHttpClientBuilder(builder);
+ public HttpClientConfigurer getClientConfigurer() {
+ return configurer;
}
@Override