svn commit: r1861998 - in /manifoldcf/trunk: CHANGES.txt connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchConnection.java

[kw...@apache.org]

Author: kwright
Date: Mon Jun 24 12:25:48 2019
New Revision: 1861998

URL: http://svn.apache.org/viewvc?rev=1861998&view=rev
Log:
Fix for CONNECTORS-1519.  Thanks to Glenn Laenen for the patch.

Modified:
    manifoldcf/trunk/CHANGES.txt
    manifoldcf/trunk/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchConnection.java

Modified: manifoldcf/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1861998&r1=1861997&r2=1861998&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Mon Jun 24 12:25:48 2019
@@ -3,6 +3,10 @@ $Id$
 
 ======================= 2.14-dev =====================
 
+CONNECTORS-1519: Fix ElasticSearch connector HTTP PUT operations to work in an
+authorization environment without getting errors.
+(Glenn Laenen)
+
 CONNECTORS-1612: JCIFS connector: adopt a single retry with a three-hour wait for
 unknown SMB errors.
 (Karl Wright)

Modified: manifoldcf/trunk/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchConnection.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchConnection.java?rev=1861998&r1=1861997&r2=1861998&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchConnection.java (original)
+++ manifoldcf/trunk/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchConnection.java Mon Jun 24 12:25:48 2019
@@ -32,6 +32,7 @@ import java.util.Locale;
 
 import org.apache.http.client.HttpClient;
 import org.apache.http.client.methods.HttpRequestBase;
+import org.apache.http.client.protocol.HttpClientContext;
 import org.apache.http.client.methods.HttpGet;
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.client.methods.HttpPut;
@@ -127,11 +128,23 @@ public class ElasticSearchConnection
     @Override
     public void run()
     {
+      HttpHost target = new HttpHost(method.getURI().getHost(), method.getURI().getPort(), method.getURI().getScheme());
+      // Create AuthCache instance
+      AuthCache authCache = new BasicAuthCache();
+      // Generate BASIC scheme object and add it to the local
+      // auth cache
+      BasicScheme basicAuth = new BasicScheme();
+      authCache.put(target, basicAuth);
+
+      // Add AuthCache to the execution context
+      HttpClientContext localContext = HttpClientContext.create();
+      localContext.setAuthCache(authCache);
+
       try
       {
         try
         {
-          HttpResponse resp = client.execute(method);
+          HttpResponse resp = client.execute(method, localContext);
           resultCode = resp.getStatusLine().getStatusCode();
           response = getResponseBodyAsString(resp.getEntity());
         }