Update to ES 1.2.0

Author: hmalphettes

README.md

@@ -10,13 +10,14 @@ There is no way to configure this on a per index basis.
 
 |     Http Basic Plugin       | elasticsearch         |
 |-----------------------------|-----------------------|
-| 1.1.0(master)               | 1.0.0                 |
+| 1.2.0(master)               | 1.2.0                 |
+| 1.1.0                       | 1.0.0                 |
 | 1.0.4                       | 0.90.7                |
 
 ## Installation
 
 Download the current version from https://github.com/Asquera/elasticsearch-http-basic/releases and copy it to `plugins/http-basic`.
-    
+
 ## Configuration
 
 The plugin is disabled by default. Enabling basic authorization will disable the default HTTP Transport module.

pom.xml

@@ -4,15 +4,15 @@
 
     <groupId>com.asquera.elasticsearch</groupId>
     <artifactId>elasticsearch-http-basic</artifactId>
-    <version>1.1.0</version>
+    <version>1.2.0</version>
     <packaging>jar</packaging>
 
     <name>Basic Authentication Plugin</name>
     <url>http://maven.apache.org</url>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <elasticsearch.version>1.0.0</elasticsearch.version>
+        <elasticsearch.version>1.2.0</elasticsearch.version>
     </properties>
 
     <dependencies>
@@ -71,8 +71,8 @@
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-compiler-plugin</artifactId>
                     <configuration>
-                        <source>1.6</source>
-                        <target>1.6</target>
+                        <source>1.7</source>
+                        <target>1.7</target>
                     </configuration>
                 </plugin>
             </plugins>

src/main/java/com/asquera/elasticsearch/plugins/http/HttpBasicServer.java

@@ -7,7 +7,6 @@
 import org.elasticsearch.rest.RestController;
 import org.elasticsearch.common.inject.Inject;
 import org.elasticsearch.common.Base64;
-
 import org.elasticsearch.rest.RestRequest;
 
 import static org.elasticsearch.rest.RestStatus.*;
@@ -16,9 +15,10 @@
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Set;
+
 import org.elasticsearch.common.logging.Loggers;
+import org.elasticsearch.rest.BytesRestResponse;
 import org.elasticsearch.rest.RestRequest.Method;
-import org.elasticsearch.rest.StringRestResponse;
 
 // # possible http config
 // http.basic.user: admin
@@ -70,15 +70,15 @@ public void internalDispatchRequest(final HttpRequest request, final HttpChannel
 
         // allow health check even without authorization
         if (healthCheck(request)) {
-            channel.sendResponse(new StringRestResponse(OK, "{\"OK\":{}}"));
+            channel.sendResponse(new BytesRestResponse(OK, "{\"OK\":{}}"));
         } else if (allowOptionsForCORS(request) || authBasic(request) || isInIPWhitelist(request)) {
             super.internalDispatchRequest(request, channel);
         } else {
             String addr = getAddress(request);
             Loggers.getLogger(getClass()).error("UNAUTHORIZED type:{}, address:{}, path:{}, request:{}, content:{}, credentials:{}",
                     request.method(), addr, request.path(), request.params(), request.content().toUtf8(), getDecoded(request));
 
-            StringRestResponse response = new StringRestResponse(UNAUTHORIZED, "Authentication Required");
+            BytesRestResponse response = new BytesRestResponse(UNAUTHORIZED, "Authentication Required");
             response.addHeader("WWW-Authenticate", "Basic realm=\"Restricted\"");
             channel.sendResponse(response);
         }