honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'integ_tests' of github.com:rmuir/elasticsearch-shield into integ_tests 

Conflicts:
	dev-tools/integration-tests.xml

Original commit: elastic/x-pack-elasticsearch@caf32d7cac
This commit is contained in:
Robert Muir 2015-07-09 12:53:21 -04:00
parent 889e63c6f5 aac2fb5b75
commit c3387464c6
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dev-tools/integration-tests.xml
View File

@ -37,7 +37,7 @@
args="${integ.args} -Des.path.repo=${integ.repo.home}"/>
<!-- begin shield plugin mods -->
<run-script dir="${integ.home}" script="bin/elasticsearch-shield/esusers"
<run-script dir="${integ.home}" script="bin/shield/esusers"
args="useradd test_user -p changeme -r admin"/>
<!-- seems waitfor task doesnt support basic auth?

3
src/main/java/org/elasticsearch/shield/ShieldPlugin.java
View File

@ -31,8 +31,7 @@ import java.util.Map;
*/
public class ShieldPlugin extends AbstractPlugin {
// FIXME need to get this back to Shield once bugs fixed in core... https://github.com/elastic/elasticsearch/issues/12143
public static final String NAME = "elasticsearch-shield";
public static final String NAME = "shield";
public static final String ENABLED_SETTING_NAME = NAME + ".enabled";

3
src/test/java/org/elasticsearch/shield/test/ShieldAssertions.java
View File

@ -7,6 +7,7 @@ package org.elasticsearch.shield.test;
import org.elasticsearch.ElasticsearchSecurityException;
import org.elasticsearch.rest.RestStatus;
import org.elasticsearch.shield.ShieldPlugin;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.*;
@ -17,6 +18,6 @@ public class ShieldAssertions {
assertThat(e.status(), is(RestStatus.UNAUTHORIZED));
assertThat(e.getHeaderKeys(), hasSize(1));
assertThat(e.getHeader("WWW-Authenticate"), notNullValue());
assertThat(e.getHeader("WWW-Authenticate"), contains("Basic realm=\"elasticsearch-shield\""));
assertThat(e.getHeader("WWW-Authenticate"), contains("Basic realm=\"" + ShieldPlugin.NAME + "\""));
}
}