From 1050086e32305a08d62291662ade57d4002a478a Mon Sep 17 00:00:00 2001 From: Boaz Leskes Date: Wed, 11 Feb 2015 13:56:24 +0100 Subject: [PATCH] Agent: remove fall back to shield SSL settings It was an attempt to make life simpler when using marvel on a cluster with shield installed and shipping locally. Turned out to do more damage then good. Closes #375 --- .../marvel/agent/exporter/ESExporter.java | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/agent/src/main/java/org/elasticsearch/marvel/agent/exporter/ESExporter.java b/agent/src/main/java/org/elasticsearch/marvel/agent/exporter/ESExporter.java index 6936c9985ce8a..4827c814c5856 100644 --- a/agent/src/main/java/org/elasticsearch/marvel/agent/exporter/ESExporter.java +++ b/agent/src/main/java/org/elasticsearch/marvel/agent/exporter/ESExporter.java @@ -130,8 +130,7 @@ public ESExporter(Settings settings, ClusterService clusterService, ClusterName dynamicSettings.addDynamicSetting(SETTINGS_READ_TIMEOUT); nodeSettingsService.addListener(this); - if (!settings.getByPrefix(SETTINGS_SSL_PREFIX).getAsMap().isEmpty() || - !settings.getByPrefix(SETTINGS_SSL_SHIELD_PREFIX).getAsMap().isEmpty()) { + if (!settings.getByPrefix(SETTINGS_SSL_PREFIX).getAsMap().isEmpty()) { sslSocketFactory = createSSLSocketFactory(settings); } else { logger.trace("no ssl context configured"); @@ -778,16 +777,11 @@ public void run() { } private static final String SETTINGS_SSL_PREFIX = SETTINGS_PREFIX + "ssl."; - private static final String SETTINGS_SSL_SHIELD_PREFIX = "shield.ssl."; public static final String SETTINGS_SSL_PROTOCOL = SETTINGS_SSL_PREFIX + "protocol"; - private static final String SETTINGS_SSL_SHIELD_CONTEXT_ALGORITHM = SETTINGS_SSL_SHIELD_PREFIX + "context.algorithm"; public static final String SETTINGS_SSL_TRUSTSTORE = SETTINGS_SSL_PREFIX + "truststore.path"; - private static final String SETTINGS_SSL_SHIELD_TRUSTSTORE = SETTINGS_SSL_SHIELD_PREFIX + "truststore.path"; public static final String SETTINGS_SSL_TRUSTSTORE_PASSWORD = SETTINGS_SSL_PREFIX + "truststore.password"; - private static final String SETTINGS_SSL_SHIELD_TRUSTSTORE_PASSWORD = SETTINGS_SSL_SHIELD_PREFIX + "truststore.password"; public static final String SETTINGS_SSL_TRUSTSTORE_ALGORITHM = SETTINGS_SSL_PREFIX + "truststore.algorithm"; - private static final String SETTINGS_SSL_SHIELD_TRUSTSTORE_ALGORITHM = SETTINGS_SSL_SHIELD_PREFIX + "truststore.algorithm"; /** SSL Initialization * */ @@ -795,10 +789,10 @@ public SSLSocketFactory createSSLSocketFactory(Settings settings) { SSLContext sslContext; // Initialize sslContext try { - String sslContextProtocol = settings.get(SETTINGS_SSL_PROTOCOL, settings.get(SETTINGS_SSL_SHIELD_CONTEXT_ALGORITHM, "TLS")); - String trustStore = settings.get(SETTINGS_SSL_TRUSTSTORE, settings.get(SETTINGS_SSL_SHIELD_TRUSTSTORE, System.getProperty("javax.net.ssl.trustStore"))); - String trustStorePassword = settings.get(SETTINGS_SSL_TRUSTSTORE_PASSWORD, settings.get(SETTINGS_SSL_SHIELD_TRUSTSTORE_PASSWORD, System.getProperty("javax.net.ssl.trustStorePassword"))); - String trustStoreAlgorithm = settings.get(SETTINGS_SSL_TRUSTSTORE_ALGORITHM, settings.get(SETTINGS_SSL_SHIELD_TRUSTSTORE_ALGORITHM, System.getProperty("ssl.TrustManagerFactory.algorithm"))); + String sslContextProtocol = settings.get(SETTINGS_SSL_PROTOCOL, "TLS"); + String trustStore = settings.get(SETTINGS_SSL_TRUSTSTORE, System.getProperty("javax.net.ssl.trustStore")); + String trustStorePassword = settings.get(SETTINGS_SSL_TRUSTSTORE_PASSWORD, System.getProperty("javax.net.ssl.trustStorePassword")); + String trustStoreAlgorithm = settings.get(SETTINGS_SSL_TRUSTSTORE_ALGORITHM, System.getProperty("ssl.TrustManagerFactory.algorithm")); if (trustStore == null) { throw new RuntimeException("truststore is not configured, use " + SETTINGS_SSL_TRUSTSTORE);