You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2015/11/13 14:41:09 UTC
[1/3] cxf git commit: NPE fix
Repository: cxf
Updated Branches:
refs/heads/3.0.x-fixes 3f240045b -> 1c4ffc8ee
NPE fix
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/1da85e32
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/1da85e32
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/1da85e32
Branch: refs/heads/3.0.x-fixes
Commit: 1da85e324276d380836fb7dcbff2d83526b3946f
Parents: 3f24004
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Fri Nov 13 11:15:30 2015 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Fri Nov 13 13:38:59 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/1da85e32/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 a6260bd..e260bbc 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
@@ -229,7 +229,7 @@ public abstract class RedirectionBasedGrantService extends AbstractOAuthService
sessionTokenParamName = OAuthConstants.SESSION_AUTHENTICITY_TOKEN;
}
String sessionToken = params.getFirst(sessionTokenParamName);
- if (!compareRequestAndSessionTokens(sessionToken, params, userSubject)) {
+ if (sessionToken == null || !compareRequestAndSessionTokens(sessionToken, params, userSubject)) {
throw ExceptionUtils.toBadRequestException(null, null);
}
//TODO: additionally we can check that the Principal that got authenticated
[3/3] cxf git commit: Recording .gitmergeinfo Changes
Posted by co...@apache.org.
Recording .gitmergeinfo Changes
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/1c4ffc8e
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/1c4ffc8e
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/1c4ffc8e
Branch: refs/heads/3.0.x-fixes
Commit: 1c4ffc8ee75fc2dcc21913b7ca35fd8f9eb4615b
Parents: 2a0142e
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Fri Nov 13 13:39:00 2015 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Fri Nov 13 13:39:00 2015 +0000
----------------------------------------------------------------------
.gitmergeinfo | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/1c4ffc8e/.gitmergeinfo
----------------------------------------------------------------------
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 33fd585..6b9c226 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -562,6 +562,7 @@ M 0f7b744eb8e4ad8c4eee2ffd10bdaa1da1364deb
M 10a8386fcef4b7f2220ceceaa6aedca60846f6d1
M 10b043faa0652a6a06f5f020173162edef7fb0ca
M 12d070f4392316cdfff03eb41abe22531ed64ee9
+M 13521bd10962d41f16f699f42876874b53a448f3
M 16ffa0f10dac874cd5727d312ac56a78b13e5ca9
M 1701e6c8d4e794f25d69781e3f69357723ad7fcf
M 174bd11dcfeae47998723757542abe56c792cc76
[2/3] cxf git commit: Use client id instead of principal name if it's
available
Posted by co...@apache.org.
Use client id instead of principal name if it's available
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/2a0142e8
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/2a0142e8
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/2a0142e8
Branch: refs/heads/3.0.x-fixes
Commit: 2a0142e89c960095a7bb723803251e7e6ff4cae5
Parents: 1da85e3
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Fri Nov 13 12:25:57 2015 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Fri Nov 13 13:39:00 2015 +0000
----------------------------------------------------------------------
.../cxf/rs/security/oauth2/services/AbstractTokenService.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/2a0142e8/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AbstractTokenService.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AbstractTokenService.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AbstractTokenService.java
index 29eadcb..61e3165 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AbstractTokenService.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AbstractTokenService.java
@@ -65,12 +65,12 @@ public class AbstractTokenService extends AbstractOAuthService {
client = getAndValidateClientFromIdAndSecret(clientId,
params.getFirst(OAuthConstants.CLIENT_SECRET));
}
- } else if (principal.getName() != null) {
- client = getClient(principal.getName());
} else {
String clientId = retrieveClientId(params);
if (clientId != null) {
client = getClient(clientId);
+ } else if (principal.getName() != null) {
+ client = getClient(principal.getName());
}
}
if (client == null) {