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

ServerWebExchangeMatcher returns Mono<MatchResult>

Browse Source
This commit is contained in:
Rob Winch
2017-05-23 14:36:25 -05:00
parent 39f7a14126
commit 3440909fc9
11 changed files with 143 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
webflux/src/test/java/org/springframework/security/web/server/authorization/DelegatingReactiveAuthorizationManagerTests.java Normal file
View File

@@ -0,0 +1,90 @@
/*
*
* * Copyright 2002-2017 the original author or authors.
* *
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
* * You may obtain a copy of the License at
* *
* * http://www.apache.org/licenses/LICENSE-2.0
* *
* * Unless required by applicable law or agreed to in writing, software
* * distributed under the License is distributed on an "AS IS" BASIS,
* * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* * See the License for the specific language governing permissions and
* * limitations under the License.
*
*/
package org.springframework.security.web.server.authorization;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner;
import org.springframework.security.authorization.AuthorityAuthorizationManager;
import org.springframework.security.authorization.AuthorizationDecision;
import org.springframework.security.core.Authentication;
import org.springframework.security.web.server.util.matcher.ServerWebExchangeMatcher;
import org.springframework.web.server.ServerWebExchange;
import reactor.core.publisher.Mono;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.verifyZeroInteractions;
import static org.mockito.Mockito.when;
/**
* @author Rob Winch
* @since 5.0
*/
@RunWith(MockitoJUnitRunner.class)
public class DelegatingReactiveAuthorizationManagerTests {
@Mock
ServerWebExchangeMatcher match1;
@Mock
ServerWebExchangeMatcher match2;
@Mock
AuthorityAuthorizationManager<AuthorizationContext> delegate1;
@Mock
AuthorityAuthorizationManager<AuthorizationContext> delegate2;
@Mock
ServerWebExchange exchange;
@Mock
Mono<Authentication> authentication;
@Mock
AuthorizationDecision decision;
DelegatingReactiveAuthorizationManager manager;
@Before
public void setup() {
manager = DelegatingReactiveAuthorizationManager.builder()
.add(match1, delegate1)
.add(match2, delegate2)
.build();
}
@Test
public void checkWhenFirstMatchesThenNoMoreMatchersAndNoMoreDelegatesInvoked() {
when(match1.matches(any())).thenReturn(ServerWebExchangeMatcher.MatchResult.match());
when(delegate1.check(eq(authentication), any(AuthorizationContext.class))).thenReturn(Mono.just(decision));
assertThat(manager.check(authentication, exchange).block()).isEqualTo(decision);
verifyZeroInteractions(match2, delegate2);
}
@Test
public void checkWhenSecondMatchesThenNoMoreMatchersAndNoMoreDelegatesInvoked() {
when(match1.matches(any())).thenReturn(ServerWebExchangeMatcher.MatchResult.notMatch());
when(match2.matches(any())).thenReturn(ServerWebExchangeMatcher.MatchResult.match());
when(delegate2.check(eq(authentication), any(AuthorizationContext.class))).thenReturn(Mono.just(decision));
assertThat(manager.check(authentication, exchange).block()).isEqualTo(decision);
verifyZeroInteractions(delegate1);
}
}

8
webflux/src/test/java/org/springframework/security/web/server/util/matcher/AndServerWebExchangeMatcherTests.java
View File

