Handle failed JWT signature verification

Issue spring-atticgh-1522 Fixes spring-atticgh-1852

Author: jgrandja

spring-security-oauth2/src/main/java/org/springframework/security/oauth2/provider/token/store/jwk/JwkVerifyingJwtAccessTokenConverter.java

@@ -121,8 +121,13 @@ protected Map<String, Object> decode(String token) {
 
 // Verify signature
 SignatureVerifier verifier = jwkDefinitionHolder.getSignatureVerifier();
-Jwt jwt = JwtHelper.decode(token);
-jwt.verifySignature(verifier);
+Jwt jwt;
+try {
+jwt = JwtHelper.decode(token);
+jwt.verifySignature(verifier);
+} catch (Exception ex) {
+throw new InvalidTokenException("Failed to decode/verify JWT/JWS", ex);
+}
 
 Map<String, Object> claims = this.jsonParser.parseMap(jwt.getClaims());
 if (claims.containsKey(EXP) && claims.get(EXP) instanceof Integer) {

spring-security-oauth2/src/test/java/org/springframework/security/oauth2/provider/token/store/jwk/JwkVerifyingJwtAccessTokenConverterTests.java

@@ -24,6 +24,8 @@
 import java.util.Map;
 
 import static org.junit.Assert.assertNotNull;
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.doThrow;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 import static org.springframework.security.jwt.codec.Codecs.b64UrlEncode;
@@ -139,6 +141,26 @@ public void decodeWhenKidHeaderMissingButX5tHeaderPresentThenDecodeStillSucceeds
 assertNotNull(decodedJwt);
 }
 
+// gh-1522, gh-1852
+@Test
+public void decodeWhenVerifySignatureFailsThenThrowInvalidTokenException() throws Exception {
+this.thrown.expect(InvalidTokenException.class);
+this.thrown.expectMessage("Failed to decode/verify JWT/JWS");
+JwkDefinition jwkDefinition = this.createRSAJwkDefinition("key-id-1", null, null);
+JwkDefinitionSource jwkDefinitionSource = mock(JwkDefinitionSource.class);
+JwkDefinitionSource.JwkDefinitionHolder jwkDefinitionHolder = mock(JwkDefinitionSource.JwkDefinitionHolder.class);
+SignatureVerifier signatureVerifier = mock(SignatureVerifier.class);
+when(jwkDefinitionHolder.getJwkDefinition()).thenReturn(jwkDefinition);
+when(jwkDefinitionSource.getDefinitionLoadIfNecessary("key-id-1", null)).thenReturn(jwkDefinitionHolder);
+when(jwkDefinitionHolder.getSignatureVerifier()).thenReturn(signatureVerifier);
+doThrow(RuntimeException.class).when(signatureVerifier).verify(any(byte[].class), any(byte[].class));
+JwkVerifyingJwtAccessTokenConverter accessTokenConverter =
+new JwkVerifyingJwtAccessTokenConverter(jwkDefinitionSource);
+String jwt = createJwt(createJwtHeader("key-id-1", null, JwkDefinition.CryptoAlgorithm.RS256));
+String jws = jwt + "." + utf8Decode(b64UrlEncode("junkSignature".getBytes()));
+accessTokenConverter.decode(jws);
+}
+
 private JwkDefinition createRSAJwkDefinition(String keyId, String x5t, JwkDefinition.CryptoAlgorithm algorithm) {
 return createRSAJwkDefinition(JwkDefinition.KeyType.RSA, keyId, x5t,
 JwkDefinition.PublicKeyUse.SIG, algorithm, "AMh-pGAj9vX2gwFDyrXot1f2YfHgh8h0Qx6w9IqLL", "AQAB");