Refactor remote cluster interceptor and tests #135747
+1,347
−1,020
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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,135 @@ | ||
| /* | ||
| * 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.xpack.security.transport; | ||
|
|
||
| import org.apache.logging.log4j.LogManager; | ||
| import org.apache.logging.log4j.Logger; | ||
| import org.elasticsearch.TransportVersion; | ||
| import org.elasticsearch.action.ActionListener; | ||
| import org.elasticsearch.action.IndicesRequest; | ||
| import org.elasticsearch.action.admin.indices.close.TransportCloseIndexAction; | ||
| import org.elasticsearch.action.admin.indices.delete.TransportDeleteIndexAction; | ||
| import org.elasticsearch.action.admin.indices.open.OpenIndexAction; | ||
| import org.elasticsearch.action.support.DestructiveOperations; | ||
| import org.elasticsearch.common.util.concurrent.ThreadContext; | ||
| import org.elasticsearch.transport.TaskTransportChannel; | ||
| import org.elasticsearch.transport.TcpChannel; | ||
| import org.elasticsearch.transport.TcpTransportChannel; | ||
| import org.elasticsearch.transport.TransportChannel; | ||
| import org.elasticsearch.transport.TransportRequest; | ||
| import org.elasticsearch.transport.TransportService; | ||
| import org.elasticsearch.transport.netty4.Netty4TcpChannel; | ||
| import org.elasticsearch.xpack.core.security.SecurityContext; | ||
| import org.elasticsearch.xpack.core.security.authc.Authentication; | ||
| import org.elasticsearch.xpack.core.security.user.SystemUser; | ||
| import org.elasticsearch.xpack.security.action.SecurityActionMapper; | ||
| import org.elasticsearch.xpack.security.authc.AuthenticationService; | ||
| import org.elasticsearch.xpack.security.authz.AuthorizationService; | ||
|
|
||
| /** | ||
| * The server transport filter that should be used in nodes as it ensures that an incoming | ||
| * request is properly authenticated and authorized | ||
| */ | ||
| public class DefaultServerTransportFilter implements ServerTransportFilter { | ||
|
|
||
| private static final Logger logger = LogManager.getLogger(DefaultServerTransportFilter.class); | ||
|
|
||
| private final AuthenticationService authcService; | ||
| private final AuthorizationService authzService; | ||
| private final ThreadContext threadContext; | ||
| private final boolean extractClientCert; | ||
| private final DestructiveOperations destructiveOperations; | ||
| private final SecurityContext securityContext; | ||
|
|
||
| public DefaultServerTransportFilter( | ||
| AuthenticationService authcService, | ||
| AuthorizationService authzService, | ||
| ThreadContext threadContext, | ||
| boolean extractClientCert, | ||
| DestructiveOperations destructiveOperations, | ||
| SecurityContext securityContext | ||
| ) { | ||
| this.authcService = authcService; | ||
| this.authzService = authzService; | ||
| this.threadContext = threadContext; | ||
| this.extractClientCert = extractClientCert; | ||
| this.destructiveOperations = destructiveOperations; | ||
| this.securityContext = securityContext; | ||
| } | ||
|
|
||
| @Override | ||
| public void inbound(String action, TransportRequest request, TransportChannel transportChannel, ActionListener<Void> listener) { | ||
| if (TransportCloseIndexAction.NAME.equals(action) | ||
| || OpenIndexAction.NAME.equals(action) | ||
| || TransportDeleteIndexAction.TYPE.name().equals(action)) { | ||
| IndicesRequest indicesRequest = (IndicesRequest) request; | ||
| try { | ||
| destructiveOperations.failDestructive(indicesRequest.indices()); | ||
| } catch (IllegalArgumentException e) { | ||
| listener.onFailure(e); | ||
| return; | ||
| } | ||
| } | ||
| /* | ||
| here we don't have a fallback user, as all incoming request are | ||
| expected to have a user attached (either in headers or in context) | ||
| We can make this assumption because in nodes we make sure all outgoing | ||
| requests from all the nodes are attached with a user (either a serialize | ||
| user an authentication token | ||
| */ | ||
| String securityAction = SecurityActionMapper.action(action, request); | ||
|
|
||
| TransportChannel unwrappedChannel = transportChannel; | ||
| if (unwrappedChannel instanceof TaskTransportChannel) { | ||
| unwrappedChannel = ((TaskTransportChannel) unwrappedChannel).getChannel(); | ||
| } | ||
|
|
||
| if (extractClientCert && (unwrappedChannel instanceof TcpTransportChannel)) { | ||
| TcpChannel tcpChannel = ((TcpTransportChannel) unwrappedChannel).getChannel(); | ||
| if (tcpChannel instanceof Netty4TcpChannel) { | ||
| if (tcpChannel.isOpen()) { | ||
| SSLEngineUtils.extractClientCertificates(logger, threadContext, tcpChannel); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| TransportVersion version = transportChannel.getVersion(); | ||
| authenticate(securityAction, request, listener.delegateFailureAndWrap((l, authentication) -> { | ||
| if (authentication != null) { | ||
| if (securityAction.equals(TransportService.HANDSHAKE_ACTION_NAME) | ||
| && SystemUser.is(authentication.getEffectiveSubject().getUser()) == false) { | ||
| securityContext.executeAsSystemUser(version, original -> { | ||
| final Authentication replaced = securityContext.getAuthentication(); | ||
| authzService.authorize(replaced, securityAction, request, l); | ||
| }); | ||
| } else { | ||
| authzService.authorize(authentication, securityAction, request, l); | ||
| } | ||
| } else { | ||
| l.onFailure(new IllegalStateException("no authentication present but auth is allowed")); | ||
| } | ||
| })); | ||
| } | ||
|
|
||
| protected void authenticate( | ||
| final String securityAction, | ||
| final TransportRequest request, | ||
| final ActionListener<Authentication> authenticationListener | ||
| ) { | ||
| authcService.authenticate(securityAction, request, true, authenticationListener); | ||
| } | ||
|
|
||
| protected final ThreadContext getThreadContext() { | ||
| return threadContext; | ||
| } | ||
|
|
||
| // Package private for testing | ||
| boolean isExtractClientCert() { | ||
| return extractClientCert; | ||
| } | ||
|
|
||
| } |
This file contains hidden or 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
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Returning
Optional<ServerTransportFilter>is more of a preference here. We could as well returnServerTransportFilterand annotate the method as@Nullable