@@ -266,8 +266,8 @@ private static boolean hasContentType(Header header) {
266266 return header != null && Strings .hasText (header .getContentType ());
267267 }
268268
269- private void verifySignature (final TokenizedJwt tokenized , final JwsHeader jwsHeader , final String alg ,
270- @ SuppressWarnings ("deprecation" ) SigningKeyResolver resolver , Claims claims , Payload payload ) {
269+ private byte [] verifySignature (final TokenizedJwt tokenized , final JwsHeader jwsHeader , final String alg ,
270+ @ SuppressWarnings ("deprecation" ) SigningKeyResolver resolver , Claims claims , Payload payload ) {
271271
272272 Assert .notNull (resolver , "SigningKeyResolver instance cannot be null." );
273273
@@ -355,6 +355,8 @@ private void verifySignature(final TokenizedJwt tokenized, final JwsHeader jwsHe
355355 } finally {
356356 Streams .reset (payloadStream );
357357 }
358+
359+ return signature ;
358360 }
359361
360362 @ Override
@@ -486,7 +488,7 @@ private void verifySignature(final TokenizedJwt tokenized, final JwsHeader jwsHe
486488 }
487489
488490 byte [] iv = null ;
489- byte [] tag = null ;
491+ byte [] digest = null ; // either JWE AEAD tag or JWS signature after Base64Url-decoding
490492 if (tokenized instanceof TokenizedJwe ) {
491493
492494 TokenizedJwe tokenizedJwe = (TokenizedJwe ) tokenized ;
@@ -522,8 +524,8 @@ private void verifySignature(final TokenizedJwt tokenized, final JwsHeader jwsHe
522524 base64Url = base64UrlDigest ;
523525 //guaranteed to be non-empty via the `alg` + digest check above:
524526 Assert .hasText (base64Url , "JWE AAD Authentication Tag cannot be null or empty." );
525- tag = decode (base64Url , "JWE AAD Authentication Tag" );
526- if (Bytes .isEmpty (tag )) {
527+ digest = decode (base64Url , "JWE AAD Authentication Tag" );
528+ if (Bytes .isEmpty (digest )) {
527529 String msg = "Compact JWE strings must always contain an AAD Authentication Tag." ;
528530 throw new MalformedJwtException (msg );
529531 }
@@ -565,7 +567,7 @@ private void verifySignature(final TokenizedJwt tokenized, final JwsHeader jwsHe
565567 // TODO: add encProvider(Provider) builder method that applies to this request only?
566568 InputStream ciphertext = payload .toInputStream ();
567569 ByteArrayOutputStream plaintext = new ByteArrayOutputStream (8192 );
568- DecryptAeadRequest dreq = new DefaultDecryptAeadRequest (ciphertext , cek , aad , iv , tag );
570+ DecryptAeadRequest dreq = new DefaultDecryptAeadRequest (ciphertext , cek , aad , iv , digest );
569571 encAlg .decrypt (dreq , plaintext );
570572 payload = new Payload (plaintext .toByteArray (), header .getContentType ());
571573
@@ -575,7 +577,7 @@ private void verifySignature(final TokenizedJwt tokenized, final JwsHeader jwsHe
575577 // not using a signing key resolver, so we can verify the signature before reading the payload, which is
576578 // always safer:
577579 JwsHeader jwsHeader = Assert .stateIsInstance (JwsHeader .class , header , "Not a JwsHeader. " );
578- verifySignature (tokenized , jwsHeader , alg , new LocatingKeyResolver (this .keyLocator ), null , payload );
580+ digest = verifySignature (tokenized , jwsHeader , alg , new LocatingKeyResolver (this .keyLocator ), null , payload );
579581 integrityVerified = true ; // no exception means signature verified
580582 }
581583
@@ -596,66 +598,73 @@ private void verifySignature(final TokenizedJwt tokenized, final JwsHeader jwsHe
596598 Claims claims = null ;
597599 byte [] payloadBytes = payload .getBytes ();
598600 if (payload .isConsumable ()) {
599-
600- InputStream in = payload .toInputStream ();
601-
602- if (!hasContentType (header )) { // If there is a content type set, then the application using JJWT is expected
603- // to convert the byte payload themselves based on this content type
604- // https://www.rfc-editor.org/rfc/rfc7515.html#section-4.1.10 :
605- //
606- // "This parameter is ignored by JWS implementations; any processing of this
607- // parameter is performed by the JWS application."
608- //
609- Map <String , ?> claimsMap = null ;
610- try {
611- // if deserialization fails, we'll need to rewind to convert to a byte array. So if
612- // mark/reset isn't possible, we'll need to buffer:
613- if (!in .markSupported ()) {
614- in = new BufferedInputStream (in );
615- in .mark (0 );
616- }
617- claimsMap = deserialize (new UncloseableInputStream (in ) /* Don't close in case we need to rewind */ , "claims" );
618- } catch (DeserializationException | MalformedJwtException ignored ) { // not JSON, treat it as a byte[]
601+ InputStream in = null ;
602+ try {
603+ in = payload .toInputStream ();
604+
605+ if (!hasContentType (header )) { // If there is a content type set, then the application using JJWT is expected
606+ // to convert the byte payload themselves based on this content type
607+ // https://www.rfc-editor.org/rfc/rfc7515.html#section-4.1.10 :
608+ //
609+ // "This parameter is ignored by JWS implementations; any processing of this
610+ // parameter is performed by the JWS application."
611+ //
612+ Map <String , ?> claimsMap = null ;
613+ try {
614+ // if deserialization fails, we'll need to rewind to convert to a byte array. So if
615+ // mark/reset isn't possible, we'll need to buffer:
616+ if (!in .markSupported ()) {
617+ in = new BufferedInputStream (in );
618+ in .mark (0 );
619+ }
620+ claimsMap = deserialize (new UncloseableInputStream (in ) /* Don't close in case we need to rewind */ , "claims" );
621+ } catch (DeserializationException |
622+ MalformedJwtException ignored ) { // not JSON, treat it as a byte[]
619623// String msg = "Invalid claims: " + e.getMessage();
620624// throw new MalformedJwtException(msg, e);
621- } finally {
622- Streams .reset (in );
623- }
624- if (claimsMap != null ) {
625- try {
626- claims = new DefaultClaims (claimsMap );
627- } catch (Throwable t ) {
628- String msg = "Invalid claims: " + t .getMessage ();
629- throw new MalformedJwtException (msg );
625+ } finally {
626+ Streams .reset (in );
627+ }
628+ if (claimsMap != null ) {
629+ try {
630+ claims = new DefaultClaims (claimsMap );
631+ } catch (Throwable t ) {
632+ String msg = "Invalid claims: " + t .getMessage ();
633+ throw new MalformedJwtException (msg );
634+ }
630635 }
631636 }
632- }
633- if (claims == null ) {
634- // consumable, but not claims, so convert to byte array:
635- payloadBytes = Streams .bytes (in , "Unable to convert payload to byte array." );
637+ if (claims == null ) {
638+ // consumable, but not claims, so convert to byte array:
639+ payloadBytes = Streams .bytes (in , "Unable to convert payload to byte array." );
640+ }
641+ } finally { // always ensure closed per https://github.com/jwtk/jjwt/issues/949
642+ Objects .nullSafeClose (in );
636643 }
637644 }
638645
646+ // =============== Post-SKR Signature Check =================
647+ if (hasDigest && signingKeyResolver != null ) { // TODO: remove for 1.0
648+ // A SigningKeyResolver has been configured, and due to it's API, we have to verify the signature after
649+ // parsing the body. This can be a security risk, so it needs to be removed before 1.0
650+ JwsHeader jwsHeader = Assert .stateIsInstance (JwsHeader .class , header , "Not a JwsHeader. " );
651+ digest = verifySignature (tokenized , jwsHeader , alg , this .signingKeyResolver , claims , payload );
652+ //noinspection UnusedAssignment
653+ integrityVerified = true ; // no exception means verified successfully
654+ }
655+
639656 Jwt <?, ?> jwt ;
640657 Object body = claims != null ? claims : payloadBytes ;
641658 if (header instanceof JweHeader ) {
642- jwt = new DefaultJwe <>((JweHeader ) header , body , iv , tag );
659+ jwt = new DefaultJwe <>((JweHeader ) header , body , iv , digest );
643660 } else if (hasDigest ) {
644661 JwsHeader jwsHeader = Assert .isInstanceOf (JwsHeader .class , header , "JwsHeader required." );
645- jwt = new DefaultJws <>(jwsHeader , body , base64UrlDigest .toString ());
662+ jwt = new DefaultJws <>(jwsHeader , body , digest , base64UrlDigest .toString ());
646663 } else {
647664 //noinspection rawtypes
648665 jwt = new DefaultJwt (header , body );
649666 }
650667
651- // =============== Signature =================
652- if (hasDigest && signingKeyResolver != null ) { // TODO: remove for 1.0
653- // A SigningKeyResolver has been configured, and due to it's API, we have to verify the signature after
654- // parsing the body. This can be a security risk, so it needs to be removed before 1.0
655- JwsHeader jwsHeader = Assert .stateIsInstance (JwsHeader .class , header , "Not a JwsHeader. " );
656- verifySignature (tokenized , jwsHeader , alg , this .signingKeyResolver , claims , payload );
657- }
658-
659668 final boolean allowSkew = this .allowedClockSkewMillis > 0 ;
660669
661670 //since 0.3:
0 commit comments