AUT-2677 Fix exception handling in OcspCertificateRevocationChecker and related tests

Author: madislm

src/main/java/eu/webeid/ocsp/OcspCertificateRevocationChecker.java

@@ -22,7 +22,7 @@
 
 package eu.webeid.ocsp;
 
-import eu.webeid.ocsp.client.OcspClient;
+import eu.webeid.ocsp.client.OcspClient;import eu.webeid.ocsp.exceptions.OCSPClientException;
 import eu.webeid.ocsp.protocol.DigestCalculatorImpl;
 import eu.webeid.ocsp.protocol.OcspRequestBuilder;
 import eu.webeid.ocsp.protocol.OcspResponseValidator;
@@ -139,7 +139,7 @@ public List<RevocationInfo> validateCertificateNotRevoked(X509Certificate subjec
 
             return List.of(new RevocationInfo(ocspResponderUri, Map.of(RevocationInfo.KEY_OCSP_RESPONSE, response)));
 
-        } catch (OCSPException | CertificateException | OperatorCreationException | IOException e) {
+        } catch (OCSPException | CertificateException | OperatorCreationException | IOException | OCSPClientException e) {
             throw new UserCertificateOCSPCheckFailedException(e, ocspResponderUri);
         }
     }

src/test/java/eu/webeid/ocsp/OcspCertificateRevocationCheckerTest.java

@@ -65,6 +65,7 @@
 import static org.assertj.core.api.Assertions.assertThatCode;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.mockStatic;
@@ -123,6 +124,8 @@ void whenOcspUrlIsInvalid_thenThrows() throws Exception {
         final OcspCertificateRevocationChecker validator = getOcspCertificateRevocationChecker(ocspServiceProvider);
         assertThatCode(() ->
             validator.validateCertificateNotRevoked(estEid2018Cert, testEsteid2018CA))
+            .isInstanceOf(UserCertificateOCSPCheckFailedException.class)
+            .cause()
             .isInstanceOf(OCSPClientException.class)
             .cause()
             .isInstanceOf(ConnectException.class);
@@ -132,10 +135,11 @@ void whenOcspUrlIsInvalid_thenThrows() throws Exception {
     void whenOcspRequestFails_thenThrows() throws Exception {
         final OcspServiceProvider ocspServiceProvider = getDesignatedOcspServiceProvider("http://demo.sk.ee/ocsps");
         final OcspCertificateRevocationChecker validator = getOcspCertificateRevocationChecker(ocspServiceProvider);
-        OCSPClientException ex = assertThrows(OCSPClientException.class, () ->
+        UserCertificateOCSPCheckFailedException ex = assertThrows(UserCertificateOCSPCheckFailedException.class, () ->
             validator.validateCertificateNotRevoked(estEid2018Cert, testEsteid2018CA));
-        assertThat(ex).hasMessageStartingWith("OCSP request was not successful");
-        assertThat(ex.getStatusCode()).isEqualTo(404);
+        OCSPClientException ocspClientException = assertInstanceOf(OCSPClientException.class, ex.getCause());
+        assertThat(ocspClientException).hasMessageStartingWith("OCSP request was not successful");
+        assertThat(ocspClientException.getStatusCode()).isEqualTo(404);
     }
 
     @Test
@@ -145,6 +149,8 @@ void whenOcspRequestHasInvalidBody_thenThrows() throws Exception {
         );
         assertThatCode(() ->
             validator.validateCertificateNotRevoked(estEid2018Cert, testEsteid2018CA))
+            .isInstanceOf(UserCertificateOCSPCheckFailedException.class)
+            .cause()
             .isInstanceOf(OCSPClientException.class)
             .cause()
             .isInstanceOf(IOException.class)

src/test/java/eu/webeid/ocsp/client/OcspClientOverrideTest.java

@@ -48,6 +48,7 @@ class OcspClientOverrideTest extends AbstractTestWithValidator {
     void whenOcspClientIsOverridden_thenItIsUsed() throws JceException, CertificateException, IOException {
         final AuthTokenValidator validator = getAuthTokenValidatorWithOverriddenOcspClient(new OcpClientThatThrows());
         assertThatThrownBy(() -> validator.validate(validAuthToken, VALID_CHALLENGE_NONCE))
+            .cause()
             .isInstanceOf(OcpClientThatThrowsException.class);
     }