Skip to content
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

Jump to bottom

Remove unnecessary stashContext usage in AbstractApiAction #4668

Closed
wants to merge 2 commits into from
Closed

Remove unnecessary stashContext usage in AbstractApiAction #4668

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9d7938b
Remove stashContext within AbstractApiAction
cwperks Aug 21, 2024
dbc0dd9
Keep exception block
cwperks Aug 21, 2024
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
11 changes: 1 addition & 10 deletions src/main/java/org/opensearch/security/dlic/rest/api/AbstractApiAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@
import org.opensearch.cluster.service.ClusterService;
import org.opensearch.common.CheckedSupplier;
import org.opensearch.common.action.ActionFuture;
import org.opensearch.common.util.concurrent.ThreadContext.StoredContext;
import org.opensearch.common.xcontent.XContentType;
import org.opensearch.core.action.ActionListener;
import org.opensearch.core.common.Strings;
Expand Down Expand Up @@ -602,17 +601,9 @@ protected final RestChannelConsumer prepareRequest(RestRequest request, NodeClie
securityApiDependencies.auditLog().logGrantedPrivileges(userName, SecurityRequestFactory.from(request));
}

final var originalUserAndRemoteAddress = Utils.userAndRemoteAddressFrom(threadPool.getThreadContext());
final Object originalOrigin = threadPool.getThreadContext().getTransient(ConfigConstants.OPENDISTRO_SECURITY_ORIGIN);

return channel -> threadPool.generic().submit(() -> {
try (StoredContext ignore = threadPool.getThreadContext().stashContext()) {
try {
threadPool.getThreadContext().putHeader(ConfigConstants.OPENDISTRO_SECURITY_CONF_REQUEST_HEADER, "true");
threadPool.getThreadContext()
.putTransient(ConfigConstants.OPENDISTRO_SECURITY_USER, originalUserAndRemoteAddress.getLeft());
threadPool.getThreadContext()
.putTransient(ConfigConstants.OPENDISTRO_SECURITY_REMOTE_ADDRESS, originalUserAndRemoteAddress.getRight());
threadPool.getThreadContext().putTransient(ConfigConstants.OPENDISTRO_SECURITY_ORIGIN, originalOrigin);

requestHandlers = Optional.ofNullable(requestHandlers).orElseGet(requestHandlersBuilder::build);
final var requestHandler = requestHandlers.getOrDefault(request.method(), methodNotImplementedHandler);
Expand Down
Loading