Skip to content

Reset ThreadIdentity for SyncToOSThread in EJB After Each Invocation #33620

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

Closed
wrodrig wants to merge 1 commit into from
+14 −5
Closed

Reset ThreadIdentity for SyncToOSThread in EJB After Each Invocation #33620

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
8 changes: 4 additions & 4 deletions ...r.security/src/com/ibm/ws/ejbcontainer/security/internal/EJBSecurityCollaboratorImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,7 @@ public SecurityCookieImpl preInvoke(EJBRequestData request) throws EJBAccessDeni
EJBSecurityContext ejbSecurityContext = new EJBSecurityContext(subjectManager.getInvocationSubject(), subjectManager.getCallerSubject());
syncToOSThread(ejbSecurityContext);
SecurityCookieImpl securityCookie = new SecurityCookieImpl(originalInvokedSubject, originalCallerSubject, subjectManager.getInvocationSubject(), subjectToAuthorize);
securityCookie.setSyncToOSThreadToken(ejbSecurityContext.getSyncToOSThreadToken());
return securityCookie;
}

Expand Down Expand Up @@ -262,8 +263,7 @@ public void postInvoke(EJBRequestData request, SecurityCookieImpl preInvokeResul
}
}
try {
EJBSecurityContext ejbSecurityContext = new EJBSecurityContext(subjectManager.getInvocationSubject(), subjectManager.getCallerSubject());
resetSyncToOSThread(ejbSecurityContext);
resetSyncToOSThread(securityCookie);

} catch (ThreadIdentityException e) {
throw new EJBAccessDeniedException(TraceNLS.getFormattedMessage(this.getClass(),
Expand Down Expand Up @@ -840,8 +840,8 @@ private void syncToOSThread(EJBSecurityContext ejbSecurityContext) throws EJBAcc
* MUST NOT BE NULL.
* @throws ThreadIdentityException
*/
private void resetSyncToOSThread(EJBSecurityContext ejbSecurityContext) throws ThreadIdentityException {
Object token = ejbSecurityContext.getSyncToOSThreadToken();
private void resetSyncToOSThread(SecurityCookieImpl securityCookie) throws ThreadIdentityException {
Object token = securityCookie.getSyncToOSThreadToken();
if (token != null) {
if (TraceComponent.isAnyTracingEnabled() && tc.isDebugEnabled()) {
Tr.debug(tc, "Resetting thread identity for EJB application");
Expand Down
11 changes: 10 additions & 1 deletion ...bcontainer.security/src/com/ibm/ws/ejbcontainer/security/internal/SecurityCookieImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2012 IBM Corporation and others.
* Copyright (c) 2012, 2025 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
Expand All @@ -22,6 +22,7 @@ public class SecurityCookieImpl {
private final Subject receivedSubject;
private final Subject adjustedInvokedSubject;
private final Subject adjustedReceivedSubject;
private Object syncToOSThreadToken;

SecurityCookieImpl(Subject invokedSubject, Subject receivedSubject) {
this.invokedSubject = this.adjustedInvokedSubject =invokedSubject;
Expand Down Expand Up @@ -50,4 +51,12 @@ public Subject getAdjustedInvokedSubject() {
public Subject getAdjustedReceivedSubject() {
return adjustedReceivedSubject;
}

public Object getSyncToOSThreadToken() {
return syncToOSThreadToken;
}

public void setSyncToOSThreadToken(Object token) {
this.syncToOSThreadToken = token;
}
}