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

Fix failing of requeue on rollback if auth endpoint gives 401 #2197

Merged
merged 1 commit into from
Jul 15, 2024
Merged

Fix failing of requeue on rollback if auth endpoint gives 401 #2197

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
4 changes: 2 additions & 2 deletions modules/core/src/main/java/org/apache/synapse/endpoints/OAuthConfiguredHTTPEndpoint.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ public void send(MessageContext synCtx) {
}

// Clone the original MessageContext and save it to do a retry after a token refresh
MessageContext cloneMessageContext = MessageHelper.cloneMessageContext(synCtx);
MessageCache.getInstance().addMessageContext(synCtx.getMessageID(), cloneMessageContext);
MessageContext clonedMessageContext = MessageHelper.cloneMessageContext(synCtx);
MessageCache.getInstance().addMessageContext(synCtx.getMessageID(), clonedMessageContext);

super.send(synCtx);

Expand Down
20 changes: 17 additions & 3 deletions ...les/core/src/main/java/org/apache/synapse/message/senders/blocking/BlockingMsgSender.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -475,9 +475,10 @@ public void send(EndpointDefinition endpointDefinition, MessageContext synapseIn

if (originalMC != null && OAuthUtils.retryOnOAuthFailure(httpEndpoint, synapseInMsgCtx,
synapseInMsgCtx)) {
MessageContext messageContext = httpEndpoint.retryCallWithNewToken(originalMC);
((Axis2MessageContext) synapseInMsgCtx).setAxis2MessageContext(
((Axis2MessageContext) messageContext).getAxis2MessageContext());
originalMC.getEnvelope().build();

resetMessageContext((Axis2MessageContext) synapseInMsgCtx, (Axis2MessageContext) originalMC);
httpEndpoint.retryCallWithNewToken(synapseInMsgCtx);
}
}

Expand All @@ -489,6 +490,19 @@ public void send(EndpointDefinition endpointDefinition, MessageContext synapseIn
}
}

private static void resetMessageContext(Axis2MessageContext synapseInMsgCtx, Axis2MessageContext originalMC) throws AxisFault {
// Replace envelope and headers with original envelope and headers before retrying
org.apache.axis2.context.MessageContext originalAxisMC =
originalMC.getAxis2MessageContext();

org.apache.axis2.context.MessageContext synapseInAxisMC =
synapseInMsgCtx.getAxis2MessageContext();

synapseInAxisMC.setEnvelope(originalAxisMC.getEnvelope());
synapseInAxisMC.setProperty(org.apache.axis2.context.MessageContext.TRANSPORT_HEADERS,
originalAxisMC.getProperty(org.apache.axis2.context.MessageContext.TRANSPORT_HEADERS));
}

private void sendRobust(org.apache.axis2.context.MessageContext axisOutMsgCtx,
Options clientOptions, AxisService anonymousService,
ServiceContext serviceCtx, MessageContext synapseInMsgCtx) throws AxisFault {
Expand Down
Loading