cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject [7/7] cxf git commit: Fixing OIDC demo
Date Wed, 04 Nov 2015 17:52:21 GMT
Fixing OIDC demo


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/7e5877dc
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/7e5877dc
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/7e5877dc

Branch: refs/heads/master
Commit: 7e5877dc4f39ad77e0c4201645604a667b253809
Parents: e277a22
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Wed Nov 4 17:51:58 2015 +0000
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Wed Nov 4 17:51:58 2015 +0000

----------------------------------------------------------------------
 .../cxf/rs/security/jose/jwt/AbstractJoseJwtConsumer.java      | 6 +++++-
 .../apache/cxf/rs/security/oidc/rp/AbstractTokenValidator.java | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/7e5877dc/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwt/AbstractJoseJwtConsumer.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwt/AbstractJoseJwtConsumer.java
b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwt/AbstractJoseJwtConsumer.java
index 1623b6a..a2c358c 100644
--- a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwt/AbstractJoseJwtConsumer.java
+++ b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwt/AbstractJoseJwtConsumer.java
@@ -67,7 +67,7 @@ public abstract class AbstractJoseJwtConsumer extends AbstractJoseConsumer
{
         
         if (isJwsRequired()) {
             if (theSigVerifier == null) {
-                theSigVerifier = getInitializedSignatureVerifier(jwt.getJwsHeaders());
+                theSigVerifier = getInitializedSignatureVerifier(jwt);
             }
             if (theSigVerifier == null) {
                 throw new JwtException("Unable to validate JWT");
@@ -82,6 +82,10 @@ public abstract class AbstractJoseJwtConsumer extends AbstractJoseConsumer
{
         return jwt; 
     }
     
+    protected JwsSignatureVerifier getInitializedSignatureVerifier(JwtToken jwt) {
+        return super.getInitializedSignatureVerifier(jwt.getJwsHeaders());
+    }
+    
     protected void validateToken(JwtToken jwt) {
     }
     public boolean isJwsRequired() {

http://git-wip-us.apache.org/repos/asf/cxf/blob/7e5877dc/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/AbstractTokenValidator.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/AbstractTokenValidator.java
b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/AbstractTokenValidator.java
index c88130c..6ee14ac 100644
--- a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/AbstractTokenValidator.java
+++ b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/AbstractTokenValidator.java
@@ -97,6 +97,7 @@ public abstract class AbstractTokenValidator extends AbstractOAuthJoseJwtConsume
         this.jwkSetClient = jwkSetClient;
     }
 
+    @Override
     protected JwsSignatureVerifier getInitializedSignatureVerifier(JwtToken jwt) {
         JsonWebKey key = null;
         if (supportSelfIssuedProvider && SELF_ISSUED_ISSUER.equals(jwt.getClaim("issuer")))
{


Mime
View raw message