Repository: cxf Updated Branches: refs/heads/3.0.x-fixes a109b9a7b -> d63cde6bc
A few minor changes to the JWT Bearer Handler Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/d63cde6b Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/d63cde6b Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/d63cde6b Branch: refs/heads/3.0.x-fixes Commit: d63cde6bc36eaa5aa0257ca6178e6691e0c28175 Parents: a109b9a Author: Colm O hEigeartaigh <[email protected]> Authored: Wed Dec 2 10:50:13 2015 +0000 Committer: Colm O hEigeartaigh <[email protected]> Committed: Wed Dec 2 11:17:27 2015 +0000 ---------------------------------------------------------------------- .../rs/security/oauth2/grants/jwt/AbstractJwtHandler.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/d63cde6b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/jwt/AbstractJwtHandler.java ---------------------------------------------------------------------- diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/jwt/AbstractJwtHandler.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/jwt/AbstractJwtHandler.java index b8c6267..0177323 100644 --- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/jwt/AbstractJwtHandler.java +++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/jwt/AbstractJwtHandler.java @@ -47,7 +47,7 @@ public abstract class AbstractJwtHandler extends AbstractGrantHandler { } protected void validateSignature(JwsHeaders headers, String unsignedText, byte[] signature) { - JwsSignatureVerifier theSigVerifier = getInitializedSigVerifier(); + JwsSignatureVerifier theSigVerifier = getInitializedSigVerifier(headers); if (!theSigVerifier.verify(headers, unsignedText, signature)) { throw new OAuthServiceException(OAuthConstants.INVALID_GRANT); } @@ -67,7 +67,7 @@ public abstract class AbstractJwtHandler extends AbstractGrantHandler { } protected void validateIssuer(String issuer) { - if (issuer == null || !supportedIssuers.contains(issuer)) { + if (issuer == null || (supportedIssuers != null && !supportedIssuers.contains(issuer))) { throw new OAuthServiceException(OAuthConstants.INVALID_GRANT); } } @@ -87,11 +87,11 @@ public abstract class AbstractJwtHandler extends AbstractGrantHandler { public void setJwsVerifier(JwsSignatureVerifier jwsVerifier) { this.jwsVerifier = jwsVerifier; } - protected JwsSignatureVerifier getInitializedSigVerifier() { + protected JwsSignatureVerifier getInitializedSigVerifier(JwsHeaders headers) { if (jwsVerifier != null) { return jwsVerifier; } - return JwsUtils.loadSignatureVerifier(true); + return JwsUtils.loadSignatureVerifier(headers, true); } public int getTtl() {
