cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject cxf git commit: Minor fix
Date Thu, 03 Dec 2015 15:21:09 GMT
Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes e6db5c589 -> a67a0a692


Minor fix


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/a67a0a69
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/a67a0a69
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/a67a0a69

Branch: refs/heads/3.1.x-fixes
Commit: a67a0a69214717c7c92baa27f74000d5af895c83
Parents: e6db5c5
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Thu Dec 3 15:19:29 2015 +0000
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Thu Dec 3 15:20:13 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/a67a0a69/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() {


Mime
View raw message