Skip to content

Allow anonymous WS-Addressing replies without MessageID #1848

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
goutamadwant wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Allow anonymous WS-Addressing replies without MessageID #1848

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
7 changes: 6 additions & 1 deletion ...ng-ws-core/src/main/java/org/springframework/ws/soap/addressing/version/Addressing10.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,18 @@ public boolean hasRequiredProperties(MessageAddressingProperties map) {
if (map.getAction() == null) {
return false;
}
if (map.getReplyTo() != null || map.getFaultTo() != null) {
if (requiresMessageId(map.getReplyTo()) || requiresMessageId(map.getFaultTo())) {
return map.getMessageId() != null;
}
return true;

}

private boolean requiresMessageId(@Nullable EndpointReference endpointReference) {
return endpointReference != null && !hasAnonymousAddress(endpointReference)
&& !hasNoneAddress(endpointReference);
}

@Override
public boolean isToHeaderRequired() {
return false;
Expand Down
48 changes: 48 additions & 0 deletions ...test/java/org/springframework/ws/soap/addressing/server/AddressingInterceptor10Tests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,4 +65,52 @@ void testNoTo() throws Exception {
verify(this.strategyMock);
}

@Test
void testAnonymousReplyToWithoutMessageId() throws Exception {

SaajSoapMessage valid = loadSaajMessage(getTestPath() + "/request-anonymous-no-message-id.xml");
MessageContext context = new DefaultMessageContext(valid, new SaajSoapMessageFactory(this.messageFactory));
expect(this.strategyMock.isDuplicate(null)).andReturn(false);
replay(this.strategyMock);

boolean result = this.interceptor.handleRequest(context, null);

assertThat(result).isTrue();
assertThat(context.hasResponse()).isFalse();

verify(this.strategyMock);
}

@Test
void testNoReplyToWithoutMessageId() throws Exception {

SaajSoapMessage valid = loadSaajMessage(getTestPath() + "/request-no-reply-to-no-message-id.xml");
MessageContext context = new DefaultMessageContext(valid, new SaajSoapMessageFactory(this.messageFactory));
expect(this.strategyMock.isDuplicate(null)).andReturn(false);
replay(this.strategyMock);

boolean result = this.interceptor.handleRequest(context, null);

assertThat(result).isTrue();
assertThat(context.hasResponse()).isFalse();

verify(this.strategyMock);
}

@Test
void testNoneReplyToWithoutMessageId() throws Exception {

SaajSoapMessage valid = loadSaajMessage(getTestPath() + "/request-none-no-message-id.xml");
MessageContext context = new DefaultMessageContext(valid, new SaajSoapMessageFactory(this.messageFactory));
expect(this.strategyMock.isDuplicate(null)).andReturn(false);
replay(this.strategyMock);

boolean result = this.interceptor.handleRequest(context, null);

assertThat(result).isTrue();
assertThat(context.hasResponse()).isFalse();

verify(this.strategyMock);
}

}
15 changes: 15 additions & 0 deletions ...t/resources/org/springframework/ws/soap/addressing/10/request-anonymous-no-message-id.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<S:Envelope xmlns:S="http://www.w3.org/2003/05/soap-envelope"
xmlns:wsa="http://www.w3.org/2005/08/addressing">
<S:Header>
<wsa:ReplyTo>
<wsa:Address>http://www.w3.org/2005/08/addressing/anonymous</wsa:Address>
</wsa:ReplyTo>
<wsa:To>mailto:fabrikam@example.com</wsa:To>
<wsa:Action>http://example.com/fabrikam/mail/Delete</wsa:Action>
</S:Header>
<S:Body>
<f:Delete xmlns:f="http://example.com/fabrikam">
<maxCount>42</maxCount>
</f:Delete>
</S:Body>
</S:Envelope>
11 changes: 11 additions & 0 deletions ...resources/org/springframework/ws/soap/addressing/10/request-no-reply-to-no-message-id.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<S:Envelope xmlns:S="http://www.w3.org/2003/05/soap-envelope"
xmlns:wsa="http://www.w3.org/2005/08/addressing">
<S:Header>
<wsa:Action>http://example.com/fabrikam/mail/Delete</wsa:Action>
</S:Header>
<S:Body>
<f:Delete xmlns:f="http://example.com/fabrikam">
<f:maxCount>42</f:maxCount>
</f:Delete>
</S:Body>
</S:Envelope>
15 changes: 15 additions & 0 deletions ...c/test/resources/org/springframework/ws/soap/addressing/10/request-none-no-message-id.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<S:Envelope xmlns:S="http://www.w3.org/2003/05/soap-envelope"
xmlns:wsa="http://www.w3.org/2005/08/addressing">
<S:Header>
<wsa:ReplyTo>
<wsa:Address>http://www.w3.org/2005/08/addressing/none</wsa:Address>
</wsa:ReplyTo>
<wsa:To>mailto:fabrikam@example.com</wsa:To>
<wsa:Action>http://example.com/fabrikam/mail/Delete</wsa:Action>
</S:Header>
<S:Body>
<f:Delete xmlns:f="http://example.com/fabrikam">
<maxCount>42</maxCount>
</f:Delete>
</S:Body>
</S:Envelope>