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/03 16:19:38 UTC
cxf git commit: Minor fix
Repository: cxf
Updated Branches:
refs/heads/master 8eea789ae -> 11dce0b37
Minor fix
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/11dce0b3
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/11dce0b3
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/11dce0b3
Branch: refs/heads/master
Commit: 11dce0b377d65f6247a4ed424e942a9d4807c864
Parents: 8eea789
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Thu Dec 3 15:19:29 2015 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Thu Dec 3 15:19:29 2015 +0000
----------------------------------------------------------------------
.../cxf/sts/token/validator/jwt/JWTTokenValidator.java | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/11dce0b3/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/jwt/JWTTokenValidator.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/jwt/JWTTokenValidator.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/jwt/JWTTokenValidator.java
index 4fb9dec..d2450ff 100644
--- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/jwt/JWTTokenValidator.java
+++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/jwt/JWTTokenValidator.java
@@ -177,15 +177,7 @@ public class JWTTokenValidator implements TokenValidator {
}
protected void validateToken(JwtToken jwt) {
- // If we have no issued time then we need to have an expiry
- boolean expiredRequired = jwt.getClaims().getIssuedAt() == null;
- JwtUtils.validateJwtExpiry(jwt.getClaims(), clockOffset, expiredRequired);
-
- JwtUtils.validateJwtNotBefore(jwt.getClaims(), clockOffset, false);
-
- // If we have no expiry then we must have an issued at
- boolean issuedAtRequired = jwt.getClaims().getExpiryTime() == null;
- JwtUtils.validateJwtIssuedAt(jwt.getClaims(), ttl, clockOffset, issuedAtRequired);
+ JwtUtils.validateTokenClaims(jwt.getClaims(), ttl, clockOffset, false);
}
public int getClockOffset() {