Commit cc4fc60

author

Peter

committed

Merge pull request #7 from andreadelfino/master

Updated to Elasticsearch 0.90.7, added basic support for WWW-Authenticate

2 parents 8aa6abb + 7f27641 commit cc4fc60Copy full SHA for cc4fc60

File tree

+15

-10

lines changed

+15

-10

lines changed

Lines changed: 2 additions & 0 deletions

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`apply plugin: 'java'`
`2`	`2`
`3`		`-version = '1.0.3'`
	`3`	`+version = '1.0.3.1'`
`4`	`4`
`5`	`5`	`sourceSets.main.resources.srcDirs 'src/main/java'`
`6`	`6`	`sourceSets.test.resources.srcDirs 'src/test/java'`
`@@ -10,8 +10,8 @@ configurations {`
`10`	`10`	`}`
`11`	`11`
`12`	`12`	`if (hasProperty("xlint")) {`
`13`		`- tasks.withType(Compile) {`
`14`		`- options.compilerArgs << "-Xlint:unchecked"`
	`13`	`+ tasks.withType(Compile) {`
	`14`	`+ options.compilerArgs << "-Xlint:unchecked"`
`15`	`15`	`}`
`16`	`16`	`}`
`17`	`17`
`@@ -28,5 +28,5 @@ repositories {`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`dependencies {`
`31`		`- compile group: "org.elasticsearch", name: 'elasticsearch', version: "0.18.5"`
	`31`	`+ compile group: "org.elasticsearch", name: 'elasticsearch', version: "0.90.7"`
`32`	`32`	`}`

Lines changed: 5 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,16 +3,16 @@`
`3`	`3`	`<modelVersion>4.0.0</modelVersion>`
`4`	`4`
`5`	`5`	`<groupId>com.asquera.elasticsearch</groupId>`
`6`		`- <artifactId>http-basic</artifactId>`
`7`		`- <version>0.90.0-SNAPSHOT</version>`
	`6`	`+ <artifactId>elasticsearch-http-basic</artifactId>`
	`7`	`+ <version>1.0.3.1</version>`
`8`	`8`	`<packaging>jar</packaging>`
`9`	`9`
`10`	`10`	`<name>Basic Authentication Plugin</name>`
`11`	`11`	`<url>http://maven.apache.org</url>`
`12`	`12`
`13`	`13`	`<properties>`
`14`	`14`	`<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>`
`15`		`- <elasticsearch.version>0.90.0</elasticsearch.version>`
	`15`	`+ <elasticsearch.version>0.90.7</elasticsearch.version>`
`16`	`16`	`</properties>`
`17`	`17`
`18`	`18`	`<dependencies>`
`@@ -21,7 +21,7 @@`
`21`	`21`	`<artifactId>elasticsearch</artifactId>`
`22`	`22`	`<version>${elasticsearch.version}</version>`
`23`	`23`	`</dependency>`
`24`		`-`
	`24`	`+`
`25`	`25`	`<dependency>`
`26`	`26`	`<groupId>org.testng</groupId>`
`27`	`27`	`<artifactId>testng</artifactId>`
`@@ -54,7 +54,7 @@`
`54`	`54`	`<target>`
`55`	`55`	`<zip basedir="${project.build.directory}"`
`56`	`56`	`includes="${project.build.finalName}.jar"`
`57`		`- destfile="${project.build.directory}/elasticsearch-${project.artifactId}-${elasticsearch.version}.zip" />`
	`57`	`+ destfile="${project.build.directory}/${project.artifactId}-${project.version}.zip" />`
`58`	`58`	`</target>`
`59`	`59`	`</configuration>`
`60`	`60`	`<goals>`

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,10 @@ public void internalDispatchRequest(final HttpRequest request, final HttpChannel`
`77`	`77`	`String addr = getAddress(request);`
`78`	`78`	`Loggers.getLogger(getClass()).error("UNAUTHORIZED type:{}, address:{}, path:{}, request:{}, content:{}, credentials:{}",`
`79`	`79`	`request.method(), addr, request.path(), request.params(), request.content().toUtf8(), getDecoded(request));`
`80`		`- channel.sendResponse(new StringRestResponse(UNAUTHORIZED, "Authentication Required"));`
	`80`	`+`
	`81`	`+ StringRestResponse response = new StringRestResponse(UNAUTHORIZED, "Authentication Required");`
	`82`	`+ response.addHeader("WWW-Authenticate", "Basic realm=\"Restricted\"");`
	`83`	`+ channel.sendResponse(response);`
`81`	`84`	`}`
`82`	`85`	`}`
`83`	`86`

Comments

(0)