-
Notifications
You must be signed in to change notification settings - Fork 24.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Backport use origin for feature reset (#88728)
- Loading branch information
Showing
5 changed files
with
242 additions
and
23 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| pr: 88622 | ||
| summary: Use origin for the client when running _features/_reset | ||
| area: Infra/Core | ||
| type: bug | ||
| issues: | ||
| - 88617 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
146 changes: 146 additions & 0 deletions
146
...src/internalClusterTest/java/org/elasticsearch/integration/SecurityFeatureResetTests.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,146 @@ | ||
| /* | ||
| * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
| * or more contributor license agreements. Licensed under the Elastic License | ||
| * 2.0; you may not use this file except in compliance with the Elastic License | ||
| * 2.0. | ||
| */ | ||
|
|
||
| package org.elasticsearch.integration; | ||
|
|
||
| import org.elasticsearch.action.ActionListener; | ||
| import org.elasticsearch.action.admin.cluster.snapshots.features.ResetFeatureStateAction; | ||
| import org.elasticsearch.action.admin.cluster.snapshots.features.ResetFeatureStateRequest; | ||
| import org.elasticsearch.action.admin.cluster.snapshots.features.ResetFeatureStateResponse; | ||
| import org.elasticsearch.common.settings.SecureString; | ||
| import org.elasticsearch.test.SecurityIntegTestCase; | ||
| import org.elasticsearch.test.SecuritySettingsSource; | ||
| import org.elasticsearch.test.SecuritySettingsSourceField; | ||
| import org.elasticsearch.test.TestSecurityClient; | ||
| import org.elasticsearch.xpack.core.security.user.User; | ||
| import org.junit.Before; | ||
|
|
||
| import java.util.Collections; | ||
|
|
||
| import static org.elasticsearch.xpack.core.security.authc.support.UsernamePasswordToken.BASIC_AUTH_HEADER; | ||
| import static org.elasticsearch.xpack.core.security.authc.support.UsernamePasswordToken.basicAuthHeaderValue; | ||
| import static org.hamcrest.Matchers.containsString; | ||
|
|
||
| /** | ||
| * These tests ensure that the Feature Reset API works for users with default superuser and manage roles. | ||
| * This can be complex due to restrictions on system indices and the need to use the correct origin for | ||
| * each index. See also https://github.com/elastic/elasticsearch/issues/88617 | ||
| */ | ||
| public class SecurityFeatureResetTests extends SecurityIntegTestCase { | ||
| private static final SecureString SUPER_USER_PASSWD = SecuritySettingsSourceField.TEST_PASSWORD_SECURE_STRING; | ||
|
|
||
| @Override | ||
| protected boolean addMockHttpTransport() { | ||
| return false; // enable http | ||
| } | ||
|
|
||
| @Before | ||
| public void setupForTests() throws Exception { | ||
| // adds a dummy user to the native realm to force .security index creation | ||
| new TestSecurityClient(getRestClient(), SecuritySettingsSource.SECURITY_REQUEST_OPTIONS).putUser( | ||
| new User("dummy_user", "missing_role"), | ||
| SecuritySettingsSourceField.TEST_PASSWORD_SECURE_STRING | ||
| ); | ||
| assertSecurityIndexActive(); | ||
| } | ||
|
|
||
| @Override | ||
| protected String configUsers() { | ||
| final String usersPasswHashed = new String(getFastStoredHashAlgoForTests().hash(SUPER_USER_PASSWD)); | ||
| return super.configUsers() | ||
| + "su:" | ||
| + usersPasswHashed | ||
| + "\n" | ||
| + "manager:" | ||
| + usersPasswHashed | ||
| + "\n" | ||
| + "usr:" | ||
| + usersPasswHashed | ||
| + "\n"; | ||
| } | ||
|
|
||
| @Override | ||
| protected String configUsersRoles() { | ||
| return super.configUsersRoles() + """ | ||
| superuser:su | ||
| role1:manager | ||
| role2:usr"""; | ||
| } | ||
|
|
||
| @Override | ||
| protected String configRoles() { | ||
| return super.configRoles() + """ | ||
| %s | ||
| role1: | ||
| cluster: [ manage ] | ||
| indices: | ||
| - names: '*' | ||
| privileges: [ manage ] | ||
| role2: | ||
| cluster: [ monitor ] | ||
| indices: | ||
| - names: '*' | ||
| privileges: [ read ] | ||
| """; | ||
| } | ||
|
|
||
| public void testFeatureResetSuperuser() { | ||
| assertResetSuccessful("su", SUPER_USER_PASSWD); | ||
| } | ||
|
|
||
| public void testFeatureResetManageRole() { | ||
| assertResetSuccessful("manager", SUPER_USER_PASSWD); | ||
| } | ||
|
|
||
| public void testFeatureResetNoManageRole() { | ||
| final ResetFeatureStateRequest req = new ResetFeatureStateRequest(); | ||
|
|
||
| client().filterWithHeader(Collections.singletonMap(BASIC_AUTH_HEADER, basicAuthHeaderValue("usr", SUPER_USER_PASSWD))) | ||
| .admin() | ||
| .cluster() | ||
| .execute(ResetFeatureStateAction.INSTANCE, req, new ActionListener<>() { | ||
| @Override | ||
| public void onResponse(ResetFeatureStateResponse response) { | ||
| fail("Shouldn't reach here"); | ||
| } | ||
|
|
||
| @Override | ||
| public void onFailure(Exception e) { | ||
| assertThat( | ||
| e.getMessage(), | ||
| containsString("action [cluster:admin/features/reset] is unauthorized for user [usr] with roles [role2]") | ||
| ); | ||
| } | ||
| }); | ||
|
|
||
| // Manually delete the security index, reset shouldn't work | ||
| deleteSecurityIndex(); | ||
| } | ||
|
|
||
| private void assertResetSuccessful(String user, SecureString password) { | ||
| final ResetFeatureStateRequest req = new ResetFeatureStateRequest(); | ||
|
|
||
| client().filterWithHeader(Collections.singletonMap(BASIC_AUTH_HEADER, basicAuthHeaderValue(user, password))) | ||
| .admin() | ||
| .cluster() | ||
| .execute(ResetFeatureStateAction.INSTANCE, req, new ActionListener<>() { | ||
| @Override | ||
| public void onResponse(ResetFeatureStateResponse response) { | ||
| long failures = response.getFeatureStateResetStatuses() | ||
| .stream() | ||
| .filter(status -> status.getStatus() == ResetFeatureStateResponse.ResetFeatureStateStatus.Status.FAILURE) | ||
| .count(); | ||
| assertEquals(0, failures); | ||
| } | ||
|
|
||
| @Override | ||
| public void onFailure(Exception e) { | ||
| fail("Shouldn't reach here"); | ||
| } | ||
| }); | ||
| } | ||
| } |