Skip to content

Commit 5d91560

Browse files
조현수(Hyunsoo Cho)/Platform Engineering팀/11STrstoyanchev
authored andcommitted
Avoid unescape for CONNECT and CONNECTED frames
See gh-27722
1 parent 7854dbb commit 5d91560

File tree

2 files changed

+23
-4
lines changed

2 files changed

+23
-4
lines changed

spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompDecoder.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ private Message<byte[]> decodeMessage(ByteBuffer byteBuffer, @Nullable MultiValu
143143
StompCommand stompCommand = StompCommand.valueOf(command);
144144
headerAccessor = StompHeaderAccessor.create(stompCommand);
145145
initHeaders(headerAccessor);
146-
readHeaders(byteBuffer, headerAccessor);
146+
readHeaders(stompCommand, byteBuffer, headerAccessor);
147147
payload = readPayload(byteBuffer, headerAccessor);
148148
}
149149
if (payload != null) {
@@ -215,7 +215,9 @@ private String readCommand(ByteBuffer byteBuffer) {
215215
return StreamUtils.copyToString(command, StandardCharsets.UTF_8);
216216
}
217217

218-
private void readHeaders(ByteBuffer byteBuffer, StompHeaderAccessor headerAccessor) {
218+
private void readHeaders(StompCommand stompCommand, ByteBuffer byteBuffer, StompHeaderAccessor headerAccessor) {
219+
boolean shouldUnescape = (stompCommand != StompCommand.CONNECT && stompCommand != StompCommand.STOMP
220+
&& stompCommand != StompCommand.CONNECTED);
219221
while (true) {
220222
ByteArrayOutputStream headerStream = new ByteArrayOutputStream(256);
221223
boolean headerComplete = false;
@@ -236,8 +238,8 @@ private void readHeaders(ByteBuffer byteBuffer, StompHeaderAccessor headerAccess
236238
}
237239
}
238240
else {
239-
String headerName = unescape(header.substring(0, colonIndex));
240-
String headerValue = unescape(header.substring(colonIndex + 1));
241+
String headerName = shouldUnescape ? unescape(header.substring(0, colonIndex)) : header.substring(0, colonIndex);
242+
String headerValue = shouldUnescape ? unescape(header.substring(colonIndex + 1)) : header.substring(colonIndex + 1);
241243
try {
242244
headerAccessor.addNativeHeader(headerName, headerValue);
243245
}

spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/StompDecoderTests.java

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,23 @@ public void decodeFrameWithEscapedHeaders() {
159159
assertThat(headers.getFirstNativeHeader("a:\r\n\\b")).isEqualTo("alpha:bravo\r\n\\");
160160
}
161161

162+
@Test
163+
public void decodeFrameWithHeaderWithBackslashValue() {
164+
String accept = "accept-version:1.1\n";
165+
String keyAndValueWithBackslash = "key:\\value\n";
166+
167+
Message<byte[]> frame = decode("CONNECT\n" + accept + keyAndValueWithBackslash + "\n\0");
168+
StompHeaderAccessor headers = StompHeaderAccessor.wrap(frame);
169+
170+
assertThat(headers.getCommand()).isEqualTo(StompCommand.CONNECT);
171+
172+
assertThat(headers.toNativeHeaderMap().size()).isEqualTo(2);
173+
assertThat(headers.getFirstNativeHeader("accept-version")).isEqualTo("1.1");
174+
assertThat(headers.getFirstNativeHeader("key")).isEqualTo("\\value");
175+
176+
assertThat(frame.getPayload().length).isEqualTo(0);
177+
}
178+
162179
@Test
163180
public void decodeFrameBodyNotAllowed() {
164181
assertThatExceptionOfType(StompConversionException.class).isThrownBy(() ->

0 commit comments

Comments
 (0)