SEC-2864: Default Spring Security WebSocket PathMatcher XML Namespace
This commit is contained in:
Rob Winch
parent
db531d9100
commit
7b25b3e40d
|
|
@ -38,11 +38,14 @@ import org.springframework.security.messaging.util.matcher.SimpMessageTypeMatche
|
|||
import org.springframework.security.messaging.web.csrf.CsrfChannelInterceptor;
|
||||
import org.springframework.security.messaging.web.socket.server.CsrfTokenHandshakeInterceptor;
|
||||
import org.springframework.util.AntPathMatcher;
|
||||
import org.springframework.util.PathMatcher;
|
||||
import org.springframework.util.StringUtils;
|
||||
import org.springframework.util.xml.DomUtils;
|
||||
import org.w3c.dom.Element;
|
||||
|
||||
import java.util.Comparator;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* Parses Spring Security's websocket namespace support. A simple example is:
|
||||
|
|
@ -84,9 +87,6 @@ import java.util.List;
|
|||
*/
|
||||
public final class WebSocketMessageBrokerSecurityBeanDefinitionParser implements
|
||||
BeanDefinitionParser {
|
||||
private static final Log logger = LogFactory
|
||||
.getLog(WebSocketMessageBrokerSecurityBeanDefinitionParser.class);
|
||||
|
||||
private static final String ID_ATTR = "id";
|
||||
|
||||
private static final String DISABLED_ATTR = "same-origin-disabled";
|
||||
|
|
@ -97,6 +97,8 @@ public final class WebSocketMessageBrokerSecurityBeanDefinitionParser implements
|
|||
|
||||
private static final String TYPE_ATTR = "type";
|
||||
|
||||
private static final String PATH_MATCHER_BEAN_NAME = "springSecurityMessagePathMatcher";
|
||||
|
||||
/**
|
||||
* @param element
|
||||
* @param parserContext
|
||||
|
|
@ -149,6 +151,10 @@ public final class WebSocketMessageBrokerSecurityBeanDefinitionParser implements
|
|||
|
||||
if (StringUtils.hasText(id)) {
|
||||
registry.registerAlias(inSecurityInterceptorName, id);
|
||||
|
||||
if(!registry.containsBeanDefinition(PATH_MATCHER_BEAN_NAME)) {
|
||||
registry.registerBeanDefinition(PATH_MATCHER_BEAN_NAME, new RootBeanDefinition(AntPathMatcher.class));
|
||||
}
|
||||
}
|
||||
else {
|
||||
BeanDefinitionBuilder mspp = BeanDefinitionBuilder
|
||||
|
|
@ -190,16 +196,18 @@ public final class WebSocketMessageBrokerSecurityBeanDefinitionParser implements
|
|||
interceptMessage);
|
||||
}
|
||||
}
|
||||
|
||||
BeanDefinitionBuilder matcher = BeanDefinitionBuilder
|
||||
.rootBeanDefinition(SimpDestinationMessageMatcher.class);
|
||||
matcher.setFactoryMethod(factoryName);
|
||||
matcher.addConstructorArgValue(matcherPattern);
|
||||
matcher.addConstructorArgValue(new RootBeanDefinition(AntPathMatcher.class));
|
||||
matcher.addConstructorArgValue(new RuntimeBeanReference("springSecurityMessagePathMatcher"));
|
||||
return matcher.getBeanDefinition();
|
||||
}
|
||||
|
||||
static class MessageSecurityPostProcessor implements
|
||||
BeanDefinitionRegistryPostProcessor {
|
||||
|
||||
private static final String CLIENT_INBOUND_CHANNEL_BEAN_ID = "clientInboundChannel";
|
||||
|
||||
private static final String INTERCEPTORS_PROP = "interceptors";
|
||||
|
|
@ -233,6 +241,14 @@ public final class WebSocketMessageBrokerSecurityBeanDefinitionParser implements
|
|||
argResolvers.add(new RootBeanDefinition(
|
||||
AuthenticationPrincipalArgumentResolver.class));
|
||||
bd.getPropertyValues().add(CUSTOM_ARG_RESOLVERS_PROP, argResolvers);
|
||||
|
||||
if(!registry.containsBeanDefinition(PATH_MATCHER_BEAN_NAME)) {
|
||||
PropertyValue pathMatcherProp = bd.getPropertyValues().getPropertyValue("pathMatcher");
|
||||
Object pathMatcher = pathMatcherProp == null ? null : pathMatcherProp.getValue();
|
||||
if(pathMatcher instanceof BeanReference) {
|
||||
registry.registerAlias(((BeanReference) pathMatcher).getBeanName(), PATH_MATCHER_BEAN_NAME);
|
||||
}
|
||||
}
|
||||
}
|
||||
else if (beanClassName
|
||||
.equals("org.springframework.web.socket.server.support.WebSocketHttpRequestHandler")) {
|
||||
|
|
@ -270,6 +286,10 @@ public final class WebSocketMessageBrokerSecurityBeanDefinitionParser implements
|
|||
}
|
||||
|
||||
inboundChannel.getPropertyValues().add(INTERCEPTORS_PROP, interceptors);
|
||||
|
||||
if(!registry.containsBeanDefinition(PATH_MATCHER_BEAN_NAME)) {
|
||||
registry.registerBeanDefinition(PATH_MATCHER_BEAN_NAME, new RootBeanDefinition(AntPathMatcher.class));
|
||||
}
|
||||
}
|
||||
|
||||
private void addCsrfTokenHandshakeInterceptor(BeanDefinition bd) {
|
||||
|
|
@ -289,4 +309,41 @@ public final class WebSocketMessageBrokerSecurityBeanDefinitionParser implements
|
|||
|
||||
}
|
||||
}
|
||||
|
||||
static class DelegatingPathMatcher implements PathMatcher {
|
||||
|
||||
private PathMatcher delegate = new AntPathMatcher();
|
||||
|
||||
public boolean isPattern(String path) {
|
||||
return delegate.isPattern(path);
|
||||
}
|
||||
|
||||
public boolean match(String pattern, String path) {
|
||||
return delegate.match(pattern, path);
|
||||
}
|
||||
|
||||
public boolean matchStart(String pattern, String path) {
|
||||
return delegate.matchStart(pattern, path);
|
||||
}
|
||||
|
||||
public String extractPathWithinPattern(String pattern, String path) {
|
||||
return delegate.extractPathWithinPattern(pattern, path);
|
||||
}
|
||||
|
||||
public Map<String, String> extractUriTemplateVariables(String pattern, String path) {
|
||||
return delegate.extractUriTemplateVariables(pattern, path);
|
||||
}
|
||||
|
||||
public Comparator<String> getPatternComparator(String path) {
|
||||
return delegate.getPatternComparator(path);
|
||||
}
|
||||
|
||||
public String combine(String pattern1, String pattern2) {
|
||||
return delegate.combine(pattern1, pattern2);
|
||||
}
|
||||
|
||||
void setPathMatcher(PathMatcher pathMatcher) {
|
||||
this.delegate = pathMatcher;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,5 +1,7 @@
|
|||
package org.springframework.security.config.websocket
|
||||
|
||||
import static org.mockito.Mockito.*
|
||||
|
||||
import org.springframework.beans.BeansException
|
||||
import org.springframework.beans.factory.config.BeanDefinition
|
||||
import org.springframework.beans.factory.config.ConfigurableListableBeanFactory
|
||||
|
|
@ -11,21 +13,29 @@ import org.springframework.core.MethodParameter
|
|||
import org.springframework.core.task.SyncTaskExecutor
|
||||
import org.springframework.http.server.ServerHttpRequest
|
||||
import org.springframework.http.server.ServerHttpResponse
|
||||
import org.springframework.messaging.Message
|
||||
import org.springframework.messaging.MessageDeliveryException
|
||||
import org.springframework.messaging.handler.annotation.MessageMapping
|
||||
import org.springframework.messaging.handler.invocation.HandlerMethodArgumentResolver
|
||||
import org.springframework.messaging.simp.SimpMessageHeaderAccessor
|
||||
import org.springframework.messaging.simp.SimpMessageType
|
||||
import org.springframework.messaging.simp.annotation.support.SimpAnnotationMethodMessageHandler
|
||||
import org.springframework.messaging.support.ChannelInterceptor
|
||||
import org.springframework.messaging.support.GenericMessage
|
||||
import org.springframework.mock.web.MockHttpServletRequest
|
||||
import org.springframework.mock.web.MockHttpServletResponse
|
||||
import org.springframework.security.access.AccessDeniedException
|
||||
import org.springframework.security.authentication.TestingAuthenticationToken
|
||||
import org.springframework.security.config.AbstractXmlConfigTests
|
||||
import org.springframework.security.core.Authentication
|
||||
import org.springframework.security.core.annotation.AuthenticationPrincipal
|
||||
import org.springframework.security.messaging.util.matcher.SimpMessageTypeMatcher
|
||||
import org.springframework.security.core.context.SecurityContextHolder
|
||||
import org.springframework.security.web.csrf.CsrfToken
|
||||
import org.springframework.security.web.csrf.DefaultCsrfToken
|
||||
import org.springframework.security.web.csrf.InvalidCsrfTokenException
|
||||
import org.springframework.security.web.csrf.MissingCsrfTokenException
|
||||
import org.springframework.stereotype.Controller
|
||||
import org.springframework.util.AntPathMatcher
|
||||
import org.springframework.web.servlet.HandlerMapping
|
||||
import org.springframework.web.servlet.handler.SimpleUrlHandlerMapping
|
||||
import org.springframework.web.socket.WebSocketHandler
|
||||
import org.springframework.web.socket.server.HandshakeFailureException
|
||||
import org.springframework.web.socket.server.HandshakeHandler
|
||||
|
|
@ -33,459 +43,479 @@ import org.springframework.web.socket.server.support.HttpSessionHandshakeInterce
|
|||
import org.springframework.web.socket.server.support.WebSocketHttpRequestHandler
|
||||
import org.springframework.web.socket.sockjs.support.SockJsHttpRequestHandler
|
||||
import org.springframework.web.socket.sockjs.transport.handler.SockJsWebSocketHandler
|
||||
|
||||
import spock.lang.Unroll
|
||||
|
||||
import static org.mockito.Mockito.*
|
||||
|
||||
import org.springframework.messaging.Message
|
||||
import org.springframework.messaging.MessageDeliveryException
|
||||
import org.springframework.messaging.simp.SimpMessageHeaderAccessor
|
||||
import org.springframework.messaging.support.ChannelInterceptor
|
||||
import org.springframework.messaging.support.GenericMessage
|
||||
import org.springframework.security.access.AccessDeniedException
|
||||
import org.springframework.security.authentication.TestingAuthenticationToken
|
||||
import org.springframework.security.config.AbstractXmlConfigTests
|
||||
import org.springframework.security.core.context.SecurityContextHolder
|
||||
|
||||
/**
|
||||
*
|
||||
* @author Rob Winch
|
||||
*/
|
||||
class WebSocketMessageBrokerConfigTests extends AbstractXmlConfigTests {
|
||||
Authentication messageUser = new TestingAuthenticationToken('user','pass','ROLE_USER')
|
||||
boolean useSockJS = false
|
||||
CsrfToken csrfToken = new DefaultCsrfToken('headerName', 'paramName', 'token')
|
||||
|
||||
def cleanup() {
|
||||
SecurityContextHolder.clearContext()
|
||||
}
|
||||
|
||||
def 'websocket with no id automatically integrates with clientInboundChannel'() {
|
||||
setup:
|
||||
websocket {
|
||||
'intercept-message'(pattern:'/permitAll',access:'permitAll')
|
||||
'intercept-message'(pattern:'/denyAll',access:'denyAll')
|
||||
}
|
||||
|
||||
|
||||
when: 'message is sent to the denyAll endpoint'
|
||||
clientInboundChannel.send(message('/denyAll'))
|
||||
|
||||
then: 'access is denied to the denyAll endpoint'
|
||||
def e = thrown(MessageDeliveryException)
|
||||
e.cause instanceof AccessDeniedException
|
||||
|
||||
and: 'access is granted to the permitAll endpoint'
|
||||
clientInboundChannel.send(message('/permitAll'))
|
||||
}
|
||||
|
||||
def 'anonymous authentication supported'() {
|
||||
setup:
|
||||
websocket {
|
||||
'intercept-message'(pattern:'/permitAll',access:'permitAll')
|
||||
'intercept-message'(pattern:'/denyAll',access:'denyAll')
|
||||
}
|
||||
messageUser = null
|
||||
|
||||
when: 'message is sent to the permitAll endpoint with no user'
|
||||
clientInboundChannel.send(message('/permitAll'))
|
||||
|
||||
then: 'access is granted'
|
||||
noExceptionThrown()
|
||||
}
|
||||
|
||||
@Unroll
|
||||
def "message type - #type"(SimpMessageType type) {
|
||||
setup:
|
||||
websocket {
|
||||
'intercept-message'('type': type.toString(), access:'permitAll')
|
||||
'intercept-message'(pattern:'/**', access:'denyAll')
|
||||
}
|
||||
messageUser = null
|
||||
SimpMessageHeaderAccessor headers = SimpMessageHeaderAccessor.create(type)
|
||||
if(SimpMessageType.CONNECT == type) {
|
||||
headers.setNativeHeader(csrfToken.headerName, csrfToken.token)
|
||||
}
|
||||
Message message = message(headers, '/permitAll')
|
||||
|
||||
when: 'message is sent to the permitAll endpoint with no user'
|
||||
clientInboundChannel.send(message)
|
||||
|
||||
then: 'access is granted'
|
||||
noExceptionThrown()
|
||||
|
||||
where:
|
||||
type << SimpMessageType.values()
|
||||
}
|
||||
|
||||
@Unroll
|
||||
def "pattern and message type - #type"(SimpMessageType type) {
|
||||
setup:
|
||||
websocket {
|
||||
'intercept-message'(pattern: '/permitAll', 'type': type.toString(), access:'permitAll')
|
||||
'intercept-message'(pattern:'/**', access:'denyAll')
|
||||
}
|
||||
|
||||
when: 'message is sent to the permitAll endpoint with no user'
|
||||
clientInboundChannel.send(message('/permitAll', type))
|
||||
|
||||
then: 'access is granted'
|
||||
noExceptionThrown()
|
||||
|
||||
when: 'message sent to other message type'
|
||||
clientInboundChannel.send(message('/permitAll', SimpMessageType.UNSUBSCRIBE))
|
||||
|
||||
then: 'does not match'
|
||||
MessageDeliveryException e = thrown()
|
||||
e.cause instanceof AccessDeniedException
|
||||
|
||||
when: 'message is sent to other pattern'
|
||||
clientInboundChannel.send(message('/other', type))
|
||||
|
||||
then: 'does not match'
|
||||
MessageDeliveryException eOther = thrown()
|
||||
eOther.cause instanceof AccessDeniedException
|
||||
|
||||
where:
|
||||
type << [SimpMessageType.MESSAGE, SimpMessageType.SUBSCRIBE]
|
||||
}
|
||||
|
||||
@Unroll
|
||||
def "intercept-message with invalid type and pattern - #type"(SimpMessageType type) {
|
||||
when:
|
||||
websocket {
|
||||
'intercept-message'(pattern : '/**', 'type': type.toString(), access:'permitAll')
|
||||
}
|
||||
then:
|
||||
thrown(BeanDefinitionParsingException)
|
||||
|
||||
where:
|
||||
type << [SimpMessageType.CONNECT, SimpMessageType.CONNECT_ACK, SimpMessageType.DISCONNECT, SimpMessageType.DISCONNECT_ACK, SimpMessageType.HEARTBEAT, SimpMessageType.OTHER, SimpMessageType.UNSUBSCRIBE ]
|
||||
}
|
||||
|
||||
def 'messages with no id automatically adds Authentication argument resolver'() {
|
||||
setup:
|
||||
def id = 'authenticationController'
|
||||
bean(id,MyController)
|
||||
bean('inPostProcessor',InboundExecutorPostProcessor)
|
||||
websocket {
|
||||
'intercept-message'(pattern:'/**',access:'permitAll')
|
||||
}
|
||||
|
||||
when: 'message is sent to the authentication endpoint'
|
||||
clientInboundChannel.send(message('/authentication'))
|
||||
|
||||
then: 'the AuthenticationPrincipal is resolved'
|
||||
def controller = appContext.getBean(id)
|
||||
controller.authenticationPrincipal == messageUser.name
|
||||
}
|
||||
|
||||
def 'messages of type CONNECT use CsrfTokenHandshakeInterceptor'() {
|
||||
setup:
|
||||
def id = 'authenticationController'
|
||||
bean(id,MyController)
|
||||
bean('inPostProcessor',InboundExecutorPostProcessor)
|
||||
websocket {
|
||||
'intercept-message'(pattern:'/**',access:'permitAll')
|
||||
}
|
||||
|
||||
SimpMessageHeaderAccessor headers = SimpMessageHeaderAccessor.create(SimpMessageType.CONNECT)
|
||||
Message<?> message = message(headers,'/authentication')
|
||||
WebSocketHttpRequestHandler handler = appContext.getBean(WebSocketHttpRequestHandler)
|
||||
MockHttpServletRequest request = new MockHttpServletRequest()
|
||||
String sessionAttr = "sessionAttr"
|
||||
request.getSession().setAttribute(sessionAttr,"sessionValue")
|
||||
|
||||
CsrfToken token = new DefaultCsrfToken("header", "param", "token")
|
||||
request.setAttribute(CsrfToken.name, token)
|
||||
|
||||
when:
|
||||
handler.handleRequest(request , new MockHttpServletResponse())
|
||||
TestHandshakeHandler handshakeHandler = appContext.getBean(TestHandshakeHandler)
|
||||
|
||||
then: 'CsrfToken is populated'
|
||||
handshakeHandler.attributes.get(CsrfToken.name) == token
|
||||
|
||||
and: 'Explicitly listed HandshakeInterceptor are not overridden'
|
||||
handshakeHandler.attributes.get(sessionAttr) == request.getSession().getAttribute(sessionAttr)
|
||||
}
|
||||
|
||||
def 'messages of type CONNECT use CsrfTokenHandshakeInterceptor with SockJS'() {
|
||||
setup:
|
||||
useSockJS = true
|
||||
def id = 'authenticationController'
|
||||
bean(id,MyController)
|
||||
bean('inPostProcessor',InboundExecutorPostProcessor)
|
||||
websocket {
|
||||
'intercept-message'(pattern:'/**',access:'permitAll')
|
||||
}
|
||||
|
||||
SimpMessageHeaderAccessor headers = SimpMessageHeaderAccessor.create(SimpMessageType.CONNECT)
|
||||
Message<?> message = message(headers,'/authentication')
|
||||
SockJsHttpRequestHandler handler = appContext.getBean(SockJsHttpRequestHandler)
|
||||
MockHttpServletRequest request = new MockHttpServletRequest()
|
||||
String sessionAttr = "sessionAttr"
|
||||
request.getSession().setAttribute(sessionAttr,"sessionValue")
|
||||
|
||||
CsrfToken token = new DefaultCsrfToken("header", "param", "token")
|
||||
request.setAttribute(CsrfToken.name, token)
|
||||
|
||||
request.setMethod("GET")
|
||||
request.setAttribute(HandlerMapping.PATH_WITHIN_HANDLER_MAPPING_ATTRIBUTE, "/289/tpyx6mde/websocket")
|
||||
|
||||
when:
|
||||
handler.handleRequest(request , new MockHttpServletResponse())
|
||||
TestHandshakeHandler handshakeHandler = appContext.getBean(TestHandshakeHandler)
|
||||
|
||||
then: 'CsrfToken is populated'
|
||||
handshakeHandler.attributes?.get(CsrfToken.name) == token
|
||||
|
||||
and: 'Explicitly listed HandshakeInterceptor are not overridden'
|
||||
handshakeHandler.attributes?.get(sessionAttr) == request.getSession().getAttribute(sessionAttr)
|
||||
}
|
||||
|
||||
def 'messages of type CONNECT require valid CsrfToken'() {
|
||||
setup:
|
||||
def id = 'authenticationController'
|
||||
bean(id,MyController)
|
||||
bean('inPostProcessor',InboundExecutorPostProcessor)
|
||||
websocket {
|
||||
'intercept-message'(pattern:'/**',access:'permitAll')
|
||||
}
|
||||
|
||||
when: 'websocket of type CONNECTION is sent without CsrfTOken'
|
||||
SimpMessageHeaderAccessor headers = SimpMessageHeaderAccessor.create(SimpMessageType.CONNECT)
|
||||
Message<?> message = message(headers,'/authentication')
|
||||
clientInboundChannel.send(message)
|
||||
|
||||
then: 'CSRF Protection blocks the Message'
|
||||
MessageDeliveryException expected = thrown()
|
||||
expected.cause instanceof InvalidCsrfTokenException
|
||||
}
|
||||
|
||||
def 'messages of type CONNECT disabled valid CsrfToken'() {
|
||||
setup:
|
||||
def id = 'authenticationController'
|
||||
bean(id,MyController)
|
||||
bean('inPostProcessor',InboundExecutorPostProcessor)
|
||||
websocket('same-origin-disabled':true) {
|
||||
'intercept-message'(pattern:'/**',access:'permitAll')
|
||||
}
|
||||
|
||||
when: 'websocket of type CONNECTION is sent without CsrfTOken'
|
||||
SimpMessageHeaderAccessor headers = SimpMessageHeaderAccessor.create(SimpMessageType.CONNECT)
|
||||
Message<?> message = message(headers,'/authentication')
|
||||
clientInboundChannel.send(message)
|
||||
|
||||
then: 'CSRF Protection blocks the Message'
|
||||
noExceptionThrown()
|
||||
}
|
||||
|
||||
def 'websocket with no id does not override customArgumentResolvers'() {
|
||||
setup:
|
||||
def id = 'authenticationController'
|
||||
bean(id,MyController)
|
||||
bean('inPostProcessor',InboundExecutorPostProcessor)
|
||||
bean('mcar', MyCustomArgumentResolver)
|
||||
xml.'websocket:message-broker' {
|
||||
'websocket:transport' {}
|
||||
'websocket:stomp-endpoint'(path:'/app') {
|
||||
'websocket:handshake-handler'(ref:'testHandler') {}
|
||||
}
|
||||
'websocket:simple-broker'(prefix:"/queue, /topic"){}
|
||||
'websocket:argument-resolvers' {
|
||||
'b:ref'(bean:'mcar')
|
||||
}
|
||||
}
|
||||
websocket {
|
||||
'intercept-message'(pattern:'/**',access:'permitAll')
|
||||
}
|
||||
|
||||
when: 'websocket is sent to the myCustom endpoint'
|
||||
clientInboundChannel.send(message('/myCustom'))
|
||||
|
||||
then: 'myCustomArgument is resolved'
|
||||
def controller = appContext.getBean(id)
|
||||
controller.myCustomArgument!= null
|
||||
}
|
||||
|
||||
def 'websocket with id does not integrate with clientInboundChannel'() {
|
||||
setup:
|
||||
websocket([id:'inCsi']) {
|
||||
'intercept-message'(pattern:'/**',access:'denyAll')
|
||||
}
|
||||
|
||||
when:
|
||||
def success = clientInboundChannel.send(message('/denyAll'))
|
||||
|
||||
then:
|
||||
success
|
||||
|
||||
}
|
||||
|
||||
def 'websocket with id can be explicitly integrated with clientInboundChannel'() {
|
||||
setup: 'websocket security explicitly setup'
|
||||
xml.'websocket:message-broker' {
|
||||
'websocket:transport' {}
|
||||
'websocket:stomp-endpoint'(path:'/app') {
|
||||
'websocket:sockjs' {}
|
||||
}
|
||||
'websocket:simple-broker'(prefix:"/queue, /topic"){}
|
||||
'websocket:client-inbound-channel' {
|
||||
'websocket:interceptors' {
|
||||
'b:bean'(class:'org.springframework.security.messaging.context.SecurityContextChannelInterceptor'){}
|
||||
'b:ref'(bean:'inCsi'){}
|
||||
}
|
||||
}
|
||||
}
|
||||
xml.'websocket-message-broker'(id:'inCsi') {
|
||||
'intercept-message'(pattern:'/**',access:'denyAll')
|
||||
}
|
||||
createAppContext()
|
||||
|
||||
when:
|
||||
clientInboundChannel.send(message('/denyAll'))
|
||||
|
||||
then:
|
||||
def e = thrown(MessageDeliveryException)
|
||||
e.cause instanceof AccessDeniedException
|
||||
|
||||
}
|
||||
|
||||
def 'automatic integration with clientInboundChannel does not override exisiting websocket:interceptors'() {
|
||||
setup:
|
||||
mockBean(ChannelInterceptor,'mci')
|
||||
xml.'websocket:message-broker'('application-destination-prefix':'/app',
|
||||
'user-destination-prefix':'/user') {
|
||||
'websocket:transport' {}
|
||||
'websocket:stomp-endpoint'(path:'/foo') {
|
||||
'websocket:sockjs' {}
|
||||
}
|
||||
'websocket:simple-broker'(prefix:"/queue, /topic"){}
|
||||
'websocket:client-inbound-channel' {
|
||||
'websocket:interceptors' {
|
||||
'b:ref'(bean:'mci'){}
|
||||
}
|
||||
}
|
||||
}
|
||||
xml.'websocket-message-broker' {
|
||||
'intercept-message'(pattern:'/denyAll',access:'denyAll')
|
||||
'intercept-message'(pattern:'/permitAll',access:'permitAll')
|
||||
}
|
||||
createAppContext()
|
||||
ChannelInterceptor mci = appContext.getBean('mci')
|
||||
when:
|
||||
Message<?> message = message('/permitAll')
|
||||
clientInboundChannel.send(message)
|
||||
|
||||
then:
|
||||
verify(mci).preSend(message, clientInboundChannel) || true
|
||||
|
||||
}
|
||||
|
||||
def websocket(Map<String,Object> attrs=[:], Closure c) {
|
||||
bean('testHandler', TestHandshakeHandler)
|
||||
xml.'websocket:message-broker' {
|
||||
'websocket:transport' {}
|
||||
'websocket:stomp-endpoint'(path:'/app') {
|
||||
'websocket:handshake-handler'(ref:'testHandler') {}
|
||||
'websocket:handshake-interceptors' {
|
||||
'b:bean'('class':HttpSessionHandshakeInterceptor.name) {}
|
||||
}
|
||||
if(useSockJS) {
|
||||
'websocket:sockjs' {}
|
||||
}
|
||||
}
|
||||
'websocket:simple-broker'(prefix:"/queue, /topic"){}
|
||||
}
|
||||
xml.'websocket-message-broker'(attrs, c)
|
||||
createAppContext()
|
||||
}
|
||||
|
||||
def getClientInboundChannel() {
|
||||
appContext.getBean("clientInboundChannel")
|
||||
}
|
||||
|
||||
def message(String destination, SimpMessageType type=SimpMessageType.MESSAGE) {
|
||||
SimpMessageHeaderAccessor headers = SimpMessageHeaderAccessor.create(type)
|
||||
message(headers, destination)
|
||||
}
|
||||
|
||||
def message(SimpMessageHeaderAccessor headers, String destination) {
|
||||
messageUser = new TestingAuthenticationToken('user','pass','ROLE_USER')
|
||||
headers.sessionId = '123'
|
||||
headers.sessionAttributes = [:]
|
||||
headers.destination = destination
|
||||
if(messageUser != null) {
|
||||
headers.user = messageUser
|
||||
}
|
||||
if(csrfToken != null) {
|
||||
headers.sessionAttributes[CsrfToken.name] = csrfToken
|
||||
}
|
||||
new GenericMessage<String>("hi",headers.messageHeaders)
|
||||
}
|
||||
|
||||
@Controller
|
||||
static class MyController {
|
||||
String authenticationPrincipal
|
||||
MyCustomArgument myCustomArgument
|
||||
|
||||
@MessageMapping('/authentication')
|
||||
public void authentication(@AuthenticationPrincipal String un) {
|
||||
this.authenticationPrincipal = un
|
||||
}
|
||||
|
||||
@MessageMapping('/myCustom')
|
||||
public void myCustom(MyCustomArgument myCustomArgument) {
|
||||
this.myCustomArgument = myCustomArgument
|
||||
}
|
||||
}
|
||||
|
||||
static class MyCustomArgument {
|
||||
MyCustomArgument(String notDefaultConstr) {}
|
||||
}
|
||||
|
||||
static class MyCustomArgumentResolver implements HandlerMethodArgumentResolver {
|
||||
|
||||
@Override
|
||||
boolean supportsParameter(MethodParameter parameter) {
|
||||
parameter.parameterType.isAssignableFrom(MyCustomArgument)
|
||||
}
|
||||
|
||||
@Override
|
||||
Object resolveArgument(MethodParameter parameter, Message<?> message) throws Exception {
|
||||
new MyCustomArgument("")
|
||||
}
|
||||
}
|
||||
|
||||
static class TestHandshakeHandler implements HandshakeHandler {
|
||||
Map<String, Object> attributes;
|
||||
|
||||
boolean doHandshake(ServerHttpRequest request, ServerHttpResponse response, WebSocketHandler wsHandler, Map<String, Object> attributes) throws HandshakeFailureException {
|
||||
this.attributes = attributes
|
||||
if(wsHandler instanceof SockJsWebSocketHandler) {
|
||||
// work around SPR-12716
|
||||
SockJsWebSocketHandler sockJs = (SockJsWebSocketHandler) wsHandler;
|
||||
this.attributes = sockJs.sockJsSession.attributes
|
||||
}
|
||||
true
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Changes the clientInboundChannel Executor to be synchronous
|
||||
*/
|
||||
static class InboundExecutorPostProcessor implements BeanDefinitionRegistryPostProcessor {
|
||||
|
||||
@Override
|
||||
void postProcessBeanDefinitionRegistry(BeanDefinitionRegistry registry) throws BeansException {
|
||||
BeanDefinition inbound = registry.getBeanDefinition("clientInboundChannel")
|
||||
inbound.getConstructorArgumentValues().addIndexedArgumentValue(0, new RootBeanDefinition(SyncTaskExecutor));
|
||||
}
|
||||
|
||||
@Override
|
||||
void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException {
|
||||
|
||||
}
|
||||
}
|
||||
Authentication messageUser = new TestingAuthenticationToken('user','pass','ROLE_USER')
|
||||
boolean useSockJS = false
|
||||
CsrfToken csrfToken = new DefaultCsrfToken('headerName', 'paramName', 'token')
|
||||
|
||||
def cleanup() {
|
||||
SecurityContextHolder.clearContext()
|
||||
}
|
||||
|
||||
def 'websocket with no id automatically integrates with clientInboundChannel'() {
|
||||
setup:
|
||||
websocket {
|
||||
'intercept-message'(pattern:'/permitAll',access:'permitAll')
|
||||
'intercept-message'(pattern:'/denyAll',access:'denyAll')
|
||||
}
|
||||
|
||||
|
||||
when: 'message is sent to the denyAll endpoint'
|
||||
clientInboundChannel.send(message('/denyAll'))
|
||||
|
||||
then: 'access is denied to the denyAll endpoint'
|
||||
def e = thrown(MessageDeliveryException)
|
||||
e.cause instanceof AccessDeniedException
|
||||
|
||||
and: 'access is granted to the permitAll endpoint'
|
||||
clientInboundChannel.send(message('/permitAll'))
|
||||
}
|
||||
|
||||
def 'anonymous authentication supported'() {
|
||||
setup:
|
||||
websocket {
|
||||
'intercept-message'(pattern:'/permitAll',access:'permitAll')
|
||||
'intercept-message'(pattern:'/denyAll',access:'denyAll')
|
||||
}
|
||||
messageUser = null
|
||||
|
||||
when: 'message is sent to the permitAll endpoint with no user'
|
||||
clientInboundChannel.send(message('/permitAll'))
|
||||
|
||||
then: 'access is granted'
|
||||
noExceptionThrown()
|
||||
}
|
||||
|
||||
@Unroll
|
||||
def "message type - #type"(SimpMessageType type) {
|
||||
setup:
|
||||
websocket {
|
||||
'intercept-message'('type': type.toString(), access:'permitAll')
|
||||
'intercept-message'(pattern:'/**', access:'denyAll')
|
||||
}
|
||||
messageUser = null
|
||||
SimpMessageHeaderAccessor headers = SimpMessageHeaderAccessor.create(type)
|
||||
if(SimpMessageType.CONNECT == type) {
|
||||
headers.setNativeHeader(csrfToken.headerName, csrfToken.token)
|
||||
}
|
||||
Message message = message(headers, '/permitAll')
|
||||
|
||||
when: 'message is sent to the permitAll endpoint with no user'
|
||||
clientInboundChannel.send(message)
|
||||
|
||||
then: 'access is granted'
|
||||
noExceptionThrown()
|
||||
|
||||
where:
|
||||
type << SimpMessageType.values()
|
||||
}
|
||||
|
||||
@Unroll
|
||||
def "pattern and message type - #type"(SimpMessageType type) {
|
||||
setup:
|
||||
websocket {
|
||||
'intercept-message'(pattern: '/permitAll', 'type': type.toString(), access:'permitAll')
|
||||
'intercept-message'(pattern:'/**', access:'denyAll')
|
||||
}
|
||||
|
||||
when: 'message is sent to the permitAll endpoint with no user'
|
||||
clientInboundChannel.send(message('/permitAll', type))
|
||||
|
||||
then: 'access is granted'
|
||||
noExceptionThrown()
|
||||
|
||||
when: 'message sent to other message type'
|
||||
clientInboundChannel.send(message('/permitAll', SimpMessageType.UNSUBSCRIBE))
|
||||
|
||||
then: 'does not match'
|
||||
MessageDeliveryException e = thrown()
|
||||
e.cause instanceof AccessDeniedException
|
||||
|
||||
when: 'message is sent to other pattern'
|
||||
clientInboundChannel.send(message('/other', type))
|
||||
|
||||
then: 'does not match'
|
||||
MessageDeliveryException eOther = thrown()
|
||||
eOther.cause instanceof AccessDeniedException
|
||||
|
||||
where:
|
||||
type << [SimpMessageType.MESSAGE, SimpMessageType.SUBSCRIBE]
|
||||
}
|
||||
|
||||
@Unroll
|
||||
def "intercept-message with invalid type and pattern - #type"(SimpMessageType type) {
|
||||
when:
|
||||
websocket {
|
||||
'intercept-message'(pattern : '/**', 'type': type.toString(), access:'permitAll')
|
||||
}
|
||||
then:
|
||||
thrown(BeanDefinitionParsingException)
|
||||
|
||||
where:
|
||||
type << [SimpMessageType.CONNECT, SimpMessageType.CONNECT_ACK, SimpMessageType.DISCONNECT, SimpMessageType.DISCONNECT_ACK, SimpMessageType.HEARTBEAT, SimpMessageType.OTHER, SimpMessageType.UNSUBSCRIBE ]
|
||||
}
|
||||
|
||||
def 'messages with no id automatically adds Authentication argument resolver'() {
|
||||
setup:
|
||||
def id = 'authenticationController'
|
||||
bean(id,MyController)
|
||||
bean('inPostProcessor',InboundExecutorPostProcessor)
|
||||
websocket {
|
||||
'intercept-message'(pattern:'/**',access:'permitAll')
|
||||
}
|
||||
|
||||
when: 'message is sent to the authentication endpoint'
|
||||
clientInboundChannel.send(message('/authentication'))
|
||||
|
||||
then: 'the AuthenticationPrincipal is resolved'
|
||||
def controller = appContext.getBean(id)
|
||||
controller.authenticationPrincipal == messageUser.name
|
||||
}
|
||||
|
||||
def 'messages of type CONNECT use CsrfTokenHandshakeInterceptor'() {
|
||||
setup:
|
||||
def id = 'authenticationController'
|
||||
bean(id,MyController)
|
||||
bean('inPostProcessor',InboundExecutorPostProcessor)
|
||||
websocket {
|
||||
'intercept-message'(pattern:'/**',access:'permitAll')
|
||||
}
|
||||
|
||||
SimpMessageHeaderAccessor headers = SimpMessageHeaderAccessor.create(SimpMessageType.CONNECT)
|
||||
Message<?> message = message(headers,'/authentication')
|
||||
WebSocketHttpRequestHandler handler = appContext.getBean(WebSocketHttpRequestHandler)
|
||||
MockHttpServletRequest request = new MockHttpServletRequest()
|
||||
String sessionAttr = "sessionAttr"
|
||||
request.getSession().setAttribute(sessionAttr,"sessionValue")
|
||||
|
||||
CsrfToken token = new DefaultCsrfToken("header", "param", "token")
|
||||
request.setAttribute(CsrfToken.name, token)
|
||||
|
||||
when:
|
||||
handler.handleRequest(request , new MockHttpServletResponse())
|
||||
TestHandshakeHandler handshakeHandler = appContext.getBean(TestHandshakeHandler)
|
||||
|
||||
then: 'CsrfToken is populated'
|
||||
handshakeHandler.attributes.get(CsrfToken.name) == token
|
||||
|
||||
and: 'Explicitly listed HandshakeInterceptor are not overridden'
|
||||
handshakeHandler.attributes.get(sessionAttr) == request.getSession().getAttribute(sessionAttr)
|
||||
}
|
||||
|
||||
def 'messages of type CONNECT use CsrfTokenHandshakeInterceptor with SockJS'() {
|
||||
setup:
|
||||
useSockJS = true
|
||||
def id = 'authenticationController'
|
||||
bean(id,MyController)
|
||||
bean('inPostProcessor',InboundExecutorPostProcessor)
|
||||
websocket {
|
||||
'intercept-message'(pattern:'/**',access:'permitAll')
|
||||
}
|
||||
|
||||
SimpMessageHeaderAccessor headers = SimpMessageHeaderAccessor.create(SimpMessageType.CONNECT)
|
||||
Message<?> message = message(headers,'/authentication')
|
||||
SockJsHttpRequestHandler handler = appContext.getBean(SockJsHttpRequestHandler)
|
||||
MockHttpServletRequest request = new MockHttpServletRequest()
|
||||
String sessionAttr = "sessionAttr"
|
||||
request.getSession().setAttribute(sessionAttr,"sessionValue")
|
||||
|
||||
CsrfToken token = new DefaultCsrfToken("header", "param", "token")
|
||||
request.setAttribute(CsrfToken.name, token)
|
||||
|
||||
request.setMethod("GET")
|
||||
request.setAttribute(HandlerMapping.PATH_WITHIN_HANDLER_MAPPING_ATTRIBUTE, "/289/tpyx6mde/websocket")
|
||||
|
||||
when:
|
||||
handler.handleRequest(request , new MockHttpServletResponse())
|
||||
TestHandshakeHandler handshakeHandler = appContext.getBean(TestHandshakeHandler)
|
||||
|
||||
then: 'CsrfToken is populated'
|
||||
handshakeHandler.attributes?.get(CsrfToken.name) == token
|
||||
|
||||
and: 'Explicitly listed HandshakeInterceptor are not overridden'
|
||||
handshakeHandler.attributes?.get(sessionAttr) == request.getSession().getAttribute(sessionAttr)
|
||||
}
|
||||
|
||||
def 'messages of type CONNECT require valid CsrfToken'() {
|
||||
setup:
|
||||
def id = 'authenticationController'
|
||||
bean(id,MyController)
|
||||
bean('inPostProcessor',InboundExecutorPostProcessor)
|
||||
websocket {
|
||||
'intercept-message'(pattern:'/**',access:'permitAll')
|
||||
}
|
||||
|
||||
when: 'websocket of type CONNECTION is sent without CsrfTOken'
|
||||
SimpMessageHeaderAccessor headers = SimpMessageHeaderAccessor.create(SimpMessageType.CONNECT)
|
||||
Message<?> message = message(headers,'/authentication')
|
||||
clientInboundChannel.send(message)
|
||||
|
||||
then: 'CSRF Protection blocks the Message'
|
||||
MessageDeliveryException expected = thrown()
|
||||
expected.cause instanceof InvalidCsrfTokenException
|
||||
}
|
||||
|
||||
def 'messages of type CONNECT disabled valid CsrfToken'() {
|
||||
setup:
|
||||
def id = 'authenticationController'
|
||||
bean(id,MyController)
|
||||
bean('inPostProcessor',InboundExecutorPostProcessor)
|
||||
websocket('same-origin-disabled':true) {
|
||||
'intercept-message'(pattern:'/**',access:'permitAll')
|
||||
}
|
||||
|
||||
when: 'websocket of type CONNECTION is sent without CsrfTOken'
|
||||
SimpMessageHeaderAccessor headers = SimpMessageHeaderAccessor.create(SimpMessageType.CONNECT)
|
||||
Message<?> message = message(headers,'/authentication')
|
||||
clientInboundChannel.send(message)
|
||||
|
||||
then: 'CSRF Protection blocks the Message'
|
||||
noExceptionThrown()
|
||||
}
|
||||
|
||||
def 'websocket with no id does not override customArgumentResolvers'() {
|
||||
setup:
|
||||
def id = 'authenticationController'
|
||||
bean(id,MyController)
|
||||
bean('inPostProcessor',InboundExecutorPostProcessor)
|
||||
bean('mcar', MyCustomArgumentResolver)
|
||||
xml.'websocket:message-broker' {
|
||||
'websocket:transport' {}
|
||||
'websocket:stomp-endpoint'(path:'/app') {
|
||||
'websocket:handshake-handler'(ref:'testHandler') {}
|
||||
}
|
||||
'websocket:simple-broker'(prefix:"/queue, /topic"){}
|
||||
'websocket:argument-resolvers' {
|
||||
'b:ref'(bean:'mcar')
|
||||
}
|
||||
}
|
||||
websocket {
|
||||
'intercept-message'(pattern:'/**',access:'permitAll')
|
||||
}
|
||||
|
||||
when: 'websocket is sent to the myCustom endpoint'
|
||||
clientInboundChannel.send(message('/myCustom'))
|
||||
|
||||
then: 'myCustomArgument is resolved'
|
||||
def controller = appContext.getBean(id)
|
||||
controller.myCustomArgument!= null
|
||||
}
|
||||
|
||||
def 'websocket defaults pathMatcher'() {
|
||||
setup:
|
||||
bean('pathMatcher',AntPathMatcher.name,['.'])
|
||||
bean('testHandler', TestHandshakeHandler)
|
||||
xml.'websocket:message-broker'('path-matcher':'pathMatcher') {
|
||||
'websocket:transport' {}
|
||||
'websocket:stomp-endpoint'(path:'/app') {
|
||||
'websocket:handshake-handler'(ref:'testHandler') {}
|
||||
}
|
||||
'websocket:simple-broker'(prefix:"/queue, /topic"){}
|
||||
}
|
||||
xml.'websocket-message-broker' {
|
||||
'intercept-message'(pattern:'/denyAll.*',access:'denyAll')
|
||||
}
|
||||
createAppContext()
|
||||
|
||||
when: 'sent to denyAll.a'
|
||||
appContext.getBean(SimpAnnotationMethodMessageHandler)
|
||||
clientInboundChannel.send(message('/denyAll.a'))
|
||||
|
||||
then: 'access is denied'
|
||||
MessageDeliveryException expected = thrown()
|
||||
expected.cause instanceof AccessDeniedException
|
||||
|
||||
when: 'sent to denyAll.a.b'
|
||||
clientInboundChannel.send(message('/denyAll.a.b'))
|
||||
|
||||
then: 'access is allowed'
|
||||
noExceptionThrown()
|
||||
}
|
||||
|
||||
def 'websocket with id does not integrate with clientInboundChannel'() {
|
||||
setup:
|
||||
websocket([id:'inCsi']) {
|
||||
'intercept-message'(pattern:'/**',access:'denyAll')
|
||||
}
|
||||
|
||||
when:
|
||||
def success = clientInboundChannel.send(message('/denyAll'))
|
||||
|
||||
then:
|
||||
success
|
||||
|
||||
}
|
||||
|
||||
def 'websocket with id can be explicitly integrated with clientInboundChannel'() {
|
||||
setup: 'websocket security explicitly setup'
|
||||
xml.'websocket:message-broker' {
|
||||
'websocket:transport' {}
|
||||
'websocket:stomp-endpoint'(path:'/app') {
|
||||
'websocket:sockjs' {}
|
||||
}
|
||||
'websocket:simple-broker'(prefix:"/queue, /topic"){}
|
||||
'websocket:client-inbound-channel' {
|
||||
'websocket:interceptors' {
|
||||
'b:bean'(class:'org.springframework.security.messaging.context.SecurityContextChannelInterceptor'){}
|
||||
'b:ref'(bean:'inCsi'){}
|
||||
}
|
||||
}
|
||||
}
|
||||
xml.'websocket-message-broker'(id:'inCsi') {
|
||||
'intercept-message'(pattern:'/**',access:'denyAll')
|
||||
}
|
||||
createAppContext()
|
||||
|
||||
when:
|
||||
clientInboundChannel.send(message('/denyAll'))
|
||||
|
||||
then:
|
||||
def e = thrown(MessageDeliveryException)
|
||||
e.cause instanceof AccessDeniedException
|
||||
|
||||
}
|
||||
|
||||
def 'automatic integration with clientInboundChannel does not override exisiting websocket:interceptors'() {
|
||||
setup:
|
||||
mockBean(ChannelInterceptor,'mci')
|
||||
xml.'websocket:message-broker'('application-destination-prefix':'/app',
|
||||
'user-destination-prefix':'/user') {
|
||||
'websocket:transport' {}
|
||||
'websocket:stomp-endpoint'(path:'/foo') {
|
||||
'websocket:sockjs' {}
|
||||
}
|
||||
'websocket:simple-broker'(prefix:"/queue, /topic"){}
|
||||
'websocket:client-inbound-channel' {
|
||||
'websocket:interceptors' {
|
||||
'b:ref'(bean:'mci'){}
|
||||
}
|
||||
}
|
||||
}
|
||||
xml.'websocket-message-broker' {
|
||||
'intercept-message'(pattern:'/denyAll',access:'denyAll')
|
||||
'intercept-message'(pattern:'/permitAll',access:'permitAll')
|
||||
}
|
||||
createAppContext()
|
||||
ChannelInterceptor mci = appContext.getBean('mci')
|
||||
when:
|
||||
Message<?> message = message('/permitAll')
|
||||
clientInboundChannel.send(message)
|
||||
|
||||
then:
|
||||
verify(mci).preSend(message, clientInboundChannel) || true
|
||||
|
||||
}
|
||||
|
||||
def websocket(Map<String,Object> attrs=[:], Closure c) {
|
||||
bean('testHandler', TestHandshakeHandler)
|
||||
xml.'websocket:message-broker' {
|
||||
'websocket:transport' {}
|
||||
'websocket:stomp-endpoint'(path:'/app') {
|
||||
'websocket:handshake-handler'(ref:'testHandler') {}
|
||||
'websocket:handshake-interceptors' {
|
||||
'b:bean'('class':HttpSessionHandshakeInterceptor.name) {}
|
||||
}
|
||||
if(useSockJS) {
|
||||
'websocket:sockjs' {}
|
||||
}
|
||||
}
|
||||
'websocket:simple-broker'(prefix:"/queue, /topic"){}
|
||||
}
|
||||
xml.'websocket-message-broker'(attrs, c)
|
||||
createAppContext()
|
||||
}
|
||||
|
||||
def getClientInboundChannel() {
|
||||
appContext.getBean("clientInboundChannel")
|
||||
}
|
||||
|
||||
def message(String destination, SimpMessageType type=SimpMessageType.MESSAGE) {
|
||||
SimpMessageHeaderAccessor headers = SimpMessageHeaderAccessor.create(type)
|
||||
message(headers, destination)
|
||||
}
|
||||
|
||||
def message(SimpMessageHeaderAccessor headers, String destination) {
|
||||
messageUser = new TestingAuthenticationToken('user','pass','ROLE_USER')
|
||||
headers.sessionId = '123'
|
||||
headers.sessionAttributes = [:]
|
||||
headers.destination = destination
|
||||
if(messageUser != null) {
|
||||
headers.user = messageUser
|
||||
}
|
||||
if(csrfToken != null) {
|
||||
headers.sessionAttributes[CsrfToken.name] = csrfToken
|
||||
}
|
||||
new GenericMessage<String>("hi",headers.messageHeaders)
|
||||
}
|
||||
|
||||
@Controller
|
||||
static class MyController {
|
||||
String authenticationPrincipal
|
||||
MyCustomArgument myCustomArgument
|
||||
|
||||
@MessageMapping('/authentication')
|
||||
public void authentication(@AuthenticationPrincipal String un) {
|
||||
this.authenticationPrincipal = un
|
||||
}
|
||||
|
||||
@MessageMapping('/myCustom')
|
||||
public void myCustom(MyCustomArgument myCustomArgument) {
|
||||
this.myCustomArgument = myCustomArgument
|
||||
}
|
||||
}
|
||||
|
||||
static class MyCustomArgument {
|
||||
MyCustomArgument(String notDefaultConstr) {}
|
||||
}
|
||||
|
||||
static class MyCustomArgumentResolver implements HandlerMethodArgumentResolver {
|
||||
|
||||
@Override
|
||||
boolean supportsParameter(MethodParameter parameter) {
|
||||
parameter.parameterType.isAssignableFrom(MyCustomArgument)
|
||||
}
|
||||
|
||||
@Override
|
||||
Object resolveArgument(MethodParameter parameter, Message<?> message) throws Exception {
|
||||
new MyCustomArgument("")
|
||||
}
|
||||
}
|
||||
|
||||
static class TestHandshakeHandler implements HandshakeHandler {
|
||||
Map<String, Object> attributes;
|
||||
|
||||
boolean doHandshake(ServerHttpRequest request, ServerHttpResponse response, WebSocketHandler wsHandler, Map<String, Object> attributes) throws HandshakeFailureException {
|
||||
this.attributes = attributes
|
||||
if(wsHandler instanceof SockJsWebSocketHandler) {
|
||||
// work around SPR-12716
|
||||
SockJsWebSocketHandler sockJs = (SockJsWebSocketHandler) wsHandler;
|
||||
this.attributes = sockJs.sockJsSession.attributes
|
||||
}
|
||||
true
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Changes the clientInboundChannel Executor to be synchronous
|
||||
*/
|
||||
static class InboundExecutorPostProcessor implements BeanDefinitionRegistryPostProcessor {
|
||||
|
||||
@Override
|
||||
void postProcessBeanDefinitionRegistry(BeanDefinitionRegistry registry) throws BeansException {
|
||||
BeanDefinition inbound = registry.getBeanDefinition("clientInboundChannel")
|
||||
inbound.getConstructorArgumentValues().addIndexedArgumentValue(0, new RootBeanDefinition(SyncTaskExecutor));
|
||||
}
|
||||
|
||||
@Override
|
||||
void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException {
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue