Merge pull request #427 from IABTechLab/sch-UID2-5355-fix-jwt-token-validation

sch-UID2-5355 cleaning up logs for JWT validation

Author: sophia-chen-ttd

src/main/java/com/uid2/shared/attest/JwtService.java

@@ -60,6 +60,8 @@ public JwtValidationResponse validateJwt(String jwt, String audience, String iss
             throw new ValidationException(Optional.of("Unable to get public keys. Validation can not continue"));
         }
 
+        Exception lastException = null;
+
         for (PublicKey key : this.publicKeys) {
             var tokenVerifier = TokenVerifier.newBuilder()
                     .setPublicKey(key)
@@ -83,10 +85,14 @@ public JwtValidationResponse validateJwt(String jwt, String audience, String iss
                 // return the first verified response
                 return response;
             } catch (Exception e) {
-                LOGGER.error("Error validating JWT", e);
-                throw new ValidationException(Optional.ofNullable(e.getMessage()));
+                lastException = e;
             }
         }
+
+        if (!response.getIsValid()) {
+            throw new ValidationException(Optional.ofNullable(lastException.getMessage()), lastException);
+        }
+
         return response;
     }
 

src/main/java/com/uid2/shared/middleware/AttestationMiddleware.java

@@ -110,10 +110,10 @@ public void handle(RoutingContext rc) {
                 }
             }
 
-            if (!isJwtValid && this.enforceJwt) {
+            if (success && !isJwtValid && this.enforceJwt) {
                 LOGGER.info("JWT validation has failed.");
                 success = false;
-            } else if (!isJwtValid && !this.enforceJwt) {
+            } else if (success && !isJwtValid && !this.enforceJwt) {
                 LOGGER.info("JWT validation has failed, but JWTs are not being enforced.");
             }