Add support for elasticsearch 7.6.0

Cleafy · Mar 25, 2020 · cdc6260 · cdc6260
1 parent 1dca0c7
commit cdc6260
Show file tree

Hide file tree

Showing 10 changed files with 25 additions and 31 deletions.
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 [![Build Status](https://travis-ci.org/Cleafy/elasticsearch6-http-basic.svg?branch=master)](https://github.com/Cleafy/elasticsearch6-http-basic)
 
 
-# HTTP Basic auth for ElasticSearch 6.x
+# HTTP Basic auth for ElasticSearch
 
 This plugin provides an extension of ElasticSearchs HTTP Transport module to enable **HTTP basic authentication** and/or
 **Ip based authentication**.
@@ -16,7 +16,8 @@ There is no way to configure this on a per index basis.
 
 |     Http Basic Plugin       | elasticsearch                |
 |-----------------------------|------------------------------|
-| v1.0.0                      |                        6.3.2 |
+| v0.0.1                      |                        6.3.2 |
+| v0.1.0                      |                        7.6.0 |
 
 
 ## Installation

diff --git a/pom.xml b/pom.xml
@@ -3,13 +3,13 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <groupId>com.cleafy.elasticsearch6</groupId>
-    <artifactId>elasticsearch6-http-basic</artifactId>
-    <version>0.0.1</version>
+    <groupId>com.cleafy.elasticsearch</groupId>
+    <artifactId>elasticsearch-http-basic</artifactId>
+    <version>0.1.0</version>
     <packaging>jar</packaging>
-    <name>Elasticsearch 6.x Http Basic plugin</name>
+    <name>Elasticsearch Http Basic plugin</name>
     <description>Adds HTTP Basic authentication (BA) to your Elasticsearch cluster</description>
-    <url>https://github.com/Cleafy/elasticsearch-http-basic</url>
+    <url>https://github.com/Cleafy/elasticsearch6-http-basic</url>
     <inceptionYear>2018</inceptionYear>
 
     <properties>
@@ -21,14 +21,14 @@
         <dependency>
             <groupId>org.elasticsearch</groupId>
             <artifactId>elasticsearch</artifactId>
-            <version>6.3.2</version>
+            <version>7.6.0</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.elasticsearch.test</groupId>
             <artifactId>framework</artifactId>
-            <version>6.3.2</version>
+            <version>7.6.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -40,7 +40,7 @@
     </dependencies>
 
     <build>
-        <finalName>elasticsearch6-http-basic-plugin</finalName>
+        <finalName>elasticsearch-http-basic-plugin</finalName>
         <resources>
             <resource>
                 <directory>src/main/resources</directory>

diff --git a/...search6/plugins/http/BasicRestFilter.java → ...csearch/plugins/http/BasicRestFilter.java b/...search6/plugins/http/BasicRestFilter.java → ...csearch/plugins/http/BasicRestFilter.java
@@ -1,9 +1,9 @@
-package com.cleafy.elasticsearch6.plugins.http;
+package com.cleafy.elasticsearch.plugins.http;
 
-import com.cleafy.elasticsearch6.plugins.http.auth.AuthCredentials;
-import com.cleafy.elasticsearch6.plugins.http.auth.HttpBasicAuthenticator;
-import com.cleafy.elasticsearch6.plugins.http.utils.Globals;
-import com.cleafy.elasticsearch6.plugins.http.utils.LoggerUtils;
+import com.cleafy.elasticsearch.plugins.http.auth.AuthCredentials;
+import com.cleafy.elasticsearch.plugins.http.auth.HttpBasicAuthenticator;
+import com.cleafy.elasticsearch.plugins.http.utils.Globals;
+import com.cleafy.elasticsearch.plugins.http.utils.LoggerUtils;
 import org.elasticsearch.ElasticsearchException;
 import org.elasticsearch.client.node.NodeClient;
 import org.elasticsearch.common.settings.Settings;

diff --git a/...6/plugins/http/HttpBasicServerPlugin.java → ...h/plugins/http/HttpBasicServerPlugin.java b/...6/plugins/http/HttpBasicServerPlugin.java → ...h/plugins/http/HttpBasicServerPlugin.java
@@ -1,6 +1,6 @@
-package com.cleafy.elasticsearch6.plugins.http;
+package com.cleafy.elasticsearch.plugins.http;
 
-import com.cleafy.elasticsearch6.plugins.http.utils.Globals;
+import com.cleafy.elasticsearch.plugins.http.utils.Globals;
 import org.elasticsearch.common.inject.Inject;
 import org.elasticsearch.common.settings.Setting;
 import org.elasticsearch.common.settings.Settings;

diff --git a/...h6/plugins/http/auth/AuthCredentials.java → ...ch/plugins/http/auth/AuthCredentials.java b/...h6/plugins/http/auth/AuthCredentials.java → ...ch/plugins/http/auth/AuthCredentials.java
@@ -1,4 +1,4 @@
-package com.cleafy.elasticsearch6.plugins.http.auth;
+package com.cleafy.elasticsearch.plugins.http.auth;
 
 import org.elasticsearch.ElasticsearchSecurityException;
 

diff --git a/...rch6/plugins/http/auth/Authenticator.java → ...arch/plugins/http/auth/Authenticator.java b/...rch6/plugins/http/auth/Authenticator.java → ...arch/plugins/http/auth/Authenticator.java
@@ -1,4 +1,4 @@
-package com.cleafy.elasticsearch6.plugins.http.auth;
+package com.cleafy.elasticsearch.plugins.http.auth;
 
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.rest.RestRequest;

diff --git a/...search6/plugins/http/auth/HTTPHelper.java → ...csearch/plugins/http/auth/HTTPHelper.java b/...search6/plugins/http/auth/HTTPHelper.java → ...csearch/plugins/http/auth/HTTPHelper.java
@@ -1,4 +1,4 @@
-package com.cleafy.elasticsearch6.plugins.http.auth;
+package com.cleafy.elasticsearch.plugins.http.auth;
 
 import java.nio.charset.StandardCharsets;
 import java.util.Base64;
@@ -14,13 +14,6 @@ public static AuthCredentials extractCredentials(String authorizationHeader) {
                 final String decodedBasicHeader = new String(Base64.getDecoder().decode(authorizationHeader.split(" ")[1]),
                         StandardCharsets.UTF_8);
 
-                //username:password
-                //special case
-                //username must not contain a :, but password is allowed to do so
-                //   username:pass:word
-                //blank password
-                //   username:
-
                 final int firstColonIndex = decodedBasicHeader.indexOf(':');
 
                 String username = null;

diff --git a/...ins/http/auth/HttpBasicAuthenticator.java → ...ins/http/auth/HttpBasicAuthenticator.java b/...ins/http/auth/HttpBasicAuthenticator.java → ...ins/http/auth/HttpBasicAuthenticator.java
@@ -1,4 +1,4 @@
-package com.cleafy.elasticsearch6.plugins.http.auth;
+package com.cleafy.elasticsearch.plugins.http.auth;
 
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.rest.RestRequest;

diff --git a/...icsearch6/plugins/http/utils/Globals.java → ...ticsearch/plugins/http/utils/Globals.java b/...icsearch6/plugins/http/utils/Globals.java → ...ticsearch/plugins/http/utils/Globals.java
@@ -1,4 +1,4 @@
-package com.cleafy.elasticsearch6.plugins.http.utils;
+package com.cleafy.elasticsearch.plugins.http.utils;
 
 public class Globals {
     public static final String SETTINGS_ENABLED = "http.basic.enabled";

diff --git a/...arch6/plugins/http/utils/LoggerUtils.java → ...earch/plugins/http/utils/LoggerUtils.java b/...arch6/plugins/http/utils/LoggerUtils.java → ...earch/plugins/http/utils/LoggerUtils.java
@@ -1,4 +1,4 @@
-package com.cleafy.elasticsearch6.plugins.http.utils;
+package com.cleafy.elasticsearch.plugins.http.utils;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -36,6 +36,6 @@ public static void logUnAuthorizedRequest(final RestRequest request, Class<?> kl
     }
 
     private static InetAddress getAddress(RestRequest request) {
-        return ((InetSocketAddress) request.getRemoteAddress()).getAddress();
+        return ((InetSocketAddress) request.getHttpChannel().getRemoteAddress()).getAddress();
     }
 }