root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

StompSubProtocolHandler consistently accesses current user 

Issue: SPR-15822
This commit is contained in:
Juergen Hoeller 2017-07-27 11:32:32 +02:00
parent f3975776d4
commit 25e6a2da64
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
spring-websocket/src/main/java/org/springframework/web/socket/messaging/StompSubProtocolHandler.java
View File

@ -258,12 +258,7 @@ public class StompSubProtocolHandler implements SubProtocolHandler, ApplicationE
headerAccessor.setSessionId(session.getId()); headerAccessor.setSessionId(session.getId());
headerAccessor.setSessionAttributes(session.getAttributes()); headerAccessor.setSessionAttributes(session.getAttributes());
headerAccessor.setUser(getUser(session));
Principal user = getUser(session);
if (user != null) {
headerAccessor.setUser(user);
}
headerAccessor.setHeader(SimpMessageHeaderAccessor.HEART_BEAT_HEADER, headerAccessor.getHeartbeat()); headerAccessor.setHeader(SimpMessageHeaderAccessor.HEART_BEAT_HEADER, headerAccessor.getHeartbeat());
if (!detectImmutableMessageInterceptor(outputChannel)) { if (!detectImmutableMessageInterceptor(outputChannel)) {
headerAccessor.setImmutable(); headerAccessor.setImmutable();
@ -287,11 +282,13 @@ public class StompSubProtocolHandler implements SubProtocolHandler, ApplicationE
if (sent) { if (sent) {
if (isConnect) { if (isConnect) {
Principal user = headerAccessor.getUser();
if (user != null && user != session.getPrincipal()) { if (user != null && user != session.getPrincipal()) {
this.stompAuthentications.put(session.getId(), user); this.stompAuthentications.put(session.getId(), user);
} }
} }
if (this.eventPublisher != null) { if (this.eventPublisher != null) {
Principal user = getUser(session);
if (isConnect) { if (isConnect) {
publishEvent(this.eventPublisher, new SessionConnectEvent(this, message, user)); publishEvent(this.eventPublisher, new SessionConnectEvent(this, message, user));
} }