You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2015/12/02 12:08:10 UTC
cxf git commit: A few minor changes to the JWT Bearer Handler
Repository: cxf
Updated Branches:
refs/heads/master b3abf4a90 -> 415a8d0d8
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/415a8d0d
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/415a8d0d
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/415a8d0d
Branch: refs/heads/master
Commit: 415a8d0d8bdb9354ce105921b2573dee8f11f343
Parents: b3abf4a
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Wed Dec 2 10:50:13 2015 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Wed Dec 2 11:07:32 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/415a8d0d/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() {