@@ -61,7 +61,7 @@ public class AndServerWebExchangeMatcherTests {
when(matcher1.matches(exchange)).thenReturn(ServerWebExchangeMatcher.MatchResult.match(params1));
when(matcher2.matches(exchange)).thenReturn(ServerWebExchangeMatcher.MatchResult.match(params2));
ServerWebExchangeMatcher.MatchResult matches = matcher.matches(exchange);
ServerWebExchangeMatcher.MatchResult matches = matcher.matches(exchange).block();
assertThat(matches.isMatch()).isTrue();
assertThat(matches.getVariables()).hasSize(2);
@@ -76,7 +76,7 @@ public class AndServerWebExchangeMatcherTests {
public void matchesWhenFalseFalseThenFalseAndMatcher2NotInvoked() throws Exception {
when(matcher1.matches(exchange)).thenReturn(ServerWebExchangeMatcher.MatchResult.notMatch());
ServerWebExchangeMatcher.MatchResult matches = matcher.matches(exchange);
ServerWebExchangeMatcher.MatchResult matches = matcher.matches(exchange).block();
assertThat(matches.isMatch()).isFalse();
assertThat(matches.getVariables()).isEmpty();
@@ -91,7 +91,7 @@ public class AndServerWebExchangeMatcherTests {
when(matcher1.matches(exchange)).thenReturn(ServerWebExchangeMatcher.MatchResult.match(params));
when(matcher2.matches(exchange)).thenReturn(ServerWebExchangeMatcher.MatchResult.notMatch());
ServerWebExchangeMatcher.MatchResult matches = matcher.matches(exchange);
ServerWebExchangeMatcher.MatchResult matches = matcher.matches(exchange).block();
assertThat(matches.isMatch()).isFalse();
assertThat(matches.getVariables()).isEmpty();
@@ -104,7 +104,7 @@ public class AndServerWebExchangeMatcherTests {
public void matchesWhenFalseTrueThenFalse() throws Exception {
when(matcher1.matches(exchange)).thenReturn(ServerWebExchangeMatcher.MatchResult.notMatch());
ServerWebExchangeMatcher.MatchResult matches = matcher.matches(exchange);
ServerWebExchangeMatcher.MatchResult matches = matcher.matches(exchange).block();
assertThat(matches.isMatch()).isFalse();
assertThat(matches.getVariables()).isEmpty();

6
webflux/src/test/java/org/springframework/security/web/server/util/matcher/OrServerWebExchangeMatcherTests.java
View File

@@ -59,7 +59,7 @@ public class OrServerWebExchangeMatcherTests {
when(matcher1.matches(exchange)).thenReturn(ServerWebExchangeMatcher.MatchResult.notMatch());
when(matcher2.matches(exchange)).thenReturn(ServerWebExchangeMatcher.MatchResult.notMatch());
ServerWebExchangeMatcher.MatchResult matches = matcher.matches(exchange);
ServerWebExchangeMatcher.MatchResult matches = matcher.matches(exchange).block();
assertThat(matches.isMatch()).isFalse();
assertThat(matches.getVariables()).isEmpty();
@@ -73,7 +73,7 @@ public class OrServerWebExchangeMatcherTests {
Map<String, Object> params = Collections.singletonMap("foo", "bar");
when(matcher1.matches(exchange)).thenReturn(ServerWebExchangeMatcher.MatchResult.match(params));
ServerWebExchangeMatcher.MatchResult matches = matcher.matches(exchange);
ServerWebExchangeMatcher.MatchResult matches = matcher.matches(exchange).block();
assertThat(matches.isMatch()).isTrue();
assertThat(matches.getVariables()).isEqualTo(params);
@@ -88,7 +88,7 @@ public class OrServerWebExchangeMatcherTests {
when(matcher1.matches(exchange)).thenReturn(ServerWebExchangeMatcher.MatchResult.notMatch());
when(matcher2.matches(exchange)).thenReturn(ServerWebExchangeMatcher.MatchResult.match(params));
ServerWebExchangeMatcher.MatchResult matches = matcher.matches(exchange);
ServerWebExchangeMatcher.MatchResult matches = matcher.matches(exchange).block();
assertThat(matches.isMatch()).isTrue();
assertThat(matches.getVariables()).isEqualTo(params);

8
webflux/src/test/java/org/springframework/security/web/server/util/matcher/PathMatcherServerWebExchangeMatcherTests.java
View File

@@ -75,14 +75,14 @@ public class PathMatcherServerWebExchangeMatcherTests {
public void matchesWhenPathMatcherTrueThenReturnTrue() {
when(pathMatcher.match(pattern, path)).thenReturn(true);
assertThat(matcher.matches(exchange).isMatch()).isTrue();
assertThat(matcher.matches(exchange).block().isMatch()).isTrue();
}
@Test
public void matchesWhenPathMatcherFalseThenReturnFalse() {
when(pathMatcher.match(pattern, path)).thenReturn(false);
assertThat(matcher.matches(exchange).isMatch()).isFalse();
assertThat(matcher.matches(exchange).block().isMatch()).isFalse();
verify(pathMatcher).match(pattern, path);
}
@@ -93,7 +93,7 @@ public class PathMatcherServerWebExchangeMatcherTests {
matcher.setPathMatcher(pathMatcher);
when(pathMatcher.match(pattern, path)).thenReturn(true);
assertThat(matcher.matches(exchange).isMatch()).isTrue();
assertThat(matcher.matches(exchange).block().isMatch()).isTrue();
}
@Test
@@ -103,7 +103,7 @@ public class PathMatcherServerWebExchangeMatcherTests {
matcher = new PathMatcherServerWebExchangeMatcher(pattern, method);
matcher.setPathMatcher(pathMatcher);
assertThat(matcher.matches(exchange).isMatch()).isFalse();
assertThat(matcher.matches(exchange).block().isMatch()).isFalse();
verifyZeroInteractions(pathMatcher);
}

12
webflux/src/test/java/org/springframework/security/web/server/util/matcher/ServerWebExchangeMatchersTests.java
View File

@@ -39,34 +39,34 @@ public class ServerWebExchangeMatchersTests {
@Test
public void antMatchersWhenSingleAndSamePatternThenMatches() throws Exception {
assertThat(antMatchers("/").matches(exchange).isMatch()).isTrue();
assertThat(antMatchers("/").matches(exchange).block().isMatch()).isTrue();
}
@Test
public void antMatchersWhenSingleAndSamePatternAndMethodThenMatches() throws Exception {
assertThat(antMatchers(HttpMethod.GET, "/").matches(exchange).isMatch()).isTrue();
assertThat(antMatchers(HttpMethod.GET, "/").matches(exchange).block().isMatch()).isTrue();
}
@Test
public void antMatchersWhenSingleAndSamePatternAndDiffMethodThenDoesNotMatch() throws Exception {
assertThat(antMatchers(HttpMethod.POST, "/").matches(exchange).isMatch()).isFalse();
assertThat(antMatchers(HttpMethod.POST, "/").matches(exchange).block().isMatch()).isFalse();
}
@Test
public void antMatchersWhenSingleAndDifferentPatternThenDoesNotMatch() throws Exception {
assertThat(antMatchers("/foobar").matches(exchange).isMatch()).isFalse();
assertThat(antMatchers("/foobar").matches(exchange).block().isMatch()).isFalse();
}
@Test
public void antMatchersWhenMultiThenMatches() throws Exception {
assertThat(antMatchers("/foobar", "/").matches(exchange).isMatch()).isTrue();
assertThat(antMatchers("/foobar", "/").matches(exchange).block().isMatch()).isTrue();
}
@Test
public void anyExchangeWhenMockThenMatches() {
ServerWebExchange mockExchange = mock(ServerWebExchange.class);
assertThat(anyExchange().matches(mockExchange).isMatch()).isTrue();
assertThat(anyExchange().matches(mockExchange).block().isMatch()).isTrue();
verifyZeroInteractions(mockExchange);
}