You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by se...@apache.org on 2015/11/16 14:43:20 UTC
[1/2] cxf git commit: Minor follow up update
Repository: cxf
Updated Branches:
refs/heads/3.1.x-fixes ed0421182 -> 1319cddee
Minor follow up update
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/1319cdde
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/1319cdde
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/1319cdde
Branch: refs/heads/3.1.x-fixes
Commit: 1319cddeeca993b6c6f67a392a4807fc46e2e329
Parents: d2ed88c
Author: Sergey Beryozkin <sb...@gmail.com>
Authored: Mon Nov 16 13:42:00 2015 +0000
Committer: Sergey Beryozkin <sb...@gmail.com>
Committed: Mon Nov 16 13:43:05 2015 +0000
----------------------------------------------------------------------
.../rs/security/oauth2/services/RedirectionBasedGrantService.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/1319cdde/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/RedirectionBasedGrantService.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/RedirectionBasedGrantService.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/RedirectionBasedGrantService.java
index 8435cdf..887facb 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/RedirectionBasedGrantService.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/RedirectionBasedGrantService.java
@@ -363,7 +363,7 @@ public abstract class RedirectionBasedGrantService extends AbstractOAuthService
List<String> uris = client.getRedirectUris();
if (redirectUri != null) {
- if (!uris.isEmpty() && !uris.contains(redirectUri)) {
+ if (!uris.contains(redirectUri)) {
reportInvalidRequestError("Client Redirect Uri is invalid");
}
} else if (uris.size() == 1 && useRegisteredRedirectUriIfPossible) {
[2/2] cxf git commit: Update to the redirect_uri validation code
Posted by se...@apache.org.
Update to the redirect_uri validation code
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/d2ed88cc
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/d2ed88cc
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/d2ed88cc
Branch: refs/heads/3.1.x-fixes
Commit: d2ed88ccb247d4105de34a5b675c0fc198795209
Parents: ed04211
Author: Sergey Beryozkin <sb...@gmail.com>
Authored: Mon Nov 16 13:40:04 2015 +0000
Committer: Sergey Beryozkin <sb...@gmail.com>
Committed: Mon Nov 16 13:43:05 2015 +0000
----------------------------------------------------------------------
.../security/oauth2/services/RedirectionBasedGrantService.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/d2ed88cc/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/RedirectionBasedGrantService.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/RedirectionBasedGrantService.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/RedirectionBasedGrantService.java
index 667de92..8435cdf 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/RedirectionBasedGrantService.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/RedirectionBasedGrantService.java
@@ -363,8 +363,8 @@ public abstract class RedirectionBasedGrantService extends AbstractOAuthService
List<String> uris = client.getRedirectUris();
if (redirectUri != null) {
- if (!uris.contains(redirectUri)) {
- redirectUri = null;
+ if (!uris.isEmpty() && !uris.contains(redirectUri)) {
+ reportInvalidRequestError("Client Redirect Uri is invalid");
}
} else if (uris.size() == 1 && useRegisteredRedirectUriIfPossible) {
redirectUri = uris.get(0);