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/10/20 18:49:16 UTC
cxf git commit: Making sure the id token reader can load a JWS
verifier from a jwk jey set
Repository: cxf
Updated Branches:
refs/heads/master 6af7d6ce1 -> e25fd09f8
Making sure the id token reader can load a JWS verifier from a jwk jey set
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/e25fd09f
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/e25fd09f
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/e25fd09f
Branch: refs/heads/master
Commit: e25fd09f8a3f59063851fe96282c4b9a5d7c579d
Parents: 6af7d6c
Author: Sergey Beryozkin <sb...@gmail.com>
Authored: Tue Oct 20 17:49:01 2015 +0100
Committer: Sergey Beryozkin <sb...@gmail.com>
Committed: Tue Oct 20 17:49:01 2015 +0100
----------------------------------------------------------------------
.../oauth2/provider/AbstractOAuthJoseJwtConsumer.java | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/e25fd09f/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/AbstractOAuthJoseJwtConsumer.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/AbstractOAuthJoseJwtConsumer.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/AbstractOAuthJoseJwtConsumer.java
index a5eccc7..b69d934 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/AbstractOAuthJoseJwtConsumer.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/AbstractOAuthJoseJwtConsumer.java
@@ -45,8 +45,8 @@ public abstract class AbstractOAuthJoseJwtConsumer extends AbstractJoseJwtConsum
if (verifyWithClientSecret) {
byte[] hmac = CryptoUtils.decodeSequence(clientSecret);
return JwsUtils.getHmacSignatureVerifier(hmac, SignatureAlgorithm.HS256);
- }
- return super.getInitializedSignatureVerifier();
+ }
+ return null;
}
protected JweDecryptionProvider getInitializedDecryptionProvider(String clientSecret) {
JweDecryptionProvider theDecryptionProvider = null;
@@ -54,9 +54,6 @@ public abstract class AbstractOAuthJoseJwtConsumer extends AbstractJoseJwtConsum
SecretKey key = CryptoUtils.decodeSecretKey(clientSecret);
theDecryptionProvider = JweUtils.getDirectKeyJweDecryption(key, ContentAlgorithm.A128GCM);
}
- if (theDecryptionProvider == null) {
- theDecryptionProvider = super.getInitializedDecryptionProvider();
- }
return theDecryptionProvider;
}