This repository has been archived by the owner on May 31, 2022. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
DefaultRedirectResolver matches on userinfo and query
Fixes gh-1585
- Loading branch information
Showing
5 changed files
with
201 additions
and
33 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,14 +1,17 @@ | ||
| /* | ||
| * Copyright 2006-2011 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. | ||
| * Copyright 2002-2019 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.oauth2.provider.endpoint; | ||
|
|
||
|
|
@@ -180,4 +183,107 @@ public void testRedirectMatchPortsFalse() throws Exception { | |
| String requestedRedirect = "http://anywhere.com:91"; | ||
| assertEquals(requestedRedirect, resolver.resolveRedirect(requestedRedirect, client)); | ||
| } | ||
|
|
||
| // gh-1566 | ||
| @Test(expected = RedirectMismatchException.class) | ||
| public void testRedirectRegisteredUserInfoNotMatching() throws Exception { | ||
| Set<String> redirectUris = new HashSet<String>(Arrays.asList("http://[email protected]")); | ||
| client.setRegisteredRedirectUri(redirectUris); | ||
| resolver.resolveRedirect("http://[email protected]", client); | ||
| } | ||
|
|
||
| // gh-1566 | ||
| @Test(expected = RedirectMismatchException.class) | ||
| public void testRedirectRegisteredNoUserInfoNotMatching() throws Exception { | ||
| Set<String> redirectUris = new HashSet<String>(Arrays.asList("http://[email protected]")); | ||
| client.setRegisteredRedirectUri(redirectUris); | ||
| resolver.resolveRedirect("http://anywhere.com", client); | ||
| } | ||
|
|
||
| // gh-1566 | ||
| @Test() | ||
| public void testRedirectRegisteredUserInfoMatching() throws Exception { | ||
| Set<String> redirectUris = new HashSet<String>(Arrays.asList("http://[email protected]")); | ||
| client.setRegisteredRedirectUri(redirectUris); | ||
| String requestedRedirect = "http://[email protected]"; | ||
| assertEquals(requestedRedirect, resolver.resolveRedirect(requestedRedirect, client)); | ||
| } | ||
|
|
||
| // gh-1566 | ||
| @Test() | ||
| public void testRedirectRegisteredFragmentIgnoredAndStripped() throws Exception { | ||
| Set<String> redirectUris = new HashSet<String>(Arrays.asList("http://[email protected]/foo/bar#baz")); | ||
| client.setRegisteredRedirectUri(redirectUris); | ||
| String requestedRedirect = "http://[email protected]/foo/bar"; | ||
| assertEquals(requestedRedirect, resolver.resolveRedirect(requestedRedirect + "#bar", client)); | ||
| } | ||
|
|
||
| // gh-1566 | ||
| @Test() | ||
| public void testRedirectRegisteredQueryParamsMatching() throws Exception { | ||
| Set<String> redirectUris = new HashSet<String>(Arrays.asList("http://anywhere.com/?p1=v1&p2=v2")); | ||
| client.setRegisteredRedirectUri(redirectUris); | ||
| String requestedRedirect = "http://anywhere.com/?p1=v1&p2=v2"; | ||
| assertEquals(requestedRedirect, resolver.resolveRedirect(requestedRedirect, client)); | ||
| } | ||
|
|
||
| // gh-1566 | ||
| @Test() | ||
| public void testRedirectRegisteredQueryParamsMatchingIgnoringAdditionalParams() throws Exception { | ||
| Set<String> redirectUris = new HashSet<String>(Arrays.asList("http://anywhere.com/?p1=v1&p2=v2")); | ||
| client.setRegisteredRedirectUri(redirectUris); | ||
| String requestedRedirect = "http://anywhere.com/?p1=v1&p2=v2&p3=v3"; | ||
| assertEquals(requestedRedirect, resolver.resolveRedirect(requestedRedirect, client)); | ||
| } | ||
|
|
||
| // gh-1566 | ||
| @Test() | ||
| public void testRedirectRegisteredQueryParamsMatchingDifferentOrder() throws Exception { | ||
| Set<String> redirectUris = new HashSet<String>(Arrays.asList("http://anywhere.com/?p1=v1&p2=v2")); | ||
| client.setRegisteredRedirectUri(redirectUris); | ||
| String requestedRedirect = "http://anywhere.com/?p2=v2&p1=v1"; | ||
| assertEquals(requestedRedirect, resolver.resolveRedirect(requestedRedirect, client)); | ||
| } | ||
|
|
||
| // gh-1566 | ||
| @Test(expected = RedirectMismatchException.class) | ||
| public void testRedirectRegisteredQueryParamsWithDifferentValues() throws Exception { | ||
| Set<String> redirectUris = new HashSet<String>(Arrays.asList("http://anywhere.com/?p1=v1&p2=v2")); | ||
| client.setRegisteredRedirectUri(redirectUris); | ||
| resolver.resolveRedirect("http://anywhere.com/?p1=v1&p2=v3", client); | ||
| } | ||
|
|
||
| // gh-1566 | ||
| @Test(expected = RedirectMismatchException.class) | ||
| public void testRedirectRegisteredQueryParamsNotMatching() throws Exception { | ||
| Set<String> redirectUris = new HashSet<String>(Arrays.asList("http://anywhere.com/?p1=v1")); | ||
| client.setRegisteredRedirectUri(redirectUris); | ||
| resolver.resolveRedirect("http://anywhere.com/?p2=v2", client); | ||
| } | ||
|
|
||
| // gh-1566 | ||
| @Test(expected = RedirectMismatchException.class) | ||
| public void testRedirectRegisteredQueryParamsPartiallyMatching() throws Exception { | ||
| Set<String> redirectUris = new HashSet<String>(Arrays.asList("http://anywhere.com/?p1=v1&p2=v2")); | ||
| client.setRegisteredRedirectUri(redirectUris); | ||
| resolver.resolveRedirect("http://anywhere.com/?p2=v2&p3=v3", client); | ||
| } | ||
|
|
||
| // gh-1566 | ||
| @Test | ||
| public void testRedirectRegisteredQueryParamsMatchingWithMultipleValuesInRegistered() throws Exception { | ||
| Set<String> redirectUris = new HashSet<String>(Arrays.asList("http://anywhere.com/?p1=v11&p1=v12")); | ||
| client.setRegisteredRedirectUri(redirectUris); | ||
| String requestedRedirect = "http://anywhere.com/?p1=v11&p1=v12"; | ||
| assertEquals(requestedRedirect, resolver.resolveRedirect(requestedRedirect, client)); | ||
| } | ||
|
|
||
| // gh-1566 | ||
| @Test | ||
| public void testRedirectRegisteredQueryParamsMatchingWithParamWithNoValue() throws Exception { | ||
| Set<String> redirectUris = new HashSet<String>(Arrays.asList("http://anywhere.com/?p1&p2=v2")); | ||
| client.setRegisteredRedirectUri(redirectUris); | ||
| String requestedRedirect = "http://anywhere.com/?p1&p2=v2"; | ||
| assertEquals(requestedRedirect, resolver.resolveRedirect(requestedRedirect, client)); | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters