Repository: cxf Updated Branches: refs/heads/3.1.x-fixes 1da129395 -> e038e3149
Yet another update to ClientCodeRequestFilter Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/e038e314 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/e038e314 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/e038e314 Branch: refs/heads/3.1.x-fixes Commit: e038e3149ff842a0a92259611864acdbe3bda650 Parents: 1da1293 Author: Sergey Beryozkin <[email protected]> Authored: Tue Jul 19 21:11:15 2016 +0300 Committer: Sergey Beryozkin <[email protected]> Committed: Tue Jul 19 21:13:20 2016 +0300 ---------------------------------------------------------------------- .../cxf/rs/security/oauth2/client/ClientCodeRequestFilter.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/e038e314/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/ClientCodeRequestFilter.java ---------------------------------------------------------------------- diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/ClientCodeRequestFilter.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/ClientCodeRequestFilter.java index 54efb3d..8d675c9 100644 --- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/ClientCodeRequestFilter.java +++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/ClientCodeRequestFilter.java @@ -124,8 +124,7 @@ public class ClientCodeRequestFilter implements ContainerRequestFilter { protected boolean isStartUriMatched(UriInfo ui, String absoluteRequestUri, boolean sameRedirectUri) { // If all request URIs can initiate a code flow then it is a match // unless the current request URI matches a non-null completeUri - if (startUri == null - && (completeUri != null && !absoluteRequestUri.endsWith(completeUri) || !sameRedirectUri)) { + if (startUri == null && completeUri != null && !absoluteRequestUri.endsWith(completeUri)) { return true; } // If completeUri is null or startUri equals to it then check the code flow @@ -137,7 +136,8 @@ public class ClientCodeRequestFilter implements ContainerRequestFilter { } } // Finally compare start URI with the request URI - return startUri != null && absoluteRequestUri.endsWith(startUri); + return startUri == null && !sameRedirectUri + || startUri != null && absoluteRequestUri.endsWith(startUri); } private boolean codeResponseQueryParamsAvailable(MultivaluedMap<String, String> queries) {
