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

Reformat code using spring-javaformat

Browse Source 
Run `./gradlew format` to reformat all java files.

Issue gh-8945
This commit is contained in:
Phillip Webb
2020-08-10 16:39:17 -05:00
committed by Rob Winch
parent 81d9c6cac5
commit b7fc18262d
2487 changed files with 41506 additions and 46548 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
messaging/src/test/java/org/springframework/security/messaging/access/expression/DefaultMessageSecurityExpressionHandlerTests.java
View File

@@ -38,8 +38,10 @@ import org.springframework.security.core.authority.AuthorityUtils;
@RunWith(MockitoJUnitRunner.class)
public class DefaultMessageSecurityExpressionHandlerTests {
@Mock
AuthenticationTrustResolver trustResolver;
@Mock
PermissionEvaluator permissionEvaluator;
@@ -61,10 +63,8 @@ public class DefaultMessageSecurityExpressionHandlerTests {
// SEC-2705
@Test
public void trustResolverPopulated() {
EvaluationContext context = handler.createEvaluationContext(authentication,
message);
Expression expression = handler.getExpressionParser().parseExpression(
"authenticated");
EvaluationContext context = handler.createEvaluationContext(authentication, message);
Expression expression = handler.getExpressionParser().parseExpression("authenticated");
assertThat(ExpressionUtils.evaluateAsBoolean(expression, context)).isFalse();
}
@@ -77,10 +77,8 @@ public class DefaultMessageSecurityExpressionHandlerTests {
@Test
public void trustResolverCustom() {
handler.setTrustResolver(trustResolver);
EvaluationContext context = handler.createEvaluationContext(authentication,
message);
Expression expression = handler.getExpressionParser().parseExpression(
"authenticated");
EvaluationContext context = handler.createEvaluationContext(authentication, message);
Expression expression = handler.getExpressionParser().parseExpression("authenticated");
when(trustResolver.isAnonymous(authentication)).thenReturn(false);
assertThat(ExpressionUtils.evaluateAsBoolean(expression, context)).isTrue();
@@ -92,10 +90,8 @@ public class DefaultMessageSecurityExpressionHandlerTests {
RoleHierarchyImpl roleHierarchy = new RoleHierarchyImpl();
roleHierarchy.setHierarchy("ROLE_ADMIN > ROLE_USER");
handler.setRoleHierarchy(roleHierarchy);
EvaluationContext context = handler.createEvaluationContext(authentication,
message);
Expression expression = handler.getExpressionParser().parseExpression(
"hasRole('ROLE_USER')");
EvaluationContext context = handler.createEvaluationContext(authentication, message);
Expression expression = handler.getExpressionParser().parseExpression("hasRole('ROLE_USER')");
assertThat(ExpressionUtils.evaluateAsBoolean(expression, context)).isTrue();
}
@@ -103,13 +99,11 @@ public class DefaultMessageSecurityExpressionHandlerTests {
@Test
public void permissionEvaluator() {
handler.setPermissionEvaluator(permissionEvaluator);
EvaluationContext context = handler.createEvaluationContext(authentication,
message);
Expression expression = handler.getExpressionParser().parseExpression(
"hasPermission(message, 'read')");
when(permissionEvaluator.hasPermission(authentication, message, "read"))
.thenReturn(true);
EvaluationContext context = handler.createEvaluationContext(authentication, message);
Expression expression = handler.getExpressionParser().parseExpression("hasPermission(message, 'read')");
when(permissionEvaluator.hasPermission(authentication, message, "read")).thenReturn(true);
assertThat(ExpressionUtils.evaluateAsBoolean(expression, context)).isTrue();
}
}

15
messaging/src/test/java/org/springframework/security/messaging/access/expression/ExpressionBasedMessageSecurityMetadataSourceFactoryTests.java
View File

@@ -35,12 +35,16 @@ import java.util.LinkedHashMap;
@RunWith(MockitoJUnitRunner.class)
public class ExpressionBasedMessageSecurityMetadataSourceFactoryTests {
@Mock
MessageMatcher<Object> matcher1;
@Mock
MessageMatcher<Object> matcher2;
@Mock
Message<Object> message;
@Mock
Authentication authentication;
@@ -83,9 +87,8 @@ public class ExpressionBasedMessageSecurityMetadataSourceFactoryTests {
assertThat(attrs).hasSize(1);
ConfigAttribute attr = attrs.iterator().next();
assertThat(attr).isInstanceOf(MessageExpressionConfigAttribute.class);
assertThat(
((MessageExpressionConfigAttribute) attr).getAuthorizeExpression()
.getValue(rootObject)).isEqualTo(true);
assertThat(((MessageExpressionConfigAttribute) attr).getAuthorizeExpression().getValue(rootObject))
.isEqualTo(true);
}
@Test
@@ -97,8 +100,8 @@ public class ExpressionBasedMessageSecurityMetadataSourceFactoryTests {
assertThat(attrs).hasSize(1);
ConfigAttribute attr = attrs.iterator().next();
assertThat(attr).isInstanceOf(MessageExpressionConfigAttribute.class);
assertThat(
((MessageExpressionConfigAttribute) attr).getAuthorizeExpression()
.getValue(rootObject)).isEqualTo(false);
assertThat(((MessageExpressionConfigAttribute) attr).getAuthorizeExpression().getValue(rootObject))
.isEqualTo(false);
}
}

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

@@ -33,6 +33,7 @@ import static org.mockito.Mockito.*;
@RunWith(MockitoJUnitRunner.class)
public class MessageExpressionConfigAttributeTests {
@Mock
Expression expression;
@@ -76,7 +77,8 @@ public class MessageExpressionConfigAttributeTests {
@Test
public void postProcessContext() {
SimpDestinationMessageMatcher matcher = new SimpDestinationMessageMatcher("/topics/{topic}/**");
Message<?> message = MessageBuilder.withPayload("M").setHeader(SimpMessageHeaderAccessor.DESTINATION_HEADER, "/topics/someTopic/sub1").build();
Message<?> message = MessageBuilder.withPayload("M")
.setHeader(SimpMessageHeaderAccessor.DESTINATION_HEADER, "/topics/someTopic/sub1").build();
EvaluationContext context = mock(EvaluationContext.class);
attribute = new MessageExpressionConfigAttribute(expression, matcher);
@@ -84,4 +86,5 @@ public class MessageExpressionConfigAttributeTests {
verify(context).setVariable("topic", "someTopic");
}
}

47
messaging/src/test/java/org/springframework/security/messaging/access/expression/MessageExpressionVoterTests.java
View File

@@ -38,17 +38,24 @@ import static org.springframework.security.access.AccessDecisionVoter.*;
@RunWith(MockitoJUnitRunner.class)
public class MessageExpressionVoterTests {
@Mock
Authentication authentication;
@Mock
Message<Object> message;
Collection<ConfigAttribute> attributes;
@Mock
Expression expression;
@Mock
MessageMatcher<?> matcher;
@Mock
SecurityExpressionHandler<Message> expressionHandler;
@Mock
EvaluationContext evaluationContext;
@@ -56,33 +63,27 @@ public class MessageExpressionVoterTests {
@Before
public void setup() {
attributes = Arrays
.<ConfigAttribute> asList(new MessageExpressionConfigAttribute(expression, matcher));
attributes = Arrays.<ConfigAttribute>asList(new MessageExpressionConfigAttribute(expression, matcher));
voter = new MessageExpressionVoter();
}
@Test
public void voteGranted() {
when(expression.getValue(any(EvaluationContext.class), eq(Boolean.class)))
.thenReturn(true);
assertThat(voter.vote(authentication, message, attributes)).isEqualTo(
ACCESS_GRANTED);
when(expression.getValue(any(EvaluationContext.class), eq(Boolean.class))).thenReturn(true);
assertThat(voter.vote(authentication, message, attributes)).isEqualTo(ACCESS_GRANTED);
}
@Test
public void voteDenied() {
when(expression.getValue(any(EvaluationContext.class), eq(Boolean.class)))
.thenReturn(false);
assertThat(voter.vote(authentication, message, attributes)).isEqualTo(
ACCESS_DENIED);
when(expression.getValue(any(EvaluationContext.class), eq(Boolean.class))).thenReturn(false);
assertThat(voter.vote(authentication, message, attributes)).isEqualTo(ACCESS_DENIED);
}
@Test
public void voteAbstain() {
attributes = Arrays.<ConfigAttribute> asList(new SecurityConfig("ROLE_USER"));
assertThat(voter.vote(authentication, message, attributes)).isEqualTo(
ACCESS_ABSTAIN);
attributes = Arrays.<ConfigAttribute>asList(new SecurityConfig("ROLE_USER"));
assertThat(voter.vote(authentication, message, attributes)).isEqualTo(ACCESS_ABSTAIN);
}
@Test
@@ -102,8 +103,7 @@ public class MessageExpressionVoterTests {
@Test
public void supportsMessageExpressionConfigAttributeTrue() {
assertThat(voter.supports(new MessageExpressionConfigAttribute(expression, matcher)))
.isTrue();
assertThat(voter.supports(new MessageExpressionConfigAttribute(expression, matcher))).isTrue();
}
@Test(expected = IllegalArgumentException.class)
@@ -114,29 +114,26 @@ public class MessageExpressionVoterTests {
@Test
public void customExpressionHandler() {
voter.setExpressionHandler(expressionHandler);
when(expressionHandler.createEvaluationContext(authentication, message))
.thenReturn(evaluationContext);
when(expressionHandler.createEvaluationContext(authentication, message)).thenReturn(evaluationContext);
when(expression.getValue(evaluationContext, Boolean.class)).thenReturn(true);
assertThat(voter.vote(authentication, message, attributes)).isEqualTo(
ACCESS_GRANTED);
assertThat(voter.vote(authentication, message, attributes)).isEqualTo(ACCESS_GRANTED);
verify(expressionHandler).createEvaluationContext(authentication, message);
}
@Test
public void postProcessEvaluationContext(){
public void postProcessEvaluationContext() {
final MessageExpressionConfigAttribute configAttribute = mock(MessageExpressionConfigAttribute.class);
voter.setExpressionHandler(expressionHandler);
when(expressionHandler.createEvaluationContext(authentication, message)).thenReturn(evaluationContext);
when(configAttribute.getAuthorizeExpression()).thenReturn(expression);
attributes = Arrays.<ConfigAttribute> asList(configAttribute);
attributes = Arrays.<ConfigAttribute>asList(configAttribute);
when(configAttribute.postProcess(evaluationContext, message)).thenReturn(evaluationContext);
when(expression.getValue(any(EvaluationContext.class), eq(Boolean.class)))
.thenReturn(true);
when(expression.getValue(any(EvaluationContext.class), eq(Boolean.class))).thenReturn(true);
assertThat(voter.vote(authentication, message, attributes)).isEqualTo(
ACCESS_GRANTED);
assertThat(voter.vote(authentication, message, attributes)).isEqualTo(ACCESS_GRANTED);
verify(configAttribute).postProcess(evaluationContext, message);
}
}

33
messaging/src/test/java/org/springframework/security/messaging/access/intercept/ChannelSecurityInterceptorTests.java
View File

@@ -44,16 +44,22 @@ import static org.mockito.Mockito.when;
@RunWith(MockitoJUnitRunner.class)
public class ChannelSecurityInterceptorTests {
@Mock
Message<Object> message;
@Mock
MessageChannel channel;
@Mock
MessageSecurityMetadataSource source;
@Mock
AccessDecisionManager accessDecisionManager;
@Mock
RunAsManager runAsManager;
@Mock
Authentication runAs;
@@ -65,7 +71,7 @@ public class ChannelSecurityInterceptorTests {
@Before
public void setup() {
attrs = Arrays.<ConfigAttribute> asList(new SecurityConfig("ROLE_USER"));
attrs = Arrays.<ConfigAttribute>asList(new SecurityConfig("ROLE_USER"));
interceptor = new ChannelSecurityInterceptor(source);
interceptor.setAccessDecisionManager(accessDecisionManager);
interceptor.setRunAsManager(runAsManager);
@@ -111,8 +117,8 @@ public class ChannelSecurityInterceptorTests {
@Test(expected = AccessDeniedException.class)
public void preSendDeny() {
when(source.getAttributes(message)).thenReturn(attrs);
doThrow(new AccessDeniedException("")).when(accessDecisionManager).decide(
any(Authentication.class), eq(message), eq(attrs));
doThrow(new AccessDeniedException("")).when(accessDecisionManager).decide(any(Authentication.class),
eq(message), eq(attrs));
interceptor.preSend(message, channel);
}
@@ -121,19 +127,15 @@ public class ChannelSecurityInterceptorTests {
@Test
public void preSendPostSendRunAs() {
when(source.getAttributes(message)).thenReturn(attrs);
when(
runAsManager.buildRunAs(any(Authentication.class), any(),
any(Collection.class))).thenReturn(runAs);
when(runAsManager.buildRunAs(any(Authentication.class), any(), any(Collection.class))).thenReturn(runAs);
Message<?> preSend = interceptor.preSend(message, channel);
assertThat(SecurityContextHolder.getContext().getAuthentication())
.isSameAs(runAs);
assertThat(SecurityContextHolder.getContext().getAuthentication()).isSameAs(runAs);
interceptor.postSend(preSend, channel, true);
assertThat(SecurityContextHolder.getContext().getAuthentication()).isSameAs(
originalAuth);
assertThat(SecurityContextHolder.getContext().getAuthentication()).isSameAs(originalAuth);
}
@Test
@@ -145,19 +147,15 @@ public class ChannelSecurityInterceptorTests {
@Test
public void preSendFinallySendRunAs() {
when(source.getAttributes(message)).thenReturn(attrs);
when(
runAsManager.buildRunAs(any(Authentication.class), any(),
any(Collection.class))).thenReturn(runAs);
when(runAsManager.buildRunAs(any(Authentication.class), any(), any(Collection.class))).thenReturn(runAs);
Message<?> preSend = interceptor.preSend(message, channel);
assertThat(SecurityContextHolder.getContext().getAuthentication())
.isSameAs(runAs);
assertThat(SecurityContextHolder.getContext().getAuthentication()).isSameAs(runAs);
interceptor.afterSendCompletion(preSend, channel, true, new RuntimeException());
assertThat(SecurityContextHolder.getContext().getAuthentication()).isSameAs(
originalAuth);
assertThat(SecurityContextHolder.getContext().getAuthentication()).isSameAs(originalAuth);
}
@Test
@@ -174,4 +172,5 @@ public class ChannelSecurityInterceptorTests {
public void afterReceiveCompletionNullExceptionNoExceptionThrown() {
interceptor.afterReceiveCompletion(message, channel, null);
}
}

9
messaging/src/test/java/org/springframework/security/messaging/access/intercept/DefaultMessageSecurityMetadataSourceTests.java
View File

@@ -35,12 +35,16 @@ import static org.powermock.api.mockito.PowerMockito.when;
@RunWith(MockitoJUnitRunner.class)
public class DefaultMessageSecurityMetadataSourceTests {
@Mock
MessageMatcher<Object> matcher1;
@Mock
MessageMatcher<Object> matcher2;
@Mock
Message<?> message;
@Mock
Authentication authentication;
@@ -55,8 +59,8 @@ public class DefaultMessageSecurityMetadataSourceTests {
@Before
public void setup() {
messageMap = new LinkedHashMap<>();
messageMap.put(matcher1, Arrays.<ConfigAttribute> asList(config1));
messageMap.put(matcher2, Arrays.<ConfigAttribute> asList(config2));
messageMap.put(matcher1, Arrays.<ConfigAttribute>asList(config1));
messageMap.put(matcher2, Arrays.<ConfigAttribute>asList(config2));
source = new DefaultMessageSecurityMetadataSource(messageMap);
}
@@ -94,4 +98,5 @@ public class DefaultMessageSecurityMetadataSourceTests {
public void supportsTrue() {
assertThat(source.supports(Message.class)).isTrue();
}
}

58
messaging/src/test/java/org/springframework/security/messaging/context/AuthenticationPrincipalArgumentResolverTests.java
View File

@@ -40,7 +40,9 @@ import org.springframework.util.ReflectionUtils;
*
*/
public class AuthenticationPrincipalArgumentResolverTests {
private Object expectedPrincipal;
private AuthenticationPrincipalArgumentResolver resolver;
@Before
@@ -82,38 +84,32 @@ public class AuthenticationPrincipalArgumentResolverTests {
@Test
public void resolveArgumentString() throws Exception {
setAuthenticationPrincipal("john");
assertThat(resolver.resolveArgument(showUserAnnotationString(), null)).isEqualTo(
expectedPrincipal);
assertThat(resolver.resolveArgument(showUserAnnotationString(), null)).isEqualTo(expectedPrincipal);
}
@Test
public void resolveArgumentPrincipalStringOnObject() throws Exception {
setAuthenticationPrincipal("john");
assertThat(resolver.resolveArgument(showUserAnnotationObject(), null)).isEqualTo(
expectedPrincipal);
assertThat(resolver.resolveArgument(showUserAnnotationObject(), null)).isEqualTo(expectedPrincipal);
}
@Test
public void resolveArgumentUserDetails() throws Exception {
setAuthenticationPrincipal(new User("user", "password",
AuthorityUtils.createAuthorityList("ROLE_USER")));
assertThat(resolver.resolveArgument(showUserAnnotationUserDetails(), null))
.isEqualTo(expectedPrincipal);
setAuthenticationPrincipal(new User("user", "password", AuthorityUtils.createAuthorityList("ROLE_USER")));
assertThat(resolver.resolveArgument(showUserAnnotationUserDetails(), null)).isEqualTo(expectedPrincipal);
}
@Test
public void resolveArgumentCustomUserPrincipal() throws Exception {
setAuthenticationPrincipal(new CustomUserPrincipal());
assertThat(
resolver.resolveArgument(showUserAnnotationCustomUserPrincipal(), null))
assertThat(resolver.resolveArgument(showUserAnnotationCustomUserPrincipal(), null))
.isEqualTo(expectedPrincipal);
}
@Test
public void resolveArgumentCustomAnnotation() throws Exception {
setAuthenticationPrincipal(new CustomUserPrincipal());
assertThat(resolver.resolveArgument(showUserCustomAnnotation(), null)).isEqualTo(
expectedPrincipal);
assertThat(resolver.resolveArgument(showUserCustomAnnotation(), null)).isEqualTo(expectedPrincipal);
}
@Test
@@ -121,8 +117,7 @@ public class AuthenticationPrincipalArgumentResolverTests {
CustomUserPrincipal principal = new CustomUserPrincipal();
setAuthenticationPrincipal(principal);
this.expectedPrincipal = principal.property;
assertThat(this.resolver.resolveArgument(showUserSpel(), null))
.isEqualTo(this.expectedPrincipal);
assertThat(this.resolver.resolveArgument(showUserSpel(), null)).isEqualTo(this.expectedPrincipal);
}
@Test
@@ -155,8 +150,7 @@ public class AuthenticationPrincipalArgumentResolverTests {
@Test
public void resolveArgumentObject() throws Exception {
setAuthenticationPrincipal(new Object());
assertThat(resolver.resolveArgument(showUserAnnotationObject(), null)).isEqualTo(
expectedPrincipal);
assertThat(resolver.resolveArgument(showUserAnnotationObject(), null)).isEqualTo(expectedPrincipal);
}
private MethodParameter showUserNoAnnotation() {
@@ -172,8 +166,7 @@ public class AuthenticationPrincipalArgumentResolverTests {
}
private MethodParameter showUserAnnotationCurrentUserErrorOnInvalidType() {
return getMethodParameter("showUserAnnotationCurrentUserErrorOnInvalidType",
String.class);
return getMethodParameter("showUserAnnotationCurrentUserErrorOnInvalidType", String.class);
}
private MethodParameter showUserAnnotationUserDetails() {
@@ -201,8 +194,7 @@ public class AuthenticationPrincipalArgumentResolverTests {
}
private MethodParameter getMethodParameter(String methodName, Class<?>... paramTypes) {
Method method = ReflectionUtils.findMethod(TestController.class, methodName,
paramTypes);
Method method = ReflectionUtils.findMethod(TestController.class, methodName, paramTypes);
return new MethodParameter(method, 0);
}
@@ -210,15 +202,18 @@ public class AuthenticationPrincipalArgumentResolverTests {
@Retention(RetentionPolicy.RUNTIME)
@AuthenticationPrincipal
static @interface CurrentUser {
}
@Target({ ElementType.PARAMETER })
@Retention(RetentionPolicy.RUNTIME)
@AuthenticationPrincipal(errorOnInvalidType = true)
static @interface CurrentUserErrorOnInvalidType {
}
public static class TestController {
public void showUserNoAnnotation(String user) {
}
@@ -229,8 +224,7 @@ public class AuthenticationPrincipalArgumentResolverTests {
@AuthenticationPrincipal(errorOnInvalidType = true) String user) {
}
public void showUserAnnotationCurrentUserErrorOnInvalidType(
@CurrentUserErrorOnInvalidType String user) {
public void showUserAnnotationCurrentUserErrorOnInvalidType(@CurrentUserErrorOnInvalidType String user) {
}
public void showUserAnnotation(@AuthenticationPrincipal UserDetails user) {
@@ -245,20 +239,23 @@ public class AuthenticationPrincipalArgumentResolverTests {
public void showUserAnnotation(@AuthenticationPrincipal Object user) {
}
public void showUserSpel(
@AuthenticationPrincipal(expression = "property") String user) {
public void showUserSpel(@AuthenticationPrincipal(expression = "property") String user) {
}
public void showUserSpelCopy(
@AuthenticationPrincipal(expression = "new org.springframework.security.messaging.context.AuthenticationPrincipalArgumentResolverTests$CopyUserPrincipal(#this)") CopyUserPrincipal user) {
public void showUserSpelCopy(@AuthenticationPrincipal(
expression = "new org.springframework.security.messaging.context.AuthenticationPrincipalArgumentResolverTests$CopyUserPrincipal(#this)") CopyUserPrincipal user) {
}
}
static class CustomUserPrincipal {
public final String property = "property";
}
public static class CopyUserPrincipal {
public final String property;
public CopyUserPrincipal(String property) {
@@ -273,8 +270,7 @@ public class AuthenticationPrincipalArgumentResolverTests {
public int hashCode() {
final int prime = 31;
int result = 1;
result = prime * result
+ ((this.property == null) ? 0 : this.property.hashCode());
result = prime * result + ((this.property == null) ? 0 : this.property.hashCode());
return result;
}
@@ -300,13 +296,13 @@ public class AuthenticationPrincipalArgumentResolverTests {
}
return true;
}
}
private void setAuthenticationPrincipal(Object principal) {
this.expectedPrincipal = principal;
SecurityContextHolder.getContext()
.setAuthentication(
new TestingAuthenticationToken(expectedPrincipal, "password",
"ROLE_USER"));
.setAuthentication(new TestingAuthenticationToken(expectedPrincipal, "password", "ROLE_USER"));
}
}

54
messaging/src/test/java/org/springframework/security/messaging/context/SecurityContextChannelInterceptorTests.java
View File

@@ -39,10 +39,13 @@ import static org.springframework.security.core.context.SecurityContextHolder.*;
@RunWith(MockitoJUnitRunner.class)
public class SecurityContextChannelInterceptorTests {
@Mock
MessageChannel channel;
@Mock
MessageHandler handler;
@Mock
Principal principal;
@@ -82,8 +85,7 @@ public class SecurityContextChannelInterceptorTests {
interceptor.preSend(messageBuilder.build(), channel);
assertThat(SecurityContextHolder.getContext().getAuthentication()).isSameAs(
authentication);
assertThat(SecurityContextHolder.getContext().getAuthentication()).isSameAs(authentication);
}
@Test
@@ -92,8 +94,7 @@ public class SecurityContextChannelInterceptorTests {
interceptor.preSend(messageBuilder.build(), channel);
assertThat(SecurityContextHolder.getContext().getAuthentication()).isSameAs(
authentication);
assertThat(SecurityContextHolder.getContext().getAuthentication()).isSameAs(authentication);
}
@Test(expected = IllegalArgumentException.class)
@@ -103,8 +104,8 @@ public class SecurityContextChannelInterceptorTests {
@Test
public void preSendUsesCustomAnonymous() {
expectedAnonymous = new AnonymousAuthenticationToken("customKey",
"customAnonymous", AuthorityUtils.createAuthorityList("ROLE_CUSTOM"));
expectedAnonymous = new AnonymousAuthenticationToken("customKey", "customAnonymous",
AuthorityUtils.createAuthorityList("ROLE_CUSTOM"));
interceptor.setAnonymousAuthentication(expectedAnonymous);
interceptor.preSend(messageBuilder.build(), channel);
@@ -160,8 +161,7 @@ public class SecurityContextChannelInterceptorTests {
interceptor.beforeHandle(messageBuilder.build(), channel, handler);
assertThat(SecurityContextHolder.getContext().getAuthentication()).isSameAs(
authentication);
assertThat(SecurityContextHolder.getContext().getAuthentication()).isSameAs(authentication);
}
// SEC-2845
@@ -201,20 +201,17 @@ public class SecurityContextChannelInterceptorTests {
// SEC-2829
@Test
public void restoresOriginalContext() {
TestingAuthenticationToken original = new TestingAuthenticationToken("original",
"original", "ROLE_USER");
TestingAuthenticationToken original = new TestingAuthenticationToken("original", "original", "ROLE_USER");
SecurityContextHolder.getContext().setAuthentication(original);
messageBuilder.setHeader(SimpMessageHeaderAccessor.USER_HEADER, authentication);
interceptor.beforeHandle(messageBuilder.build(), channel, handler);
assertThat(SecurityContextHolder.getContext().getAuthentication()).isSameAs(
authentication);
assertThat(SecurityContextHolder.getContext().getAuthentication()).isSameAs(authentication);
interceptor.afterMessageHandled(messageBuilder.build(), channel, handler, null);
assertThat(SecurityContextHolder.getContext().getAuthentication()).isSameAs(
original);
assertThat(SecurityContextHolder.getContext().getAuthentication()).isSameAs(original);
}
/**
@@ -223,48 +220,41 @@ public class SecurityContextChannelInterceptorTests {
*/
@Test
public void restoresOriginalContextNestedThreeDeep() {
AnonymousAuthenticationToken anonymous = new AnonymousAuthenticationToken("key",
"anonymous", AuthorityUtils.createAuthorityList("ROLE_USER"));
AnonymousAuthenticationToken anonymous = new AnonymousAuthenticationToken("key", "anonymous",
AuthorityUtils.createAuthorityList("ROLE_USER"));
TestingAuthenticationToken origional = new TestingAuthenticationToken("original",
"origional", "ROLE_USER");
TestingAuthenticationToken origional = new TestingAuthenticationToken("original", "origional", "ROLE_USER");
SecurityContextHolder.getContext().setAuthentication(origional);
messageBuilder.setHeader(SimpMessageHeaderAccessor.USER_HEADER, authentication);
interceptor.beforeHandle(messageBuilder.build(), channel, handler);
assertThat(SecurityContextHolder.getContext().getAuthentication()).isSameAs(
authentication);
assertThat(SecurityContextHolder.getContext().getAuthentication()).isSameAs(authentication);
// start send websocket
messageBuilder.setHeader(SimpMessageHeaderAccessor.USER_HEADER, null);
interceptor.beforeHandle(messageBuilder.build(), channel, handler);
assertThat(SecurityContextHolder.getContext().getAuthentication().getName())
.isEqualTo(anonymous.getName());
assertThat(SecurityContextHolder.getContext().getAuthentication().getName()).isEqualTo(anonymous.getName());
interceptor.afterMessageHandled(messageBuilder.build(), channel, handler, null);
assertThat(SecurityContextHolder.getContext().getAuthentication()).isSameAs(
authentication);
assertThat(SecurityContextHolder.getContext().getAuthentication()).isSameAs(authentication);
// end send websocket
interceptor.afterMessageHandled(messageBuilder.build(), channel, handler, null);
assertThat(SecurityContextHolder.getContext().getAuthentication()).isSameAs(
origional);
assertThat(SecurityContextHolder.getContext().getAuthentication()).isSameAs(origional);
}
private void assertAnonymous() {
Authentication currentAuthentication = SecurityContextHolder.getContext()
.getAuthentication();
assertThat(currentAuthentication)
.isInstanceOf(AnonymousAuthenticationToken.class);
Authentication currentAuthentication = SecurityContextHolder.getContext().getAuthentication();
assertThat(currentAuthentication).isInstanceOf(AnonymousAuthenticationToken.class);
AnonymousAuthenticationToken anonymous = (AnonymousAuthenticationToken) currentAuthentication;
assertThat(anonymous.getName()).isEqualTo(expectedAnonymous.getName());
assertThat(anonymous.getAuthorities()).containsOnlyElementsOf(
expectedAnonymous.getAuthorities());
assertThat(anonymous.getAuthorities()).containsOnlyElementsOf(expectedAnonymous.getAuthorities());
assertThat(anonymous.getKeyHash()).isEqualTo(expectedAnonymous.getKeyHash());
}
}

164
messaging/src/test/java/org/springframework/security/messaging/handler/invocation/ResolvableMethod.java
View File

@@ -57,27 +57,29 @@ import org.springframework.util.ReflectionUtils;
import static java.util.stream.Collectors.joining;
/**
* NOTE: This class is a replica of the same class in spring-web so it can
* be used for tests in spring-messaging.
* NOTE: This class is a replica of the same class in spring-web so it can be used for
* tests in spring-messaging.
*
* <p>Convenience class to resolve method parameters from hints.
* <p>
* Convenience class to resolve method parameters from hints.
*
* <h1>Background</h1>
*
* <p>When testing annotated methods we create test classes such as
* "TestController" with a diverse range of method signatures representing
* supported annotations and argument types. It becomes challenging to use
* naming strategies to keep track of methods and arguments especially in
* combination with variables for reflection metadata.
* <p>
* When testing annotated methods we create test classes such as "TestController" with a
* diverse range of method signatures representing supported annotations and argument
* types. It becomes challenging to use naming strategies to keep track of methods and
* arguments especially in combination with variables for reflection metadata.
*
* <p>The idea with {@link ResolvableMethod} is NOT to rely on naming techniques
* but to use hints to zero in on method parameters. Such hints can be strongly
* typed and explicit about what is being tested.
* <p>
* The idea with {@link ResolvableMethod} is NOT to rely on naming techniques but to use
* hints to zero in on method parameters. Such hints can be strongly typed and explicit
* about what is being tested.
*
* <h2>1. Declared Return Type</h2>
*
* When testing return types it's likely to have many methods with a unique
* return type, possibly with or without an annotation.
* When testing return types it's likely to have many methods with a unique return type,
* possibly with or without an annotation.
*
* <pre>
* import static org.springframework.web.method.ResolvableMethod.on;
@@ -100,8 +102,8 @@ import static java.util.stream.Collectors.joining;
*
* <h2>2. Method Arguments</h2>
*
* When testing method arguments it's more likely to have one or a small number
* of methods with a wide array of argument types and parameter annotations.
* When testing method arguments it's more likely to have one or a small number of methods
* with a wide array of argument types and parameter annotations.
*
* <pre>
* import static org.springframework.web.method.MvcAnnotationPredicates.requestParam;
@@ -136,16 +138,13 @@ public class ResolvableMethod {
// Matches ValueConstants.DEFAULT_NONE (spring-web and spring-messaging)
private static final String DEFAULT_VALUE_NONE = "\n\t\t\n\t\t\n\uE000\uE001\uE002\n\t\t\t\t\n";
private final Method method;
private ResolvableMethod(Method method) {
Assert.notNull(method, "'method' is required");
this.method = method;
}
/**
* Return the resolved method.
*/
@@ -188,8 +187,8 @@ public class ResolvableMethod {
}
/**
* Filter on method arguments with annotation.
* See {@link org.springframework.web.method.MvcAnnotationPredicates}.
* Filter on method arguments with annotation. See
* {@link org.springframework.web.method.MvcAnnotationPredicates}.
*/
@SafeVarargs
public final ArgResolver annot(Predicate<MethodParameter>... filter) {
@@ -210,25 +209,21 @@ public class ResolvableMethod {
return new ArgResolver().annotNotPresent(annotationTypes);
}
@Override
public String toString() {
return "ResolvableMethod=" + formatMethod();
}
private String formatMethod() {
return (method().getName() +
Arrays.stream(this.method.getParameters())
.map(this::formatParameter)
.collect(joining(",\n\t", "(\n\t", "\n)")));
return (method().getName() + Arrays.stream(this.method.getParameters()).map(this::formatParameter)
.collect(joining(",\n\t", "(\n\t", "\n)")));
}
private String formatParameter(Parameter param) {
Annotation[] anns = param.getAnnotations();
return (anns.length > 0 ?
Arrays.stream(anns).map(this::formatAnnotation).collect(joining(",", "[", "]")) + " " + param :
param.toString());
return (anns.length > 0
? Arrays.stream(anns).map(this::formatAnnotation).collect(joining(",", "[", "]")) + " " + param
: param.toString());
}
private String formatAnnotation(Annotation annotation) {
@@ -242,8 +237,8 @@ public class ResolvableMethod {
}
private static ResolvableType toResolvableType(Class<?> type, Class<?>... generics) {
return (ObjectUtils.isEmpty(generics) ? ResolvableType.forClass(type) :
ResolvableType.forClassWithGenerics(type, generics));
return (ObjectUtils.isEmpty(generics) ? ResolvableType.forClass(type)
: ResolvableType.forClassWithGenerics(type, generics));
}
private static ResolvableType toResolvableType(Class<?> type, ResolvableType generic, ResolvableType... generics) {
@@ -253,7 +248,6 @@ public class ResolvableMethod {
return ResolvableType.forClassWithGenerics(type, genericTypes);
}
/**
* Create a {@code ResolvableMethod} builder for the given handler class.
*/
@@ -261,7 +255,6 @@ public class ResolvableMethod {
return new Builder<>(objectClass);
}
/**
* Builder for {@code ResolvableMethod}.
*/
@@ -271,13 +264,11 @@ public class ResolvableMethod {
private final List<Predicate<Method>> filters = new ArrayList<>(4);
private Builder(Class<?> objectClass) {
Assert.notNull(objectClass, "Class must not be null");
this.objectClass = objectClass;
}
private void addFilter(String message, Predicate<Method> filter) {
this.filters.add(new LabeledPredicate<>(message, filter));
}
@@ -294,15 +285,14 @@ public class ResolvableMethod {
* Filter on methods with the given parameter types.
*/
public Builder<T> argTypes(Class<?>... argTypes) {
addFilter("argTypes=" + Arrays.toString(argTypes), method ->
ObjectUtils.isEmpty(argTypes) ? method.getParameterCount() == 0 :
Arrays.equals(method.getParameterTypes(), argTypes));
addFilter("argTypes=" + Arrays.toString(argTypes), method -> ObjectUtils.isEmpty(argTypes)
? method.getParameterCount() == 0 : Arrays.equals(method.getParameterTypes(), argTypes));
return this;
}
/**
* Filter on annotated methods.
* See {@link org.springframework.web.method.MvcAnnotationPredicates}.
* Filter on annotated methods. See
* {@link org.springframework.web.method.MvcAnnotationPredicates}.
*/
@SafeVarargs
public final Builder<T> annot(Predicate<Method>... filters) {
@@ -312,15 +302,14 @@ public class ResolvableMethod {
/**
* Filter on methods annotated with the given annotation type.
* @see #annot(Predicate[])
* See {@link org.springframework.web.method.MvcAnnotationPredicates}.
* @see #annot(Predicate[]) See
* {@link org.springframework.web.method.MvcAnnotationPredicates}.
*/
@SafeVarargs
public final Builder<T> annotPresent(Class<? extends Annotation>... annotationTypes) {
String message = "annotationPresent=" + Arrays.toString(annotationTypes);
addFilter(message, method ->
Arrays.stream(annotationTypes).allMatch(annotType ->
AnnotatedElementUtils.findMergedAnnotation(method, annotType) != null));
addFilter(message, method -> Arrays.stream(annotationTypes)
.allMatch(annotType -> AnnotatedElementUtils.findMergedAnnotation(method, annotType) != null));
return this;
}
@@ -332,8 +321,8 @@ public class ResolvableMethod {
String message = "annotationNotPresent=" + Arrays.toString(annotationTypes);
addFilter(message, method -> {
if (annotationTypes.length != 0) {
return Arrays.stream(annotationTypes).noneMatch(annotType ->
AnnotatedElementUtils.findMergedAnnotation(method, annotType) != null);
return Arrays.stream(annotationTypes).noneMatch(
annotType -> AnnotatedElementUtils.findMergedAnnotation(method, annotType) != null);
}
else {
return method.getAnnotations().length == 0;
@@ -373,10 +362,11 @@ public class ResolvableMethod {
}
/**
* Build a {@code ResolvableMethod} from the provided filters which must
* resolve to a unique, single method.
* <p>See additional resolveXxx shortcut methods going directly to
* {@link Method} or return type parameter.
* Build a {@code ResolvableMethod} from the provided filters which must resolve
* to a unique, single method.
* <p>
* See additional resolveXxx shortcut methods going directly to {@link Method} or
* return type parameter.
* @throws IllegalStateException for no match or multiple matches
*/
public ResolvableMethod method() {
@@ -391,8 +381,8 @@ public class ResolvableMethod {
}
private String formatMethods(Set<Method> methods) {
return "\nMatched:\n" + methods.stream()
.map(Method::toGenericString).collect(joining(",\n\t", "[\n\t", "\n]"));
return "\nMatched:\n"
+ methods.stream().map(Method::toGenericString).collect(joining(",\n\t", "[\n\t", "\n]"));
}
public ResolvableMethod mockCall(Consumer<T> invoker) {
@@ -403,12 +393,12 @@ public class ResolvableMethod {
return new ResolvableMethod(method);
}
// Build & resolve shortcuts...
/**
* Resolve and return the {@code Method} equivalent to:
* <p>{@code build().method()}
* <p>
* {@code build().method()}
*/
public final Method resolveMethod() {
return method().method();
@@ -416,7 +406,8 @@ public class ResolvableMethod {
/**
* Resolve and return the {@code Method} equivalent to:
* <p>{@code named(methodName).build().method()}
* <p>
* {@code named(methodName).build().method()}
*/
public Method resolveMethod(String methodName) {
return named(methodName).method().method();
@@ -424,7 +415,8 @@ public class ResolvableMethod {
/**
* Resolve and return the declared return type equivalent to:
* <p>{@code build().returnType()}
* <p>
* {@code build().returnType()}
*/
public final MethodParameter resolveReturnType() {
return method().returnType();
@@ -432,7 +424,8 @@ public class ResolvableMethod {
/**
* Shortcut to the unique return type equivalent to:
* <p>{@code returning(returnType).build().returnType()}
* <p>
* {@code returning(returnType).build().returnType()}
* @param returnType the return type
* @param generics optional array of generic types
*/
@@ -442,7 +435,8 @@ public class ResolvableMethod {
/**
* Shortcut to the unique return type equivalent to:
* <p>{@code returning(returnType).build().returnType()}
* <p>
* {@code returning(returnType).build().returnType()}
* @param returnType the return type
* @param generic at least one generic type
* @param generics optional extra generic types
@@ -457,20 +451,17 @@ public class ResolvableMethod {
return returning(returnType).method().returnType();
}
@Override
public String toString() {
return "ResolvableMethod.Builder[\n" +
"\tobjectClass = " + this.objectClass.getName() + ",\n" +
"\tfilters = " + formatFilters() + "\n]";
return "ResolvableMethod.Builder[\n" + "\tobjectClass = " + this.objectClass.getName() + ",\n"
+ "\tfilters = " + formatFilters() + "\n]";
}
private String formatFilters() {
return this.filters.stream().map(Object::toString)
.collect(joining(",\n\t\t", "[\n\t\t", "\n\t]"));
return this.filters.stream().map(Object::toString).collect(joining(",\n\t\t", "[\n\t\t", "\n\t]"));
}
}
}
/**
* Predicate with a descriptive label.
@@ -481,13 +472,11 @@ public class ResolvableMethod {
private final Predicate<T> delegate;
private LabeledPredicate(String label, Predicate<T> delegate) {
this.label = label;
this.delegate = delegate;
}
@Override
public boolean test(T method) {
return this.delegate.test(method);
@@ -512,8 +501,8 @@ public class ResolvableMethod {
public String toString() {
return this.label;
}
}
}
/**
* Resolver for method arguments.
@@ -522,15 +511,14 @@ public class ResolvableMethod {
private final List<Predicate<MethodParameter>> filters = new ArrayList<>(4);
@SafeVarargs
private ArgResolver(Predicate<MethodParameter>... filter) {
this.filters.addAll(Arrays.asList(filter));
}
/**
* Filter on method arguments with annotations.
* See {@link org.springframework.web.method.MvcAnnotationPredicates}.
* Filter on method arguments with annotations. See
* {@link org.springframework.web.method.MvcAnnotationPredicates}.
*/
@SafeVarargs
public final ArgResolver annot(Predicate<MethodParameter>... filters) {
@@ -541,8 +529,8 @@ public class ResolvableMethod {
/**
* Filter on method arguments that have the given annotations.
* @param annotationTypes the annotation types
* @see #annot(Predicate[])
* See {@link org.springframework.web.method.MvcAnnotationPredicates}.
* @see #annot(Predicate[]) See
* {@link org.springframework.web.method.MvcAnnotationPredicates}.
*/
@SafeVarargs
public final ArgResolver annotPresent(Class<? extends Annotation>... annotationTypes) {
@@ -556,10 +544,9 @@ public class ResolvableMethod {
*/
@SafeVarargs
public final ArgResolver annotNotPresent(Class<? extends Annotation>... annotationTypes) {
this.filters.add(param ->
(annotationTypes.length > 0 ?
Arrays.stream(annotationTypes).noneMatch(param::hasParameterAnnotation) :
param.getParameterAnnotations().length == 0));
this.filters.add(param -> (annotationTypes.length > 0
? Arrays.stream(annotationTypes).noneMatch(param::hasParameterAnnotation)
: param.getParameterAnnotations().length == 0));
return this;
}
@@ -593,14 +580,12 @@ public class ResolvableMethod {
*/
public final MethodParameter arg() {
List<MethodParameter> matches = applyFilters();
Assert.state(!matches.isEmpty(), () ->
"No matching arg in method\n" + formatMethod());
Assert.state(matches.size() == 1, () ->
"Multiple matching args in method\n" + formatMethod() + "\nMatches:\n\t" + matches);
Assert.state(!matches.isEmpty(), () -> "No matching arg in method\n" + formatMethod());
Assert.state(matches.size() == 1,
() -> "Multiple matching args in method\n" + formatMethod() + "\nMatches:\n\t" + matches);
return matches.get(0);
}
private List<MethodParameter> applyFilters() {
List<MethodParameter> matches = new ArrayList<>();
for (int i = 0; i < method.getParameterCount(); i++) {
@@ -612,15 +597,14 @@ public class ResolvableMethod {
}
return matches;
}
}
}
private static class MethodInvocationInterceptor
implements org.springframework.cglib.proxy.MethodInterceptor, MethodInterceptor {
private Method invokedMethod;
Method getInvokedMethod() {
return this.invokedMethod;
}
@@ -642,6 +626,7 @@ public class ResolvableMethod {
public Object invoke(org.aopalliance.intercept.MethodInvocation inv) throws Throwable {
return intercept(inv.getThis(), inv.getMethod(), inv.getArguments(), null);
}
}
@SuppressWarnings("unchecked")
@@ -658,7 +643,7 @@ public class ResolvableMethod {
else {
Enhancer enhancer = new Enhancer();
enhancer.setSuperclass(type);
enhancer.setInterfaces(new Class<?>[] {Supplier.class});
enhancer.setInterfaces(new Class<?>[] { Supplier.class });
enhancer.setNamingPolicy(SpringNamingPolicy.INSTANCE);
enhancer.setCallbackType(org.springframework.cglib.proxy.MethodInterceptor.class);
@@ -679,12 +664,13 @@ public class ResolvableMethod {
proxy = ReflectionUtils.accessibleConstructor(proxyClass).newInstance();
}
catch (Throwable ex) {
throw new IllegalStateException("Unable to instantiate proxy " +
"via both Objenesis and default constructor fails as well", ex);
throw new IllegalStateException(
"Unable to instantiate proxy " + "via both Objenesis and default constructor fails as well",
ex);
}
}
((Factory) proxy).setCallbacks(new Callback[] {interceptor});
((Factory) proxy).setCallbacks(new Callback[] { interceptor });
return (T) proxy;
}
}

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

@@ -36,6 +36,7 @@ import static org.assertj.core.api.Assertions.*;
* @author Rob Winch
*/
public class AuthenticationPrincipalArgumentResolverTests {
private AuthenticationPrincipalArgumentResolver resolver = new AuthenticationPrincipalArgumentResolver();
@Test
@@ -52,9 +53,9 @@ public class AuthenticationPrincipalArgumentResolverTests {
@Test
public void resolveArgumentWhenAuthenticationPrincipalThenFound() {
Authentication authentication = TestAuthentication.authenticatedUser();
Mono<UserDetails> result = (Mono<UserDetails>) this.resolver.resolveArgument(arg0("authenticationPrincipalOnMonoUserDetails"), null)
.subscriberContext(ReactiveSecurityContextHolder.withAuthentication(authentication))
.block();
Mono<UserDetails> result = (Mono<UserDetails>) this.resolver
.resolveArgument(arg0("authenticationPrincipalOnMonoUserDetails"), null)
.subscriberContext(ReactiveSecurityContextHolder.withAuthentication(authentication)).block();
assertThat(result.block()).isEqualTo(authentication.getPrincipal());
}
@@ -70,9 +71,9 @@ public class AuthenticationPrincipalArgumentResolverTests {
@Test
public void resolveArgumentWhenMonoAndAuthenticationPrincipalThenFound() {
Authentication authentication = TestAuthentication.authenticatedUser();
Mono<UserDetails> result = (Mono<UserDetails>) this.resolver.resolveArgument(arg0("currentUserOnMonoUserDetails"), null)
.subscriberContext(ReactiveSecurityContextHolder.withAuthentication(authentication))
.block();
Mono<UserDetails> result = (Mono<UserDetails>) this.resolver
.resolveArgument(arg0("currentUserOnMonoUserDetails"), null)
.subscriberContext(ReactiveSecurityContextHolder.withAuthentication(authentication)).block();
assertThat(result.block()).isEqualTo(authentication.getPrincipal());
}
@@ -83,14 +84,15 @@ public class AuthenticationPrincipalArgumentResolverTests {
@Test
public void resolveArgumentWhenExpressionThenFound() {
Authentication authentication = TestAuthentication.authenticatedUser();
Mono<String> result = (Mono<String>) this.resolver.resolveArgument(arg0("authenticationPrincipalExpression"), null)
.subscriberContext(ReactiveSecurityContextHolder.withAuthentication(authentication))
.block();
Mono<String> result = (Mono<String>) this.resolver
.resolveArgument(arg0("authenticationPrincipalExpression"), null)
.subscriberContext(ReactiveSecurityContextHolder.withAuthentication(authentication)).block();
assertThat(result.block()).isEqualTo(authentication.getName());
}
@SuppressWarnings("unused")
private void authenticationPrincipalExpression(@AuthenticationPrincipal(expression = "username") Mono<String> username) {
private void authenticationPrincipalExpression(
@AuthenticationPrincipal(expression = "username") Mono<String> username) {
}
@Test
@@ -109,5 +111,8 @@ public class AuthenticationPrincipalArgumentResolverTests {
@AuthenticationPrincipal
@Retention(RetentionPolicy.RUNTIME)
@interface CurrentUser {}
@interface CurrentUser {
}
}

30
messaging/src/test/java/org/springframework/security/messaging/handler/invocation/reactive/CurrentSecurityContextArgumentResolverTests.java
View File

@@ -37,6 +37,7 @@ import static org.assertj.core.api.Assertions.assertThat;
* @author Rob Winch
*/
public class CurrentSecurityContextArgumentResolverTests {
private CurrentSecurityContextArgumentResolver resolver = new CurrentSecurityContextArgumentResolver();
@Test
@@ -46,16 +47,17 @@ public class CurrentSecurityContextArgumentResolverTests {
@Test
public void resolveArgumentWhenAuthenticationPrincipalAndEmptyContextThenNull() {
Object result = this.resolver.resolveArgument(arg0("currentSecurityContextOnMonoSecurityContext"), null).block();
Object result = this.resolver.resolveArgument(arg0("currentSecurityContextOnMonoSecurityContext"), null)
.block();
assertThat(result).isNull();
}
@Test
public void resolveArgumentWhenAuthenticationPrincipalThenFound() {
Authentication authentication = TestAuthentication.authenticatedUser();
Mono<SecurityContext> result = (Mono<SecurityContext>) this.resolver.resolveArgument(arg0("currentSecurityContextOnMonoSecurityContext"), null)
.subscriberContext(ReactiveSecurityContextHolder.withAuthentication(authentication))
.block();
Mono<SecurityContext> result = (Mono<SecurityContext>) this.resolver
.resolveArgument(arg0("currentSecurityContextOnMonoSecurityContext"), null)
.subscriberContext(ReactiveSecurityContextHolder.withAuthentication(authentication)).block();
assertThat(result.block().getAuthentication()).isEqualTo(authentication);
}
@@ -71,9 +73,9 @@ public class CurrentSecurityContextArgumentResolverTests {
@Test
public void resolveArgumentWhenMonoAndAuthenticationPrincipalThenFound() {
Authentication authentication = TestAuthentication.authenticatedUser();
Mono<UserDetails> result = (Mono<UserDetails>) this.resolver.resolveArgument(arg0("currentUserOnMonoUserDetails"), null)
.subscriberContext(ReactiveSecurityContextHolder.withAuthentication(authentication))
.block();
Mono<UserDetails> result = (Mono<UserDetails>) this.resolver
.resolveArgument(arg0("currentUserOnMonoUserDetails"), null)
.subscriberContext(ReactiveSecurityContextHolder.withAuthentication(authentication)).block();
assertThat(result.block()).isEqualTo(authentication.getPrincipal());
}
@@ -84,14 +86,15 @@ public class CurrentSecurityContextArgumentResolverTests {
@Test
public void resolveArgumentWhenExpressionThenFound() {
Authentication authentication = TestAuthentication.authenticatedUser();
Mono<String> result = (Mono<String>) this.resolver.resolveArgument(arg0("authenticationPrincipalExpression"), null)
.subscriberContext(ReactiveSecurityContextHolder.withAuthentication(authentication))
.block();
Mono<String> result = (Mono<String>) this.resolver
.resolveArgument(arg0("authenticationPrincipalExpression"), null)
.subscriberContext(ReactiveSecurityContextHolder.withAuthentication(authentication)).block();
assertThat(result.block()).isEqualTo(authentication.getName());
}
@SuppressWarnings("unused")
private void authenticationPrincipalExpression(@CurrentSecurityContext(expression = "authentication?.principal?.username") Mono<String> username) {
private void authenticationPrincipalExpression(
@CurrentSecurityContext(expression = "authentication?.principal?.username") Mono<String> username) {
}
@Test
@@ -110,5 +113,8 @@ public class CurrentSecurityContextArgumentResolverTests {
@CurrentSecurityContext(expression = "authentication?.principal")
@Retention(RetentionPolicy.RUNTIME)
@interface CurrentUser {}
@interface CurrentUser {
}
}

2
messaging/src/test/java/org/springframework/security/messaging/util/matcher/AndMessageMatcherTests.java
View File

@@ -30,6 +30,7 @@ import org.springframework.messaging.Message;
@RunWith(MockitoJUnitRunner.class)
public class AndMessageMatcherTests {
@Mock
private MessageMatcher<Object> delegate;
@@ -113,4 +114,5 @@ public class AndMessageMatcherTests {
assertThat(matcher.matches(message)).isFalse();
}
}

2
messaging/src/test/java/org/springframework/security/messaging/util/matcher/OrMessageMatcherTests.java
View File

@@ -30,6 +30,7 @@ import org.springframework.messaging.Message;
@RunWith(MockitoJUnitRunner.class)
public class OrMessageMatcherTests {
@Mock
private MessageMatcher<Object> delegate;
@@ -112,4 +113,5 @@ public class OrMessageMatcherTests {
assertThat(matcher.matches(message)).isTrue();
}
}

40
messaging/src/test/java/org/springframework/security/messaging/util/matcher/SimpDestinationMessageMatcherTests.java
View File

@@ -26,6 +26,7 @@ import org.springframework.util.AntPathMatcher;
import org.springframework.util.PathMatcher;
public class SimpDestinationMessageMatcherTests {
MessageBuilder<String> messageBuilder;
SimpDestinationMessageMatcher matcher;
@@ -55,8 +56,7 @@ public class SimpDestinationMessageMatcherTests {
@Test
public void matchesAllWithDestination() {
messageBuilder.setHeader(SimpMessageHeaderAccessor.DESTINATION_HEADER,
"/destination/1");
messageBuilder.setHeader(SimpMessageHeaderAccessor.DESTINATION_HEADER, "/destination/1");
assertThat(matcher.matches(messageBuilder.build())).isTrue();
}
@@ -65,8 +65,7 @@ public class SimpDestinationMessageMatcherTests {
public void matchesSpecificWithDestination() {
matcher = new SimpDestinationMessageMatcher("/destination/1");
messageBuilder.setHeader(SimpMessageHeaderAccessor.DESTINATION_HEADER,
"/destination/1");
messageBuilder.setHeader(SimpMessageHeaderAccessor.DESTINATION_HEADER, "/destination/1");
assertThat(matcher.matches(messageBuilder.build())).isTrue();
}
@@ -75,43 +74,36 @@ public class SimpDestinationMessageMatcherTests {
public void matchesFalseWithDestination() {
matcher = new SimpDestinationMessageMatcher("/nomatch");
messageBuilder.setHeader(SimpMessageHeaderAccessor.DESTINATION_HEADER,
"/destination/1");
messageBuilder.setHeader(SimpMessageHeaderAccessor.DESTINATION_HEADER, "/destination/1");
assertThat(matcher.matches(messageBuilder.build())).isFalse();
}
@Test
public void matchesFalseMessageTypeNotDisconnectType() {
matcher = SimpDestinationMessageMatcher.createMessageMatcher("/match",
pathMatcher);
matcher = SimpDestinationMessageMatcher.createMessageMatcher("/match", pathMatcher);
messageBuilder.setHeader(SimpMessageHeaderAccessor.MESSAGE_TYPE_HEADER,
SimpMessageType.DISCONNECT);
messageBuilder.setHeader(SimpMessageHeaderAccessor.MESSAGE_TYPE_HEADER, SimpMessageType.DISCONNECT);
assertThat(matcher.matches(messageBuilder.build())).isFalse();
}
@Test
public void matchesTrueMessageType() {
matcher = SimpDestinationMessageMatcher.createMessageMatcher("/match",
pathMatcher);
matcher = SimpDestinationMessageMatcher.createMessageMatcher("/match", pathMatcher);
messageBuilder.setHeader(SimpMessageHeaderAccessor.DESTINATION_HEADER, "/match");
messageBuilder.setHeader(SimpMessageHeaderAccessor.MESSAGE_TYPE_HEADER,
SimpMessageType.MESSAGE);
messageBuilder.setHeader(SimpMessageHeaderAccessor.MESSAGE_TYPE_HEADER, SimpMessageType.MESSAGE);
assertThat(matcher.matches(messageBuilder.build())).isTrue();
}
@Test
public void matchesTrueSubscribeType() {
matcher = SimpDestinationMessageMatcher.createSubscribeMatcher("/match",
pathMatcher);
matcher = SimpDestinationMessageMatcher.createSubscribeMatcher("/match", pathMatcher);
messageBuilder.setHeader(SimpMessageHeaderAccessor.DESTINATION_HEADER, "/match");
messageBuilder.setHeader(SimpMessageHeaderAccessor.MESSAGE_TYPE_HEADER,
SimpMessageType.SUBSCRIBE);
messageBuilder.setHeader(SimpMessageHeaderAccessor.MESSAGE_TYPE_HEADER, SimpMessageType.SUBSCRIBE);
assertThat(matcher.matches(messageBuilder.build())).isTrue();
}
@@ -121,8 +113,7 @@ public class SimpDestinationMessageMatcherTests {
matcher = new SimpDestinationMessageMatcher("/match");
messageBuilder.setHeader(SimpMessageHeaderAccessor.DESTINATION_HEADER, "/match");
messageBuilder.setHeader(SimpMessageHeaderAccessor.MESSAGE_TYPE_HEADER,
SimpMessageType.MESSAGE);
messageBuilder.setHeader(SimpMessageHeaderAccessor.MESSAGE_TYPE_HEADER, SimpMessageType.MESSAGE);
assertThat(matcher.matches(messageBuilder.build())).isTrue();
}
@@ -132,8 +123,7 @@ public class SimpDestinationMessageMatcherTests {
matcher = new SimpDestinationMessageMatcher("/topics/{topic}/**");
messageBuilder.setHeader(SimpMessageHeaderAccessor.DESTINATION_HEADER, "/topics/someTopic/sub1");
messageBuilder.setHeader(SimpMessageHeaderAccessor.MESSAGE_TYPE_HEADER,
SimpMessageType.MESSAGE);
messageBuilder.setHeader(SimpMessageHeaderAccessor.MESSAGE_TYPE_HEADER, SimpMessageType.MESSAGE);
assertThat(matcher.extractPathVariables(messageBuilder.build()).get("topic")).isEqualTo("someTopic");
}
@@ -146,11 +136,9 @@ public class SimpDestinationMessageMatcherTests {
@Test
public void typeConstructorParameterIsTransmitted() {
matcher = SimpDestinationMessageMatcher.createMessageMatcher("/match",
pathMatcher);
matcher = SimpDestinationMessageMatcher.createMessageMatcher("/match", pathMatcher);
MessageMatcher<Object> expectedTypeMatcher = new SimpMessageTypeMatcher(
SimpMessageType.MESSAGE);
MessageMatcher<Object> expectedTypeMatcher = new SimpMessageTypeMatcher(SimpMessageType.MESSAGE);
assertThat(matcher.getMessageTypeMatcher()).isEqualTo(expectedTypeMatcher);

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

@@ -25,6 +25,7 @@ import org.springframework.messaging.simp.SimpMessageType;
import org.springframework.messaging.support.MessageBuilder;
public class SimpMessageTypeMatcherTests {
private SimpMessageTypeMatcher matcher;
@Before
@@ -39,20 +40,16 @@ public class SimpMessageTypeMatcherTests {
@Test
public void matchesMessageMessageTrue() {
Message<String> message = MessageBuilder
.withPayload("Hi")
.setHeader(SimpMessageHeaderAccessor.MESSAGE_TYPE_HEADER,
SimpMessageType.MESSAGE).build();
Message<String> message = MessageBuilder.withPayload("Hi")
.setHeader(SimpMessageHeaderAccessor.MESSAGE_TYPE_HEADER, SimpMessageType.MESSAGE).build();
assertThat(matcher.matches(message)).isTrue();
}
@Test
public void matchesMessageConnectFalse() {
Message<String> message = MessageBuilder
.withPayload("Hi")
.setHeader(SimpMessageHeaderAccessor.MESSAGE_TYPE_HEADER,
SimpMessageType.CONNECT).build();
Message<String> message = MessageBuilder.withPayload("Hi")
.setHeader(SimpMessageHeaderAccessor.MESSAGE_TYPE_HEADER, SimpMessageType.CONNECT).build();
assertThat(matcher.matches(message)).isFalse();
}
@@ -63,4 +60,5 @@ public class SimpMessageTypeMatcherTests {
assertThat(matcher.matches(message)).isFalse();
}
}

5
messaging/src/test/java/org/springframework/security/messaging/web/csrf/CsrfChannelInterceptorTests.java
View File

@@ -35,6 +35,7 @@ import org.springframework.security.web.csrf.MissingCsrfTokenException;
@RunWith(MockitoJUnitRunner.class)
public class CsrfChannelInterceptorTests {
@Mock
MessageChannel channel;
@@ -125,8 +126,7 @@ public class CsrfChannelInterceptorTests {
@Test(expected = InvalidCsrfTokenException.class)
public void preSendInvalidToken() {
messageHeaders.setNativeHeader(token.getHeaderName(), token.getToken()
+ "invalid");
messageHeaders.setNativeHeader(token.getHeaderName(), token.getToken() + "invalid");
interceptor.preSend(message(), channel);
}
@@ -149,4 +149,5 @@ public class CsrfChannelInterceptorTests {
Map<String, Object> headersToCopy = messageHeaders.toMap();
return MessageBuilder.withPayload("hi").copyHeaders(headersToCopy).build();
}
}

3
messaging/src/test/java/org/springframework/security/messaging/web/socket/server/CsrfTokenHandshakeInterceptorTests.java
View File

@@ -34,13 +34,14 @@ import java.util.Map;
import static org.assertj.core.api.Assertions.assertThat;
/**
*
* @author Rob Winch
*/
@RunWith(MockitoJUnitRunner.class)
public class CsrfTokenHandshakeInterceptorTests {
@Mock
WebSocketHandler wsHandler;
@Mock
ServerHttpResponse response;