Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[TEST] Reload secure settings transport IT #31180

Merged
merged 10 commits into from
Jun 16, 2018
Merged

[TEST] Reload secure settings transport IT #31180

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
9a1cca3
WIP
albertzaharovits Jun 5, 2018
e8c4e12
Raw test, no keystore present
albertzaharovits Jun 5, 2018
2ed5ae1
Proper integ test for reload secret settings
albertzaharovits Jun 7, 2018
9cab952
Merge branch 'reload-secure-store-action' into ReloadIT
albertzaharovits Jun 9, 2018
68368a9
Small adjustment to the log message
albertzaharovits Jun 11, 2018
9067cb4
Merge branch 'reload-secure-store-action' into ReloadIT
albertzaharovits Jun 12, 2018
afb0e11
Address feedback
albertzaharovits Jun 13, 2018
c46d311
Write keystore by ignoring the last Access Exception
albertzaharovits Jun 15, 2018
6f8f504
Removed test keystore resources
albertzaharovits Jun 15, 2018
50b433c
Shuffle with random()
albertzaharovits Jun 16, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions ...sticsearch/action/admin/cluster/node/reload/TransportNodesReloadSecureSettingsAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -102,6 +104,8 @@ protected NodesReloadSecureSettingsResponse.NodeResponse nodeOperation(NodeReque
try {
p.reload(settingsWithKeystore);
} catch (final Exception e) {
logger.warn((Supplier<?>) () -> new ParameterizedMessage("Reload failed for plugin [{}]", p.getClass().getSimpleName()),
e);
exceptions.add(e);
}
});
Expand Down
4 changes: 3 additions & 1 deletion server/src/main/java/org/elasticsearch/common/settings/KeyStoreWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
}
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

2/2 non test change
This password is no longer internal API, there are code paths where the user supplies its value.

return;
}

Expand Down
22 changes: 2 additions & 20 deletions ...main/java/org/elasticsearch/rest/action/admin/cluster/RestReloadSecureSettingsAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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
Expand Down
430 changes: 430 additions & 0 deletions server/src/test/java/org/elasticsearch/action/admin/ReloadSecureSettingsIT.java
View file
Open in desktop

Large diffs are not rendered by default.

Binary file added server/src/test/resources/org/elasticsearch/action/admin/elasticsearch_1.keystore
View file
Open in desktop
Binary file not shown.
Binary file added server/src/test/resources/org/elasticsearch/action/admin/elasticsearch_2.keystore
View file
Open in desktop
Binary file not shown.
Binary file added server/src/test/resources/org/elasticsearch/action/admin/elasticsearch_3.keystore
View file
Open in desktop
Binary file not shown.
Binary file added server/src/test/resources/org/elasticsearch/action/admin/elasticsearch_4.keystore
View file
Open in desktop
Binary file not shown.
3 changes: 3 additions & 0 deletions server/src/test/resources/org/elasticsearch/action/admin/invalid.txt.keystore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
admin admin
dragon 12345