Do not clear keystore password on node requests

elastic · Jun 17, 2018 · 56f741e · 56f741e
1 parent e27f097
commit 56f741e
Showing 1 changed file with 2 additions and 7 deletions.
diff --git a/...sticsearch/action/admin/cluster/node/reload/TransportNodesReloadSecureSettingsAction.java b/...sticsearch/action/admin/cluster/node/reload/TransportNodesReloadSecureSettingsAction.java
@@ -84,10 +84,9 @@ protected NodesReloadSecureSettingsResponse.NodeResponse newNodeResponse() {
     @Override
     protected NodesReloadSecureSettingsResponse.NodeResponse nodeOperation(NodeRequest nodeReloadRequest) {
         final NodesReloadSecureSettingsRequest request = nodeReloadRequest.request;
-        KeyStoreWrapper keystore = null;
-        try (SecureString secureSettingsPassword = request.secureSettingsPassword()) {
+        final SecureString secureSettingsPassword = request.secureSettingsPassword();
+        try (KeyStoreWrapper keystore = KeyStoreWrapper.load(environment.configFile())) {
             // reread keystore from config file
-            keystore = KeyStoreWrapper.load(environment.configFile());
             if (keystore == null) {
                 return new NodesReloadSecureSettingsResponse.NodeResponse(clusterService.localNode(),
                         new IllegalStateException("Keystore is missing"));
@@ -114,10 +113,6 @@ protected NodesReloadSecureSettingsResponse.NodeResponse nodeOperation(NodeReque
             return new NodesReloadSecureSettingsResponse.NodeResponse(clusterService.localNode(), null);
         } catch (final Exception e) {
             return new NodesReloadSecureSettingsResponse.NodeResponse(clusterService.localNode(), e);
-        } finally {
-            if (keystore != null) {
-                keystore.close();
-            }
         }
     }