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/12/03 17:50:05 UTC
cxf git commit: Fixing 3.0.x build
Repository: cxf
Updated Branches:
refs/heads/3.0.x-fixes 5dc39daa0 -> 68d2a911d
Fixing 3.0.x build
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/68d2a911
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/68d2a911
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/68d2a911
Branch: refs/heads/3.0.x-fixes
Commit: 68d2a911d1024da84b88173311b01f940fd8d12e
Parents: 5dc39da
Author: Sergey Beryozkin <sb...@gmail.com>
Authored: Thu Dec 3 16:49:32 2015 +0000
Committer: Sergey Beryozkin <sb...@gmail.com>
Committed: Thu Dec 3 16:49:32 2015 +0000
----------------------------------------------------------------------
.../java/org/apache/cxf/rs/security/oidc/rp/IdTokenReader.java | 4 ++--
.../org/apache/cxf/rs/security/oidc/rp/UserInfoClient.java | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/68d2a911/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/IdTokenReader.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/IdTokenReader.java b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/IdTokenReader.java
index 035c2dd..b5bbbf1 100644
--- a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/IdTokenReader.java
+++ b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/IdTokenReader.java
@@ -41,8 +41,8 @@ public class IdTokenReader extends AbstractTokenValidator {
return jwt;
}
public JwtToken getIdJwtToken(String idJwtToken, OAuthClientUtils.Consumer client) {
- JwtToken jwt = getJwtToken(idJwtToken, client.getClientSecret());
- validateJwtClaims(jwt.getClaims(), client.getClientId(), true);
+ JwtToken jwt = getJwtToken(idJwtToken, client.getSecret());
+ validateJwtClaims(jwt.getClaims(), client.getKey(), true);
return jwt;
}
private IdToken getIdTokenFromJwt(JwtToken jwt) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/68d2a911/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/UserInfoClient.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/UserInfoClient.java b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/UserInfoClient.java
index c329ad9..3f2f675 100644
--- a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/UserInfoClient.java
+++ b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/UserInfoClient.java
@@ -60,7 +60,7 @@ public class UserInfoClient extends AbstractTokenValidator {
JwtToken jwt = getUserInfoJwt(profileJwtToken, client);
return getUserInfoFromJwt(jwt, idToken, client);
}
- public UserInfo getUserInfoFromJwt(JwtToken jwt, IdToken idToken, Consumer client) {
+ public UserInfo getUserInfoFromJwt(JwtToken jwt, IdToken idToken, OAuthClientUtils.Consumer client) {
UserInfo profile = new UserInfo(jwt.getClaims().asMap());
validateUserInfo(profile, idToken, client);
return profile;
@@ -68,8 +68,8 @@ public class UserInfoClient extends AbstractTokenValidator {
public JwtToken getUserInfoJwt(String profileJwtToken, OAuthClientUtils.Consumer client) {
return getJwtToken(profileJwtToken);
}
- public void validateUserInfo(UserInfo profile, IdToken idToken, Consumer client) {
- validateJwtClaims(profile, client.getClientId(), false);
+ public void validateUserInfo(UserInfo profile, IdToken idToken, OAuthClientUtils.Consumer client) {
+ validateJwtClaims(profile, client.getKey(), false);
// validate subject
if (!idToken.getSubject().equals(profile.getSubject())) {
throw new SecurityException("Invalid subject");