Skip to content

Remove dead code related to auditing #94114

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

Merged
merged 3 commits into from
Feb 27, 2023
Merged

Remove dead code related to auditing #94114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
61680e3
Remove composite and index audit trails
albertzaharovits Feb 24, 2023
19c741c
x-pack/plugin/core/src/main/java/module-info.java
albertzaharovits Feb 24, 2023
10d956e
Merge branch 'main' into remove-audit-dead-code
albertzaharovits Feb 24, 2023
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
1 change: 0 additions & 1 deletion x-pack/plugin/core/src/main/java/module-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,6 @@
exports org.elasticsearch.xpack.core.security.authz.store;
exports org.elasticsearch.xpack.core.security.authz.support;
exports org.elasticsearch.xpack.core.security.authz;
exports org.elasticsearch.xpack.core.security.index;
exports org.elasticsearch.xpack.core.security.support;
exports org.elasticsearch.xpack.core.security.user;
exports org.elasticsearch.xpack.core.security.xcontent;
Expand Down
13 changes: 0 additions & 13 deletions .../core/src/main/java/org/elasticsearch/xpack/core/security/index/IndexAuditTrailField.java
View file
Open in desktop

This file was deleted.

4 changes: 1 addition & 3 deletions x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/user/XPackUser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@

import org.elasticsearch.common.Strings;
import org.elasticsearch.xpack.core.security.authz.RoleDescriptor;
import org.elasticsearch.xpack.core.security.index.IndexAuditTrailField;
import org.elasticsearch.xpack.core.security.support.MetadataUtils;

