Commit 1692c9a

committed

Merge pull request #50 from emig/39-allow-HEAD-on-local-authentication-checks

feat: allow HEAD http method for healthcheck

2 parents c49d555 + 726418a commit 1692c9aCopy full SHA for 1692c9a

File tree

+29

-2

lines changed

CHANGELOG.md
src
- main/java/com/asquera/elasticsearch/plugins/http
  - HttpBasicServer.java
- test/java/com/asquera/elasticsearch/plugins/http/auth/integration
  - DisabledWhitelistIntegrationTest.java

+29

-2

lines changed

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,10 @@ file. This file is structured according to http://keepachangelog.com/`
`5`	`5`	Use `date "+%Y-%m-%d"` to get the correct date formatting
`6`	`6`
`7`	`7`	`- - -`
	`8`	`+## [Unreleased][unreleased]`
	`9`	`+### - Added`
	`10`	`+- allow HEAD root url authentication #39`
	`11`	`+`
`8`	`12`	`## [1.5.0][2015年07月04日]`
`9`	`13`
`10`	`14`	`### - Added`

Lines changed: 11 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,7 @@`
`21`	`21`
`22`	`22`	`import java.io.IOException;`
`23`	`23`	`import java.net.InetAddress;`
	`24`	`+import java.util.Arrays;`
`24`	`25`	`import java.net.InetSocketAddress;`
`25`	`26`
`26`	`27`	`import static org.elasticsearch.rest.RestStatus.OK;`
`@@ -91,9 +92,17 @@ public void internalDispatchRequest(final HttpRequest request, final HttpChannel`
`91`	`92`	`}`
`92`	`93`	`}`
`93`	`94`
	`95`	`+ // @param an http method`
	`96`	`+ // @returns True iff the method is one of the methods used for health check`
	`97`	`+ private boolean isHealthCheckMethod(final RestRequest.Method method){`
	`98`	`+ final RestRequest.Method[] healthCheckMethods = { RestRequest.Method.GET, RestRequest.Method.HEAD };`
	`99`	`+ return Arrays.asList(healthCheckMethods).contains(method);`
	`100`	`+ }`
	`101`	`+`
	`102`	`+ // @param an http Request`
	`103`	`+ // @returns True iff we check the root path and is a method allowed for healthCheck`
`94`	`104`	`private boolean healthCheck(final HttpRequest request) {`
`95`		`- String path = request.path();`
`96`		`- return (request.method() == RestRequest.Method.GET) && path.equals("/");`
	`105`	`+ return request.path().equals("/") && isHealthCheckMethod(request.method());`
`97`	`106`	`}`
`98`	`107`
`99`	`108`	`/**`

Lines changed: 14 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@`
`24`	`24`	`import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope;`
`25`	`25`	`import org.elasticsearch.test.rest.client.http.HttpRequestBuilder;`
`26`	`26`	`import org.elasticsearch.test.rest.client.http.HttpResponse;`
	`27`	`+import org.apache.http.client.methods.HttpHead;`
`27`	`28`	`import org.junit.Test;`
`28`	`29`
`29`	`30`	`import static org.elasticsearch.test.ElasticsearchIntegrationTest.Scope;`
`@@ -49,6 +50,19 @@ public void clientIpAuthenticationFails() throws Exception {`
`49`	`50`	`assertThat(response.getStatusCode(), equalTo(RestStatus.UNAUTHORIZED.getStatus()));`
`50`	`51`	`}`
`51`	`52`
	`53`	`+ @Test`
	`54`	`+ // GET by default`
	`55`	`+ public void testHealthCheck() throws Exception {`
	`56`	`+ HttpResponse response = httpClient().path("/").execute();`
	`57`	`+ assertThat(response.getStatusCode(), equalTo(RestStatus.OK.getStatus()));`
	`58`	`+ }`
	`59`	`+`
	`60`	`+ @Test`
	`61`	`+ public void testHealthCheckHeadMethod() throws Exception {`
	`62`	`+ HttpResponse response = httpClient().method(HttpHead.METHOD_NAME).path("/").execute();`
	`63`	`+ assertThat(response.getStatusCode(), equalTo(RestStatus.OK.getStatus()));`
	`64`	`+ }`
	`65`	`+`
`52`	`66`	`@Test`
`53`	`67`	`public void clientGoodCredentialsBasicAuthenticationSuceeds() throws Exception {`
`54`	`68`	`HttpResponse response = requestWithCredentials("admin:admin_pw")`

Comments

(0)