[TEST] Reload secure settings transport IT

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

@@ -19,6 +19,8 @@
 
 package org.elasticsearch.action.admin.cluster.node.reload;
 
+import org.apache.logging.log4j.message.ParameterizedMessage;
+import org.apache.logging.log4j.util.Supplier;
 import org.elasticsearch.ExceptionsHelper;
 import org.elasticsearch.action.FailedNodeException;
 import org.elasticsearch.action.support.ActionFilters;
@@ -102,6 +104,8 @@ protected NodesReloadSecureSettingsResponse.NodeResponse nodeOperation(NodeReque
                 try {
                     p.reload(settingsWithKeystore);
                 } catch (final Exception e) {
+                    logger.warn((Supplier<?>) () -> new ParameterizedMessage("Plugin [{}] threw [{}] on node [{}]",
+                            p.getClass().getSimpleName(), e.getClass().getSimpleName(), clusterService.localNode().getName()), e);
                     exceptions.add(e);
                 }
             });

server/src/main/java/org/elasticsearch/common/settings/KeyStoreWrapper.java

@@ -308,7 +308,9 @@ public void decrypt(char[] password) throws GeneralSecurityException, IOExceptio
         }
         if (formatVersion <= 2) {
             decryptLegacyEntries();
-            assert password.length == 0;
+            if (password.length != 0) {
+                throw new IllegalArgumentException("Keystore format does not accept non-empty passwords");
+            }
             return;
         }
 

server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestReloadSecureSettingsAction.java

@@ -19,19 +19,13 @@
 
 package org.elasticsearch.rest.action.admin.cluster;
 
-import org.elasticsearch.action.admin.cluster.node.reload.NodesReloadSecureSettingsResponse;
 import org.elasticsearch.client.node.NodeClient;
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.settings.Settings;
-import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.rest.BaseRestHandler;
-import org.elasticsearch.rest.BytesRestResponse;
 import org.elasticsearch.rest.RestController;
 import org.elasticsearch.rest.RestRequest;
-import org.elasticsearch.rest.RestResponse;
-import org.elasticsearch.rest.RestStatus;
-import org.elasticsearch.rest.action.RestActions;
-import org.elasticsearch.rest.action.RestBuilderListener;
+import org.elasticsearch.rest.action.RestActions.NodesResponseRestListener;
 
 import java.io.IOException;
 
@@ -59,19 +53,7 @@ public RestChannelConsumer prepareRequest(RestRequest request, NodeClient client
                 .setTimeout(request.param("timeout"))
                 .setNodesIds(nodesIds)
                 .setSecureStorePassword(request.param("secure_settings_password", ""))
-                .execute(new RestBuilderListener<NodesReloadSecureSettingsResponse>(channel) {
-                    @Override
-                    public RestResponse buildResponse(NodesReloadSecureSettingsResponse response, XContentBuilder builder)
-                            throws Exception {
-                        builder.startObject();
-                        RestActions.buildNodesHeader(builder, channel.request(), response);
-                        builder.field("cluster_name", response.getClusterName().value());
-                        response.toXContent(builder, channel.request());
-                        builder.endObject();
-
-                        return new BytesRestResponse(RestStatus.OK, builder);
-                    }
-                });
+                .execute(new NodesResponseRestListener<>(channel));
     }
 
     @Override

server/src/test/resources/org/elasticsearch/action/admin/invalid.txt.keystore

@@ -0,0 +1,3 @@
+admin admin
+dragon 12345
+