Spring/spring-security
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polish messaging format

Browse Source 
Issue gh-8945
This commit is contained in:
Rob Winch
2020-08-24 09:48:43 -05:00
parent 95bc670dd5
commit 38aae7f015
5 changed files with 41 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
messaging/src/test/java/org/springframework/security/messaging/access/expression/MessageExpressionConfigAttributeTests.java
View File

@@ -80,8 +80,11 @@ public class MessageExpressionConfigAttributeTests {
@Test
public void postProcessContext() {
SimpDestinationMessageMatcher matcher = new SimpDestinationMessageMatcher("/topics/{topic}/**");
// @formatter:off
Message<?> message = MessageBuilder.withPayload("M")
.setHeader(SimpMessageHeaderAccessor.DESTINATION_HEADER, "/topics/someTopic/sub1").build();
.setHeader(SimpMessageHeaderAccessor.DESTINATION_HEADER, "/topics/someTopic/sub1")
.build();
// @formatter:on
EvaluationContext context = mock(EvaluationContext.class);
this.attribute = new MessageExpressionConfigAttribute(this.expression, matcher);
this.attribute.postProcess(context, message);

15
messaging/src/test/java/org/springframework/security/messaging/handler/invocation/reactive/AuthenticationPrincipalArgumentResolverTests.java
View File

@@ -54,9 +54,12 @@ public class AuthenticationPrincipalArgumentResolverTests {
@Test
public void resolveArgumentWhenAuthenticationPrincipalThenFound() {
Authentication authentication = TestAuthentication.authenticatedUser();
// @formatter:off
Mono<UserDetails> result = (Mono<UserDetails>) this.resolver
.resolveArgument(arg0("authenticationPrincipalOnMonoUserDetails"), null)
.subscriberContext(ReactiveSecurityContextHolder.withAuthentication(authentication)).block();
.subscriberContext(ReactiveSecurityContextHolder.withAuthentication(authentication))
.block();
// @formatter:on
assertThat(result.block()).isEqualTo(authentication.getPrincipal());
}
@@ -72,9 +75,12 @@ public class AuthenticationPrincipalArgumentResolverTests {
@Test
public void resolveArgumentWhenMonoAndAuthenticationPrincipalThenFound() {
Authentication authentication = TestAuthentication.authenticatedUser();
// @formatter:off
Mono<UserDetails> result = (Mono<UserDetails>) this.resolver
.resolveArgument(arg0("currentUserOnMonoUserDetails"), null)
.subscriberContext(ReactiveSecurityContextHolder.withAuthentication(authentication)).block();
.subscriberContext(ReactiveSecurityContextHolder.withAuthentication(authentication))
.block();
// @formatter:on
assertThat(result.block()).isEqualTo(authentication.getPrincipal());
}
@@ -85,9 +91,12 @@ public class AuthenticationPrincipalArgumentResolverTests {
@Test
public void resolveArgumentWhenExpressionThenFound() {
Authentication authentication = TestAuthentication.authenticatedUser();
// @formatter:off
Mono<String> result = (Mono<String>) this.resolver
.resolveArgument(arg0("authenticationPrincipalExpression"), null)
.subscriberContext(ReactiveSecurityContextHolder.withAuthentication(authentication)).block();
.subscriberContext(ReactiveSecurityContextHolder.withAuthentication(authentication))
.block();
// @formatter:on
assertThat(result.block()).isEqualTo(authentication.getName());
}

10
messaging/src/test/java/org/springframework/security/messaging/util/matcher/SimpMessageTypeMatcherTests.java
View File

@@ -42,15 +42,21 @@ public class SimpMessageTypeMatcherTests {
@Test
public void matchesMessageMessageTrue() {
// @formatter:off
Message<String> message = MessageBuilder.withPayload("Hi")
.setHeader(SimpMessageHeaderAccessor.MESSAGE_TYPE_HEADER, SimpMessageType.MESSAGE).build();
.setHeader(SimpMessageHeaderAccessor.MESSAGE_TYPE_HEADER, SimpMessageType.MESSAGE)
.build();
// @formatter:on
assertThat(this.matcher.matches(message)).isTrue();
}
@Test
public void matchesMessageConnectFalse() {
// @formatter:off
Message<String> message = MessageBuilder.withPayload("Hi")
.setHeader(SimpMessageHeaderAccessor.MESSAGE_TYPE_HEADER, SimpMessageType.CONNECT).build();
.setHeader(SimpMessageHeaderAccessor.MESSAGE_TYPE_HEADER, SimpMessageType.CONNECT)
.build();
// @formatter:on
assertThat(this.matcher.matches(message)).isFalse();
}