test: Add revoked cert tests

Author: Heikki Kitt

src/test/java/org/webeid/security/testutil/Tokens.java

@@ -107,6 +107,11 @@ public final class Tokens {
 
     //-----------------------------------------------------------------------------------------------------------------
 
+    public static final String TOKEN_CERT_RSA_EXIPRED = "eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiIsIng1YyI6WyJNSUlFM0RDQ0E4U2dBd0lCQWdJUWJMbmhaajI1eFV0U1c5Q2ZCbjQ2S2pBTkJna3Foa2lHOXcwQkFRVUZBREJrTVFzd0NRWURWUVFHRXdKRlJURWlNQ0FHQTFVRUNnd1pRVk1nVTJWeWRHbG1hWFJ6WldWeWFXMXBjMnRsYzJ0MWN6RVhNQlVHQTFVRUF3d09SVk5VUlVsRUxWTkxJREl3TVRFeEdEQVdCZ2txaGtpRzl3MEJDUUVXQ1hCcmFVQnpheTVsWlRBZUZ3MHhNekV3TVRReE1UQTRNVFZhRncweE9ERXdNVEV5TURVNU5UbGFNSUdQTVFzd0NRWURWUVFHRXdKRlJURVBNQTBHQTFVRUNnd0dSVk5VUlVsRU1SY3dGUVlEVlFRTERBNWhkWFJvWlc1MGFXTmhkR2x2YmpFZ01CNEdBMVVFQXd3WFMwbFVWQ3hJUlVsTFMwa3NNemMzTVRJek1EQXlOVFV4RFRBTEJnTlZCQVFNQkV0SlZGUXhEekFOQmdOVkJDb01Ca2hGU1V0TFNURVVNQklHQTFVRUJSTUxNemMzTVRJek1EQXlOVFV3Z2dFak1BMEdDU3FHU0liM0RRRUJBUVVBQTRJQkVBQXdnZ0VMQW9JQkFRQm9wY05vQXBGL28rWXlWY0hhb25WaENiVVlmVWhEdG9QMlZET0tYTnl0Qk5JRk81dUVMODZtTU9jZlRVUmZPc3NycHZRQlZnS1dnUTB3amhxMDlxa2ZQSk05TmJQejBWeXRjc0dBUktTTmNQaDFCS2duVW5mZDBNNlN3U2wxckZsMnp2YkRCZlpUTUR0UWJST1M0ZVYxd0JYd2E4WGVIcVFtVE9aSy80bXYrNmZqMHEvTHpQbXhVSFAvTEpieWptMDdNQVZ6VEFHRnZhbklDUGRUWTlZUVV5TkN0cCtyOFJ4ak5Fay9GalZEaTl6Z0VSN1RnL3YvVkVualVkWkc0cExaWG5WKzRFc0JjSDJZL1hvUHEzT3UwdHMzSUcwMml6ODNVRlIwbzNUWVFuSG5XOWZNd1RvSlJRelMzQm5kK05aZWUreVpaTktPVXZ4bW44ZjRkc0RkQWdSM0NNRTNvNElCV3pDQ0FWY3dDUVlEVlIwVEJBSXdBREFPQmdOVkhROEJBZjhFQkFNQ0JMQXdVUVlEVlIwZ0JFb3dTREJHQmdzckJnRUVBYzRmQVFFREF6QTNNQklHQ0NzR0FRVUZCd0lDTUFZYUJHNXZibVV3SVFZSUt3WUJCUVVIQWdFV0ZXaDBkSEE2THk5M2QzY3VjMnN1WldVdlkzQnpMekFmQmdOVkhSRUVHREFXZ1JSb1pXbHJhMmt1YTJsMGRFQmxaWE4wYVM1bFpUQWRCZ05WSFE0RUZnUVVDOG5oejF6aXVSSm5PNmhKSUJZdGh1cHpZa1l3SUFZRFZSMGxBUUgvQkJZd0ZBWUlLd1lCQlFVSEF3SUdDQ3NHQVFVRkJ3TUVNQ0lHQ0NzR0FRVUZCd0VEQkJZd0ZEQUlCZ1lFQUk1R0FRRXdDQVlHQkFDT1JnRUVNQjhHQTFVZEl3UVlNQmFBRkh0cThsVlFYTGpaZWdpSFFhNzZvaXM5VzFkMk1FQUdBMVVkSHdRNU1EY3dOYUF6b0RHR0wyaDBkSEE2THk5M2QzY3VjMnN1WldVdmNtVndiM05wZEc5eWVTOWpjbXh6TDJWemRHVnBaREl3TVRFdVkzSnNNQTBHQ1NxR1NJYjNEUUVCQlFVQUE0SUJBUUJWN29oRUcwNU1YY3hIRWVYT2IyaE51THJWVlQyZGhPVndwMjFNMTNzT3NHOWwvR044S0VVUjRKUWNKbzR6RUs0OXpIQ2FBMXFLZys0L211YldmTUt6NWVVUzluanM3Y3VpdDJGamxUSlVybTd5ZTlkS25kR2l2NW80VDR5Y3ZiVUY0Tko2QXZ4WFpMb2xmTFRhRjZHZS9jMTVKejFXbUJ2MHgrMEMwMGQwcVdrRTNWVmp3cVl4VXc5Z0psV2ZiTEx4cXNUMXBVWGFmOUpjc3hkS1hraEtLcjllUTdyMDBQd2JBUmtLeWVVL3lsSEdmT1FsWmVHWGZ5V3hYMXExWkFMaWN3SmU2L1ViUVRxUWVMbjVNdml3LzQ5SDJyTGI5QkltRklKMzBRWUJsajlTR1NIU1o1azExWFBSYXcyR2ZMcmdvQnFPak1VeUtoZlJ4cUp3Yi94TCJdfQ.eyJhdWQiOlsiaHR0cHM6Ly9yaWEuZWUiLCJ1cm46Y2VydDpzaGEtMjU2OjZmMGRmMjQ0ZTRhODU2Yjk0YjNiM2I0NzU4MmEwYTUxYTMyZDY3NGRiYzcxMDcyMTFlZDIzZDRiZWM2ZDljNzIiXSwiZXhwIjoiMTYxNjA5MDMzMiIsImlhdCI6IjE2MTYwODkxMzIiLCJpc3MiOiJ3ZWItZWlkIGFwcCB2MC45LjAtMS1nZTZlODlmYSIsIm5vbmNlIjoiL2NTL1I2dzNOQmZpNFdYczVCTXB3RjIzekVZN1JzMGpncWVCb05MUVhoYz0iLCJzdWIiOiJLSVRULEhFSUtLSSwzNzcxMjMwMDI1NSJ9.AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABZvX0aLOQu2T_FTOZZN6bcfRlRqtPCDw6k5Pwc03ymTwdFW6AfXHSuL8nYmFpARCmY2X5b1n5GPKB7S2ZDgSjLym8ugJ_T6P2kD_1qJ_dQJvzI-rD3tLB-Ixf6SP-RGqWw_AvfkWkzA7DqM1Dy4yTGToLf0Ccw2nvAF_eP3g_3uw;";
+    public static final String TOKEN_CERT_ECDSA_EXIPRED = "eyJ0eXAiOiJKV1QiLCJhbGciOiJFUzI1NiIsIng1YyI6WyJNSUlGMFRDQ0E3bWdBd0lCQWdJUU1CVkZYcm9FdDNoWjhGSGNLS0U2NVRBTkJna3Foa2lHOXcwQkFRc0ZBREJqTVFzd0NRWURWUVFHRXdKRlJURWlNQ0FHQTFVRUNnd1pRVk1nVTJWeWRHbG1hWFJ6WldWeWFXMXBjMnRsYzJ0MWN6RVhNQlVHQTFVRVlRd09UbFJTUlVVdE1UQTNORGN3TVRNeEZ6QVZCZ05WQkFNTURrVlRWRVZKUkMxVFN5QXlNREUxTUI0WERURTNNVEF5TlRBNE5UY3dNRm9YRFRJeE1ESXhNREl4TlRrMU9Wb3dnWXN4Q3pBSkJnTlZCQVlUQWtWRk1ROHdEUVlEVlFRS0RBWkZVMVJGU1VReEZ6QVZCZ05WQkFzTURtRjFkR2hsYm5ScFkyRjBhVzl1TVI0d0hBWURWUVFEREJWVVQwOU5MRTFCVWxRc016YzJNREl3TkRBek16UXhEVEFMQmdOVkJBUU1CRlJQVDAweERUQUxCZ05WQkNvTUJFMUJVbFF4RkRBU0JnTlZCQVVUQ3pNM05qQXlNRFF3TXpNME1IWXdFQVlIS29aSXpqMENBUVlGSzRFRUFDSURZZ0FFeFMxWVFRQkRMVnZPaTBhMkdBNVkzNEFYT0RweDBBTDhlS0RPQjdCandCYy9GQXlWRXhoZmI2TytsVDVUbmFlYzNHblQ0Sk5SeWVWOGQ4Mkw4Y3lPZ0ZuNFBXYys1Y2pGZG1jWmpKYnRDdmd5Qk9RUTgzMXR0ZUlETDJYU3J2WkVvNElDQkRDQ0FnQXdDUVlEVlIwVEJBSXdBREFPQmdOVkhROEJBZjhFQkFNQ0E0Z3dVd1lEVlIwZ0JFd3dTakErQmdrckJnRUVBYzRmQVFFd01UQXZCZ2dyQmdFRkJRY0NBUllqYUhSMGNITTZMeTkzZDNjdWMyc3VaV1V2Y21Wd2IzTnBkRzl2Y21sMWJTOURVRk13Q0FZR0JBQ1BlZ0VDTUI4R0ExVWRFUVFZTUJhQkZHMWhjblF1ZEc5dmJTNHpRR1ZsYzNScExtVmxNQjBHQTFVZERnUVdCQlN6bmVvTHF0cWJ2SHZKMTljamhwMlhSNW92UVRBZ0JnTlZIU1VCQWY4RUZqQVVCZ2dyQmdFRkJRY0RBZ1lJS3dZQkJRVUhBd1F3SHdZRFZSMGpCQmd3Rm9BVXM2dUl2Sm5WWXFTRktnak50QjF5TzROeVIxRXdZUVlJS3dZQkJRVUhBUU1FVlRCVE1GRUdCZ1FBamtZQkJUQkhNRVVXUDJoMGRIQnpPaTh2YzJzdVpXVXZaVzR2Y21Wd2IzTnBkRzl5ZVM5amIyNWthWFJwYjI1ekxXWnZjaTExYzJVdGIyWXRZMlZ5ZEdsbWFXTmhkR1Z6THhNQ1JVNHdhZ1lJS3dZQkJRVUhBUUVFWGpCY01DY0dDQ3NHQVFVRkJ6QUJoaHRvZEhSd09pOHZZV2xoTG5OckxtVmxMMlZ6ZEdWcFpESXdNVFV3TVFZSUt3WUJCUVVITUFLR0pXaDBkSEE2THk5akxuTnJMbVZsTDBWVFZFVkpSQzFUUzE4eU1ERTFMbVJsY2k1amNuUXdQQVlEVlIwZkJEVXdNekF4b0MrZ0xZWXJhSFIwY0RvdkwzZDNkeTV6YXk1bFpTOWpjbXh6TDJWemRHVnBaQzlsYzNSbGFXUXlNREUxTG1OeWJEQU5CZ2txaGtpRzl3MEJBUXNGQUFPQ0FnRUFPWFR2a3RVWHFQZ2FLL3V4emdIMHhTRVlDbEJBV0lRYU5ncHFZNWx3c1F0Z1FucGZLbHNBRHFNWnhDcDdVdXVNdlFtcERiQnh2MWtJcjBvRzF1VVhyVXRQdzgxWE9IMUNsd1BQWFdwZzlWUlRBZXROYkhUQmJIRHl6dVhRTU5lRG1ybnRDaHMrQnRlbGV0ZWpHRCthWUczOUhHTWxyTWJHUVpPZ3ZRcnBZSE1EZWswY2tDUEVzWlJYcVVQMGc3SWU3dUJRaHo1QXQ3bDRFREFlT1c4eEdvSTZ0K0tlNEdlZGNjWEtlZjYwdzJaSUlEenZPRkhQVGM2UE9Dc0lsRnRGL25DS3dWaTdHb1FLamJVYk01T2RCTFowanlMcTJMdnpadVQ4NkpvOHdPYnppdVN6QXBHbEJleEhBcUxyUjgzcSsvWGw2MXlQbkZmM3cya0FmUzlrQmpldW56VEg3Sm0zcE5UM1pxOUpSTHZFRHF0cE9QcXI0em05bkc2T1NnaEZVNnR5U2twUTVIaWFrR3BNY250NW81S3VYaFErRGczMTd0ZFhQeVFrU2l1SjlOZkVCVzBpanJ3TzEyU1ZSellvL2pSbDRaUVVrQUVFVVNNRXNDNmdUc1p5cFBkSXNMRFZvUVdUeXRIRFU4OXMxeEpEbjRIdWxQbDEyZEZucmhsTGVYNFJ4T2pEeHBwWnhkakJVMEZvSm9EQjBxd0VBTjJUTUFQSldoK1BwOW1GdVMvdTBkaHQ5c0t2QWtweCtvMFo3djdRTXowM1hsekNIT0xUSUsrZjgxUmpva2w4Zit3aW9nNU9qajB3WmtEZTZEdVFDOUw1dURleTNQSkh2M25hVm92aHM3anJFSnUreXJzTHVlL09IaEFnV1JoMlM3NS93bFZQSFBFRTQ0az0iXX0.eyJhdWQiOlsiaHR0cHM6Ly9yaWEuZWUiLCJ1cm46Y2VydDpzaGEtMjU2OjZmMGRmMjQ0ZTRhODU2Yjk0YjNiM2I0NzU4MmEwYTUxYTMyZDY3NGRiYzcxMDcyMTFlZDIzZDRiZWM2ZDljNzIiXSwiZXhwIjoiMTYxNjQxMTU3NCIsImlhdCI6IjE2MTY0MTE0NTQiLCJpc3MiOiJ3ZWItZWlkIGFwcCB2MC45LjAtMS1nZTZlODlmYSIsIm5vbmNlIjoiMTIzNDU2Nzg1MjMzNTY3ODEyMzQ1Njc4MTIzNDU2NzgiLCJzdWIiOiJUT09NLE1BUlQsMzc2MDIwNDAzMzQifQ.WBADE-KH2nCsb0Nzsjo90ODioXcXHy4pQUrVMC2A75ZP5sTzPkjEsdI_JN6z29gPRoZkoa1_K5hR6PrVNECIn8t3U5x-cwYKphklW6eHx8eB1XIGKWTsYNyVxbF-Ze15";
+
+    //-----------------------------------------------------------------------------------------------------------------
+
     public static String getUnsignedTokenString() {
         int sigPos = Tokens.SIGNED.lastIndexOf(".");
         return Tokens.SIGNED.substring(0, sigPos + 1);

src/test/java/org/webeid/security/validator/OcspTest.java

@@ -24,10 +24,7 @@
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.webeid.security.exceptions.JceException;
-import org.webeid.security.exceptions.TokenValidationException;
-import org.webeid.security.exceptions.UserCertificateRevocationCheckFailedException;
-import org.webeid.security.exceptions.UserCertificateRevokedException;
+import org.webeid.security.exceptions.*;
 import org.webeid.security.testutil.AbstractTestWithMockedDateAndCorrectNonce;
 import org.webeid.security.testutil.Tokens;
 
@@ -66,4 +63,17 @@ void detectRevokedUserCertificate() {
         }
     }
 
+    @Test
+    void testTokenCertRsaExpired() {
+        assertThatThrownBy(() -> validator.validate(Tokens.TOKEN_CERT_RSA_EXIPRED))
+            .isInstanceOf(UserCertificateExpiredException.class)
+            .hasMessageStartingWith("User certificate has expired:");
+    }
+
+    @Test
+    void testTokenCertEcdsaExpired() {
+        assertThatThrownBy(() -> validator.validate(Tokens.TOKEN_CERT_ECDSA_EXIPRED))
+            .isInstanceOf(UserCertificateExpiredException.class)
+            .hasMessageStartingWith("User certificate has expired:");
+    }
 }