From e5eda240541e1308ec7433d209a8f0a66acd9d54 Mon Sep 17 00:00:00 2001 From: Rob Winch Date: Wed, 31 May 2017 16:09:54 -0500 Subject: [PATCH] Add ServerWebExchangeMatcherEntry --- .../web/server/AuthorizeExchangeBuilder.java | 3 +- ...elegatingReactiveAuthorizationManager.java | 21 +++++----- .../ServerWebExchangeMatcherEntry.java | 41 +++++++++++++++++++ ...tingReactiveAuthorizationManagerTests.java | 5 ++- 4 files changed, 57 insertions(+), 13 deletions(-) create mode 100644 webflux/src/main/java/org/springframework/security/web/server/util/matcher/ServerWebExchangeMatcherEntry.java diff --git a/config/src/main/java/org/springframework/security/config/web/server/AuthorizeExchangeBuilder.java b/config/src/main/java/org/springframework/security/config/web/server/AuthorizeExchangeBuilder.java index 12a787d89c..cea45f4302 100644 --- a/config/src/main/java/org/springframework/security/config/web/server/AuthorizeExchangeBuilder.java +++ b/config/src/main/java/org/springframework/security/config/web/server/AuthorizeExchangeBuilder.java @@ -23,6 +23,7 @@ import org.springframework.security.authorization.AuthorityAuthorizationManager; import org.springframework.security.web.server.authorization.AuthorizationWebFilter; import org.springframework.security.web.server.authorization.DelegatingReactiveAuthorizationManager; import org.springframework.security.web.server.util.matcher.ServerWebExchangeMatcher; +import org.springframework.security.web.server.util.matcher.ServerWebExchangeMatcherEntry; import org.springframework.web.server.WebFilter; import reactor.core.publisher.Mono; @@ -84,7 +85,7 @@ public class AuthorizeExchangeBuilder extends AbstractServerWebExchangeMatcherRe } public AuthorizeExchangeBuilder access(ReactiveAuthorizationManager manager) { - managerBldr.add(matcher, manager); + managerBldr.add(new ServerWebExchangeMatcherEntry<>(matcher, manager)); matcher = null; return AuthorizeExchangeBuilder.this; } diff --git a/webflux/src/main/java/org/springframework/security/web/server/authorization/DelegatingReactiveAuthorizationManager.java b/webflux/src/main/java/org/springframework/security/web/server/authorization/DelegatingReactiveAuthorizationManager.java index 46d85a48ba..cfe3427290 100644 --- a/webflux/src/main/java/org/springframework/security/web/server/authorization/DelegatingReactiveAuthorizationManager.java +++ b/webflux/src/main/java/org/springframework/security/web/server/authorization/DelegatingReactiveAuthorizationManager.java @@ -20,32 +20,33 @@ package org.springframework.security.web.server.authorization; import org.springframework.security.authorization.AuthorizationDecision; import org.springframework.security.authorization.ReactiveAuthorizationManager; import org.springframework.security.core.Authentication; +import org.springframework.security.web.server.util.matcher.ServerWebExchangeMatcherEntry; import org.springframework.security.web.server.util.matcher.ServerWebExchangeMatcher; import org.springframework.web.server.ServerWebExchange; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; -import java.util.LinkedHashMap; -import java.util.Map; +import java.util.ArrayList; +import java.util.List; /** * @author Rob Winch * @since 5.0 */ public class DelegatingReactiveAuthorizationManager implements ReactiveAuthorizationManager { - private final LinkedHashMap> mappings; + private final List>> mappings; - private DelegatingReactiveAuthorizationManager(LinkedHashMap> mappings) { + private DelegatingReactiveAuthorizationManager(List>> mappings) { this.mappings = mappings; } @Override public Mono check(Mono authentication, ServerWebExchange exchange) { - return Flux.fromIterable(mappings.entrySet()) - .concatMap(entry -> entry.getKey().matches(exchange) + return Flux.fromIterable(mappings) + .concatMap(mapping -> mapping.getMatcher().matches(exchange) .filter(ServerWebExchangeMatcher.MatchResult::isMatch) - .flatMap(r -> entry.getValue().check(authentication, new AuthorizationContext(exchange, r.getVariables())))) + .flatMap(r -> mapping.getEntry().check(authentication, new AuthorizationContext(exchange, r.getVariables())))) .next() .defaultIfEmpty(new AuthorizationDecision(false)); } @@ -55,13 +56,13 @@ public class DelegatingReactiveAuthorizationManager implements ReactiveAuthoriza } public static class Builder { - private final LinkedHashMap> mappings = new LinkedHashMap<>(); + private final List>> mappings = new ArrayList<>(); private Builder() { } - public DelegatingReactiveAuthorizationManager.Builder add(ServerWebExchangeMatcher matcher, ReactiveAuthorizationManager manager) { - this.mappings.put(matcher, manager); + public DelegatingReactiveAuthorizationManager.Builder add(ServerWebExchangeMatcherEntry> entry) { + this.mappings.add(entry); return this; } diff --git a/webflux/src/main/java/org/springframework/security/web/server/util/matcher/ServerWebExchangeMatcherEntry.java b/webflux/src/main/java/org/springframework/security/web/server/util/matcher/ServerWebExchangeMatcherEntry.java new file mode 100644 index 0000000000..10d32dfc7f --- /dev/null +++ b/webflux/src/main/java/org/springframework/security/web/server/util/matcher/ServerWebExchangeMatcherEntry.java @@ -0,0 +1,41 @@ +/* + * + * * 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.util.matcher; + +/** + * @author Rob Winch + * @since 5.0 + */ +public class ServerWebExchangeMatcherEntry { + private final ServerWebExchangeMatcher matcher; + private final T entry; + + public ServerWebExchangeMatcherEntry(ServerWebExchangeMatcher matcher, T entry) { + this.matcher = matcher; + this.entry = entry; + } + + public ServerWebExchangeMatcher getMatcher() { + return matcher; + } + + public T getEntry() { + return entry; + } +} diff --git a/webflux/src/test/java/org/springframework/security/web/server/authorization/DelegatingReactiveAuthorizationManagerTests.java b/webflux/src/test/java/org/springframework/security/web/server/authorization/DelegatingReactiveAuthorizationManagerTests.java index d9fba16275..984a92d67e 100644 --- a/webflux/src/test/java/org/springframework/security/web/server/authorization/DelegatingReactiveAuthorizationManagerTests.java +++ b/webflux/src/test/java/org/springframework/security/web/server/authorization/DelegatingReactiveAuthorizationManagerTests.java @@ -27,6 +27,7 @@ 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.security.web.server.util.matcher.ServerWebExchangeMatcherEntry; import org.springframework.web.server.ServerWebExchange; import reactor.core.publisher.Mono; @@ -62,8 +63,8 @@ public class DelegatingReactiveAuthorizationManagerTests { @Before public void setup() { manager = DelegatingReactiveAuthorizationManager.builder() - .add(match1, delegate1) - .add(match2, delegate2) + .add(new ServerWebExchangeMatcherEntry<>(match1, delegate1)) + .add(new ServerWebExchangeMatcherEntry<>(match2, delegate2)) .build(); }