github-mirrors/elasticsearch
1
0
Fork 0
mirror of https://github.com/elastic/elasticsearch.git synced 2025-06-28 17:34:17 -04:00
Code Issues Projects Releases Packages Wiki Activity

To avoid ambiguity (as cluster and index policies may have the same

Browse source 
name) changing implementation to have to separate policies for
`index_privileges` and `cluster_privileges`.
If both are set for the same policy, throw the IllegalArgumentException.
This commit is contained in:
BigPandaToo 2021-01-28 21:32:39 +01:00
parent cb5bc09c7e
commit 7dd8fe7dd2
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/xpack/security/audit/logfile/AuditTrailSettingsUpdateTests.java
View file

@ -96,7 +96,7 @@ public class AuditTrailSettingsUpdateTests extends SecurityIntegTestCase {
"xpack.security.audit.logfile.events.ignore_filters.invalid.realms", "xpack.security.audit.logfile.events.ignore_filters.invalid.realms",
"xpack.security.audit.logfile.events.ignore_filters.invalid.roles", "xpack.security.audit.logfile.events.ignore_filters.invalid.roles",
"xpack.security.audit.logfile.events.ignore_filters.invalid.indices", "xpack.security.audit.logfile.events.ignore_filters.invalid.indices",
"xpack.security.audit.logfile.events.ignore_filters.invalid.privileges"}; "xpack.security.audit.logfile.events.ignore_filters.invalid.index_privileges"};
settingsBuilder.put(randomFrom(allSettingsKeys), invalidLuceneRegex); settingsBuilder.put(randomFrom(allSettingsKeys), invalidLuceneRegex);
final IllegalArgumentException e = expectThrows(IllegalArgumentException.class, final IllegalArgumentException e = expectThrows(IllegalArgumentException.class,
() -> client().admin().cluster().prepareUpdateSettings().setTransientSettings(settingsBuilder.build()).get()); () -> client().admin().cluster().prepareUpdateSettings().setTransientSettings(settingsBuilder.build()).get());
@ -226,7 +226,7 @@ public class AuditTrailSettingsUpdateTests extends SecurityIntegTestCase {
if (randomBoolean()) { if (randomBoolean()) {
// filter by privileges // filter by privileges
final List<String> filteredPrivileges = randomNonEmptyListOfFilteredNames(); final List<String> filteredPrivileges = randomNonEmptyListOfFilteredNames();
settingsBuilder.putList("xpack.security.audit.logfile.events.ignore_filters." + policyName + ".privileges", settingsBuilder.putList("xpack.security.audit.logfile.events.ignore_filters." + policyName + ".index_privileges",
filteredPrivileges); filteredPrivileges);
} }
} while (settingsBuilder.build().isEmpty()); } while (settingsBuilder.build().isEmpty());