Repository: cxf Updated Branches: refs/heads/3.0.x-fixes dc6728643 -> 0f990ec1f
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/0f990ec1 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/0f990ec1 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/0f990ec1 Branch: refs/heads/3.0.x-fixes Commit: 0f990ec1fd6450f401010e9981e5b294de03dbfd Parents: dc67286 Author: Sergey Beryozkin <[email protected]> Authored: Tue Oct 20 17:49:01 2015 +0100 Committer: Sergey Beryozkin <[email protected]> Committed: Tue Oct 20 17:49:46 2015 +0100 ---------------------------------------------------------------------- .../oauth2/provider/AbstractOAuthJoseJwtConsumer.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/0f990ec1/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; }
