Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 53D87189E8 for ; Thu, 3 Dec 2015 15:19:48 +0000 (UTC) Received: (qmail 74038 invoked by uid 500); 3 Dec 2015 15:19:38 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 73967 invoked by uid 500); 3 Dec 2015 15:19:38 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 73958 invoked by uid 99); 3 Dec 2015 15:19:38 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 Dec 2015 15:19:38 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 8CF91E0B4E; Thu, 3 Dec 2015 15:19:38 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: coheigea@apache.org To: commits@cxf.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: cxf git commit: Minor fix Date: Thu, 3 Dec 2015 15:19:38 +0000 (UTC) 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 Authored: Thu Dec 3 15:19:29 2015 +0000 Committer: Colm O hEigeartaigh 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() {