Skip to content

Commit 56f741e

Browse files
Do not clear keystore password on node requests
1 parent e27f097 commit 56f741e

File tree

1 file changed

+2
-7
lines changed

1 file changed

+2
-7
lines changed

server/src/main/java/org/elasticsearch/action/admin/cluster/node/reload/TransportNodesReloadSecureSettingsAction.java

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -84,10 +84,9 @@ protected NodesReloadSecureSettingsResponse.NodeResponse newNodeResponse() {
8484
@Override
8585
protected NodesReloadSecureSettingsResponse.NodeResponse nodeOperation(NodeRequest nodeReloadRequest) {
8686
final NodesReloadSecureSettingsRequest request = nodeReloadRequest.request;
87-
KeyStoreWrapper keystore = null;
88-
try (SecureString secureSettingsPassword = request.secureSettingsPassword()) {
87+
final SecureString secureSettingsPassword = request.secureSettingsPassword();
88+
try (KeyStoreWrapper keystore = KeyStoreWrapper.load(environment.configFile())) {
8989
// reread keystore from config file
90-
keystore = KeyStoreWrapper.load(environment.configFile());
9190
if (keystore == null) {
9291
return new NodesReloadSecureSettingsResponse.NodeResponse(clusterService.localNode(),
9392
new IllegalStateException("Keystore is missing"));
@@ -114,10 +113,6 @@ protected NodesReloadSecureSettingsResponse.NodeResponse nodeOperation(NodeReque
114113
return new NodesReloadSecureSettingsResponse.NodeResponse(clusterService.localNode(), null);
115114
} catch (final Exception e) {
116115
return new NodesReloadSecureSettingsResponse.NodeResponse(clusterService.localNode(), e);
117-
} finally {
118-
if (keystore != null) {
119-
keystore.close();
120-
}
121116
}
122117
}
123118

0 commit comments

Comments
 (0)