add new tests

Author: danhermann

x-pack/plugin/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/exporter/http/HttpExporterIT.java

@@ -99,10 +99,6 @@ public class HttpExporterIT extends MonitoringIntegTestCase {
     private final boolean watcherAlreadyExists = randomBoolean();
     private final Environment environment = TestEnvironment.newEnvironment(Settings.builder().put("path.home", createTempDir()).build());
     private final String userName = "elasticuser";
-    private final String pass = "elasticpass";
-    private final String pass2 = "anotherpassword";
-    private final String authHeaderValue = Base64.encode(userName + ":" + pass);
-    private final String authHeaderValue2 = Base64.encode(userName + ":" + pass2);
 
     private MockWebServer webServer;
 
@@ -137,7 +133,7 @@ protected boolean ignoreExternalCluster() {
     }
 
     private Settings.Builder secureSettings(String password) {
-        mockSecureSettings.setString("xpack.monitoring.exporters._http.secure_auth_password", password);
+        mockSecureSettings.setString("xpack.monitoring.exporters._http.auth.secure_password", password);
         return baseSettings().setSecureSettings(mockSecureSettings);
     }
 
@@ -172,7 +168,14 @@ public void testExport() throws Exception {
     }
 
     public void testSecureSetting() throws Exception {
-        Settings settings = secureSettings(pass).build();
+        final String securePassword1 = "elasticpass";
+        final String securePassword2 = "anotherpassword";
+        final String authHeaderValue = Base64.encode(userName + ":" + securePassword1);
+        final String authHeaderValue2 = Base64.encode(userName + ":" + securePassword2);
+
+        Settings settings = secureSettings(securePassword1)
+            .put("xpack.monitoring.exporters._http.auth.password", "insecurePassword") // verify this password is not used
+            .build();
         PluginsService pluginsService = internalCluster().getInstances(PluginsService.class).iterator().next();
         LocalStateMonitoring localStateMonitoring = pluginsService.filterPlugins(LocalStateMonitoring.class).iterator().next();
         localStateMonitoring.getMonitoring().reload(settings);
@@ -188,7 +191,7 @@ public void testSecureSetting() throws Exception {
         assertEquals(webServer.takeRequest().getHeader("Authorization").replace("Basic", "").replace(" ", ""), authHeaderValue);
         webServer.clearRequests();
 
-        settings = secureSettings(pass2).build();
+        settings = secureSettings(securePassword2).build();
         localStateMonitoring.getMonitoring().reload(settings);
         enqueueGetClusterVersionResponse(Version.CURRENT);
         enqueueSetupResponses(webServer,

x-pack/plugin/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/exporter/http/HttpExporterTests.java

@@ -18,6 +18,7 @@
 import org.elasticsearch.cluster.node.DiscoveryNodes;
 import org.elasticsearch.cluster.service.ClusterService;
 import org.elasticsearch.common.settings.ClusterSettings;
+import org.elasticsearch.common.settings.MockSecureSettings;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.settings.SettingsException;
 import org.elasticsearch.common.unit.TimeValue;
@@ -140,6 +141,24 @@ public void testHostListIsRejectedIfTypeIsNotHttp() {
         assertThat(e, hasToString(containsString("[" + prefix + ".host] is set but type is [local]")));
     }
 
+    public void testSecurePasswordIsRejectedIfTypeIsNotHttp() {
+        final String prefix = "xpack.monitoring.exporters.example";
+        final Settings.Builder builder = Settings.builder().put(prefix + ".type", "local");
+
+        final String settingName = ".auth.secure_password";
+        final String settingValue = "securePassword";
+        MockSecureSettings mockSecureSettings  = new MockSecureSettings();
+        mockSecureSettings.setString(prefix + settingName, settingValue);
+
+        builder.setSecureSettings(mockSecureSettings);
+
+        final Settings settings = builder.build();
+        final ClusterSettings clusterSettings =
+            new ClusterSettings(settings, Set.of(HttpExporter.AUTH_SECURE_PASSWORD_SETTING, Exporter.TYPE_SETTING));
+        final SettingsException e = expectThrows(SettingsException.class, () -> clusterSettings.validate(settings, true));
+        assertThat(e, hasToString(containsString("[" + prefix + settingName + "] is set but type is [local]")));
+    }
+
     public void testInvalidHost() {
         final String prefix = "xpack.monitoring.exporters.example";
         final String host = "https://example.com:443/";