Skip to content

Set host header consistently in STOMP relay CONNECT frames #36673

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
tianhaocui wants to merge 1 commit into from
+2 −7
Closed

Set host header consistently in STOMP relay CONNECT frames #36673

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
9 changes: 2 additions & 7 deletions ...rc/main/java/org/springframework/messaging/simp/stomp/StompBrokerRelayMessageHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -456,10 +456,7 @@ protected void startInternal() {
accessor.setLogin(this.systemLogin);
accessor.setPasscode(this.systemPasscode);
accessor.setHeartbeat(this.systemHeartbeatSendInterval, this.systemHeartbeatReceiveInterval);
String virtualHost = getVirtualHost();
if (virtualHost != null) {
accessor.setHost(virtualHost);
}
accessor.setHost(getVirtualHost() != null ? getVirtualHost() : getRelayHost());
accessor.setSessionId(SYSTEM_SESSION_ID);
if (logger.isDebugEnabled()) {
logger.debug("Forwarding " + accessor.getShortLogMessage(EMPTY_PAYLOAD));
Expand Down Expand Up @@ -582,9 +579,7 @@ else if (accessor instanceof SimpMessageHeaderAccessor) {
stompHeaderAccessor = (stompHeaderAccessor.isMutable() ? stompHeaderAccessor : StompHeaderAccessor.wrap(message));
stompHeaderAccessor.setLogin(this.clientLogin);
stompHeaderAccessor.setPasscode(this.clientPasscode);
if (getVirtualHost() != null) {
stompHeaderAccessor.setHost(getVirtualHost());
}
stompHeaderAccessor.setHost(getVirtualHost() != null ? getVirtualHost() : getRelayHost());
RelayConnectionHandler handler = new RelayConnectionHandler(sessionId, stompHeaderAccessor);
this.connectionHandlers.put(sessionId, handler);
this.stats.incrementConnectCount();
Expand Down