From commits-return-9906-archive-asf-public=cust-asf.ponee.io@manifoldcf.apache.org Sun Dec 2 17:14:45 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id AA38C180609 for ; Sun, 2 Dec 2018 17:14:44 +0100 (CET) Received: (qmail 1815 invoked by uid 500); 2 Dec 2018 16:14:43 -0000 Mailing-List: contact commits-help@manifoldcf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@manifoldcf.apache.org Delivered-To: mailing list commits@manifoldcf.apache.org Received: (qmail 1801 invoked by uid 99); 2 Dec 2018 16:14:43 -0000 Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 02 Dec 2018 16:14:43 +0000 Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 0ECF03A1EB8 for ; Sun, 2 Dec 2018 16:14:42 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1848005 - in /manifoldcf/trunk/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch: ElasticSearchConnection.java ElasticSearchDelete.java ElasticSearchIndex.java Date: Sun, 02 Dec 2018 16:14:42 -0000 To: commits@manifoldcf.apache.org From: kwright@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20181202161443.0ECF03A1EB8@svn01-us-west.apache.org> Author: kwright Date: Sun Dec 2 16:14:42 2018 New Revision: 1848005 URL: http://svn.apache.org/viewvc?rev=1848005&view=rev Log: Remove basic auth code that's not standard Modified: manifoldcf/trunk/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchConnection.java manifoldcf/trunk/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchDelete.java manifoldcf/trunk/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchIndex.java 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=1848005&r1=1848004&r2=1848005&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 Sun Dec 2 16:14:42 2018 @@ -78,8 +78,6 @@ public class ElasticSearchConnection private final HttpClient client; private final String serverLocation; private final String indexName; - private final String userName; - private final String userPassword; private String resultDescription = ""; private String callUrlSnippet = null; @@ -95,38 +93,19 @@ public class ElasticSearchConnection this.client = client; serverLocation = config.getServerLocation(); indexName = config.getIndexName(); - userName = config.getUserName(); - userPassword = config.getPassword(); } protected StringBuffer getApiUrl(String command, boolean checkConnection) throws ManifoldCFException { - String basicAuth = ""; - if (userName.length() > 0 && userPassword.length() >0) { - basicAuth = userName + ":" + userPassword + "@"; - } - Logging.connectors.debug("Auth: " + basicAuth); - - String[] serverLocationSplit = serverLocation.split("://",2); - StringBuffer url; - if (basicAuth.length() > 0) { - url = new StringBuffer(serverLocationSplit[0] + "://" + basicAuth + serverLocationSplit[1]); - } - else { - url = new StringBuffer(serverLocationSplit[0] + "://" + basicAuth + serverLocationSplit[1]); - } + StringBuffer url = new StringBuffer(serverLocation); if (!serverLocation.endsWith("/")) url.append('/'); - Logging.connectors.debug("Url: " + url); - if(!checkConnection) url.append(URLEncoder.encode(indexName)).append("/"); url.append(command); callUrlSnippet = url.toString(); - Logging.connectors.debug("UrlEnc: " + url); - return url; } Modified: manifoldcf/trunk/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchDelete.java URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchDelete.java?rev=1848005&r1=1848004&r2=1848005&view=diff ============================================================================== --- manifoldcf/trunk/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchDelete.java (original) +++ manifoldcf/trunk/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchDelete.java Sun Dec 2 16:14:42 2018 @@ -47,15 +47,6 @@ public class ElasticSearchDelete extends "/" + config.getIndexName() + "/" + config.getIndexType() + "/" + idField); - if (config.getUserName().length() > 0 && config.getPassword().length() >0) { - byte[] basicAuth = (config.getUserName() + ":" + config.getPassword()).getBytes(); - Base64 encoder = new Base64(); - String encoding = encoder.encodeByteArray(basicAuth); - method.setHeader("Authorization", "Basic " + encoding); - Header header = method.getLastHeader("Authorization"); - Logging.connectors.debug("Header: " + new String(header.getValue().getBytes())); - } - call(method); String error = checkJson(jsonException); if (getResult() == Result.OK && error == null) Modified: manifoldcf/trunk/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchIndex.java URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchIndex.java?rev=1848005&r1=1848004&r2=1848005&view=diff ============================================================================== --- manifoldcf/trunk/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchIndex.java (original) +++ manifoldcf/trunk/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchIndex.java Sun Dec 2 16:14:42 2018 @@ -434,15 +434,6 @@ public class ElasticSearchIndex extends config.getIndexingDateAttributeName(), config.getMimeTypeAttributeName())); - if (config.getUserName().length() > 0 && config.getPassword().length() >0) { - byte[] basicAuth = (config.getUserName() + ":" + config.getPassword()).getBytes(); - Base64 encoder = new Base64(); - String encoding = encoder.encodeByteArray(basicAuth); - put.setHeader("Authorization", "Basic " + encoding); - Header header = put.getLastHeader("Authorization"); - Logging.connectors.debug("Header: " + new String(header.getValue().getBytes())); - } - if (call(put) == false) return false; String error = checkJson(jsonException);