Fix bug in environment preparation not passing secure settings along.

Also, don't close secure settings (for now).

Author: rjernst

core/src/main/java/org/elasticsearch/bootstrap/Bootstrap.java

@@ -338,12 +338,13 @@ static void init(
 
             INSTANCE.setup(true, environment);
 
+            /* TODO: close this once s3 repository doesn't try to read during repository construction
             try {
                 // any secure settings must be read during node construction
                 IOUtils.close(keystore);
             } catch (IOException e) {
                 throw new BootstrapException(e);
-            }
+            }*/
 
             INSTANCE.start();
 

core/src/main/java/org/elasticsearch/node/InternalSettingsPreparer.java

@@ -89,6 +89,7 @@ public static Environment prepareEnvironment(Settings input, Terminal terminal,
         initializeSettings(output, input, true, properties);
         Environment environment = new Environment(output.build());
 
+        output = Settings.builder(); // start with a fresh output
         boolean settingsFileFound = false;
         Set<String> foundSuffixes = new HashSet<>();
         for (String allowedSuffix : ALLOWED_SUFFIXES) {

core/src/test/java/org/elasticsearch/node/internal/InternalSettingsPreparerTests.java

@@ -21,6 +21,10 @@
 
 import org.elasticsearch.cli.MockTerminal;
 import org.elasticsearch.cluster.ClusterName;
+import org.elasticsearch.common.settings.MockSecureSettings;
+import org.elasticsearch.common.settings.SecureSetting;
+import org.elasticsearch.common.settings.SecureString;
+import org.elasticsearch.common.settings.Setting;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.settings.SettingsException;
 import org.elasticsearch.env.Environment;
@@ -161,4 +165,13 @@ public void testMultipleSettingsFileNotAllowed() throws IOException {
             assertTrue(e.getMessage(), e.getMessage().contains(".properties"));
         }
     }
+
+    public void testSecureSettings() {
+        MockSecureSettings secureSettings = new MockSecureSettings();
+        secureSettings.setString("foo", "secret");
+        Settings input = Settings.builder().put(baseEnvSettings).setSecureSettings(secureSettings).build();
+        Environment env = InternalSettingsPreparer.prepareEnvironment(input, null);
+        Setting<SecureString> fakeSetting = SecureSetting.secureString("foo", null, false);
+        assertEquals("secret", fakeSetting.get(env.settings()).toString());
+    }
 }