Skip to content

Flatten stacks in ServerTransportFilter via promise pattern #124379

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+43 −28
Open

Flatten stacks in ServerTransportFilter via promise pattern #124379

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 8 additions & 9 deletions ...a/org/elasticsearch/xpack/security/transport/CrossClusterAccessServerTransportFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import org.apache.logging.log4j.Logger;
import org.elasticsearch.action.ActionListener;
import org.elasticsearch.action.support.DestructiveOperations;
import org.elasticsearch.common.util.concurrent.ListenableFuture;
import org.elasticsearch.common.util.concurrent.ThreadContext;
import org.elasticsearch.license.LicenseUtils;
import org.elasticsearch.license.XPackLicenseState;
Expand Down Expand Up @@ -71,27 +72,25 @@ final class CrossClusterAccessServerTransportFilter extends ServerTransportFilte
}

@Override
protected void authenticate(
final String securityAction,
final TransportRequest request,
final ActionListener<Authentication> authenticationListener
) {
protected ListenableFuture<Authentication> authenticate(final String securityAction, final TransportRequest request) {
final ListenableFuture<Authentication> listener = new ListenableFuture<>();
if (false == Security.ADVANCED_REMOTE_CLUSTER_SECURITY_FEATURE.check(licenseState)) {
onFailureWithDebugLog(
securityAction,
request,
authenticationListener,
listener,
LicenseUtils.newComplianceException(Security.ADVANCED_REMOTE_CLUSTER_SECURITY_FEATURE.getName())
);
} else {
try {
validateHeaders();
} catch (Exception ex) {
onFailureWithDebugLog(securityAction, request, authenticationListener, ex);
return;
onFailureWithDebugLog(securityAction, request, listener, ex);
return listener;
}
crossClusterAccessAuthcService.authenticate(securityAction, request, authenticationListener);
crossClusterAccessAuthcService.authenticate(securityAction, request, listener);
}
return listener;
}

private void validateHeaders() {
Expand Down
54 changes: 35 additions & 19 deletions ...urity/src/main/java/org/elasticsearch/xpack/security/transport/ServerTransportFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
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.ListenableFuture;
import org.elasticsearch.common.util.concurrent.ThreadContext;
import org.elasticsearch.transport.TaskTransportChannel;
import org.elasticsearch.transport.TcpChannel;
Expand Down Expand Up @@ -102,29 +103,44 @@ requests from all the nodes are attached with a user (either a serialize
}

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);
}
var authFuture = authenticate(securityAction, request);
if (authFuture.isSuccess()) {
handleAuthentication(request, listener, authFuture.result(), securityAction, version);
} else {
authFuture.addListener(
listener.delegateFailureAndWrap(
(l, authentication) -> handleAuthentication(request, l, authentication, securityAction, version)
)
);
}
}

private void handleAuthentication(
TransportRequest request,
ActionListener<Void> listener,
Authentication authentication,
String securityAction,
TransportVersion version
) {
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, listener);
});
} else {
l.onFailure(new IllegalStateException("no authentication present but auth is allowed"));
authzService.authorize(authentication, securityAction, request, listener);
}
}));
} else {
listener.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 ListenableFuture<Authentication> authenticate(final String securityAction, final TransportRequest request) {
final ListenableFuture<Authentication> listener = new ListenableFuture<>();
authcService.authenticate(securityAction, request, true, listener);
return listener;
}

protected final ThreadContext getThreadContext() {
Expand Down