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

Merge pull request elastic/elasticsearch#1701 from s1monw/fix_trust_store_loading 

Watcher should try to load trust/keystore from `config` directory

Today Watcher tries to load stuff from the bin's parent directory which
is not readable since the shared data directory has been moved out of
the nodes parent in elasticsearchelastic/elasticsearch#17072 which causes security exception
now. The test copies trust stores into the config dir and that's where
we should read it from by default or even better explicitly configure the path?!

Original commit: elastic/x-pack-elasticsearch@6ad580d1ea
This commit is contained in:
Simon Willnauer 2016-03-15 11:10:53 +01:00
parent 4c4eac692a 4ec4b0d7e1
commit c7129e52ec
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
elasticsearch/x-pack/marvel/src/main/java/org/elasticsearch/marvel/cleaner/CleanerService.java
View File

@ -67,7 +67,9 @@ public class CleanerService extends AbstractLifecycleComponent<CleanerService> {
@Override
protected void doClose() {
logger.debug("closing cleaning service");
runnable.cancel();
if (runnable != null) {
runnable.cancel();
}
logger.debug("cleaning service closed");
}

4
elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/http/HttpClient.java
View File

@ -281,7 +281,7 @@ public class HttpClient extends AbstractLifecycleComponent<HttpClient> {
if (keyStore == null) {
return null;
}
Path path = env.binFile().getParent().resolve(keyStore);
Path path = env.configFile().resolve(keyStore);
if (Files.notExists(path)) {
return null;
}
@ -304,7 +304,7 @@ public class HttpClient extends AbstractLifecycleComponent<HttpClient> {
// Load TrustStore
KeyStore ks = null;
if (trustStore != null) {
Path trustStorePath = env.binFile().getParent().resolve(trustStore);
Path trustStorePath = env.configFile().resolve(trustStore);
if (Files.exists(trustStorePath)) {
ks = readKeystore(trustStorePath, trustStorePassword);
}