/**
Expand All @@ -25,8 +24,7 @@ public class XPackUser extends User {
.indices("/@&~(\\.security.*)&~(\\.async-search.*)/")
.privileges("all")
.allowRestrictedIndices(true)
.build(),
RoleDescriptor.IndicesPrivileges.builder().indices(IndexAuditTrailField.INDEX_NAME_PREFIX + "-*").privileges("read").build() },
.build() },
new String[] { "*" },
MetadataUtils.DEFAULT_RESERVED_METADATA
);
Expand Down
21 changes: 5 additions & 16 deletions ...st/java/org/elasticsearch/xpack/security/audit/logfile/AuditTrailSettingsUpdateTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,9 +88,7 @@ public void testDynamicFilterSettings() throws Exception {
final String actual = ((LoggingAuditTrail) internalCluster().getInstances(AuditTrailService.class)
.iterator()
.next()
.getAuditTrails()
.iterator()
.next()).eventFilterPolicyRegistry.toString();
.getAuditTrail()).eventFilterPolicyRegistry.toString();
assertEquals(expected, actual);
}

Expand All @@ -112,7 +110,6 @@ public void testInvalidFilterSettings() throws Exception {
}

public void testDynamicHostSettings() {
final boolean persistent = randomBoolean();
final Settings.Builder settingsBuilder = Settings.builder();
settingsBuilder.put(LoggingAuditTrail.EMIT_HOST_ADDRESS_SETTING.getKey(), true);
settingsBuilder.put(LoggingAuditTrail.EMIT_HOST_NAME_SETTING.getKey(), true);
Expand All @@ -122,9 +119,7 @@ public void testDynamicHostSettings() {
final LoggingAuditTrail loggingAuditTrail = (LoggingAuditTrail) internalCluster().getInstances(AuditTrailService.class)
.iterator()
.next()
.getAuditTrails()
.iterator()
.next();
.getAuditTrail();
assertThat(loggingAuditTrail.entryCommonFields.commonFields.get(LoggingAuditTrail.NODE_NAME_FIELD_NAME), startsWith("node_"));
assertThat(loggingAuditTrail.entryCommonFields.commonFields.containsKey(LoggingAuditTrail.NODE_ID_FIELD_NAME), is(true));
assertThat(loggingAuditTrail.entryCommonFields.commonFields.get(LoggingAuditTrail.HOST_ADDRESS_FIELD_NAME), is("127.0.0.1"));
Expand Down Expand Up @@ -159,9 +154,7 @@ public void testDynamicClusterSettings() {
final LoggingAuditTrail loggingAuditTrail = (LoggingAuditTrail) internalCluster().getInstances(AuditTrailService.class)
.iterator()
.next()
.getAuditTrails()
.iterator()
.next();
.getAuditTrail();

final Settings.Builder settingsBuilder = Settings.builder();
settingsBuilder.put(LoggingAuditTrail.EMIT_CLUSTER_NAME_SETTING.getKey(), true);
Expand Down Expand Up @@ -197,9 +190,7 @@ public void testDynamicRequestBodySettings() {
final LoggingAuditTrail loggingAuditTrail = (LoggingAuditTrail) internalCluster().getInstances(AuditTrailService.class)
.iterator()
.next()
.getAuditTrails()
.iterator()
.next();
.getAuditTrail();
assertEquals(enableRequestBody, loggingAuditTrail.includeRequestBody);
settingsBuilder.put(LoggingAuditTrail.INCLUDE_REQUEST_BODY.getKey(), enableRequestBody == false);
updateSettings(settingsBuilder.build());
Expand Down Expand Up @@ -230,9 +221,7 @@ public void testDynamicEventsSettings() {
final LoggingAuditTrail loggingAuditTrail = (LoggingAuditTrail) internalCluster().getInstances(AuditTrailService.class)
.iterator()
.next()
.getAuditTrails()
.iterator()
.next();
.getAuditTrail();
assertEquals(AuditLevel.parse(includedEvents, excludedEvents), loggingAuditTrail.events);
}

Expand Down
5 changes: 2 additions & 3 deletions ...est/java/org/elasticsearch/xpack/security/authz/SecuritySearchOperationListenerTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@
import org.junit.Before;

import java.util.Collections;
import java.util.List;

import static org.elasticsearch.xpack.core.security.authz.AuthorizationServiceField.AUTHORIZATION_INFO_KEY;
import static org.elasticsearch.xpack.core.security.authz.AuthorizationServiceField.ORIGINATING_ACTION_KEY;
Expand Down Expand Up @@ -126,7 +125,7 @@ public void testValidateSearchContext() throws Exception {
ThreadContext threadContext = new ThreadContext(Settings.EMPTY);
final SecurityContext securityContext = new SecurityContext(Settings.EMPTY, threadContext);
AuditTrail auditTrail = mock(AuditTrail.class);
AuditTrailService auditTrailService = new AuditTrailService(Collections.singletonList(auditTrail), licenseState);
AuditTrailService auditTrailService = new AuditTrailService(auditTrail, licenseState);

SecuritySearchOperationListener listener = new SecuritySearchOperationListener(securityContext, auditTrailService);
try (StoredContext ignore = threadContext.newStoredContext()) {
Expand Down Expand Up @@ -261,7 +260,7 @@ public void testValidateResourceAccessCheck() throws Exception {
when(licenseState.isAllowed(Security.AUDITING_FEATURE)).thenReturn(true);
final SecurityContext securityContext = new SecurityContext(Settings.EMPTY, new ThreadContext(Settings.EMPTY));
final AuditTrail auditTrail = mock(AuditTrail.class);
final AuditTrailService auditTrailService = new AuditTrailService(List.of(auditTrail), licenseState);
final AuditTrailService auditTrailService = new AuditTrailService(auditTrail, licenseState);

final SecuritySearchOperationListener listener = new SecuritySearchOperationListener(securityContext, auditTrailService);
final TransportRequest request = mock(TransportRequest.class);
Expand Down
8 changes: 4 additions & 4 deletions x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/Security.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -626,10 +626,10 @@ Collection<Object> createComponents(
final RestrictedIndices restrictedIndices = new RestrictedIndices(expressionResolver);

// audit trail service construction
final List<AuditTrail> auditTrails = XPackSettings.AUDIT_ENABLED.get(settings)
? Collections.singletonList(new LoggingAuditTrail(settings, clusterService, threadPool))
: Collections.emptyList();
final AuditTrailService auditTrailService = new AuditTrailService(auditTrails, getLicenseState());
final AuditTrail auditTrail = XPackSettings.AUDIT_ENABLED.get(settings)
? new LoggingAuditTrail(settings, clusterService, threadPool)
: null;
final AuditTrailService auditTrailService = new AuditTrailService(auditTrail, getLicenseState());
components.add(auditTrailService);
this.auditTrailService.set(auditTrailService);

Expand Down
Loading