add some error handling

Author: ubamrein

ch-covidcertificate-backend-transformation/ch-covidcertificate-backend-transformation-ws/src/main/java/ch/admin/bag/covidcertificate/backend/transformation/ws/client/VerificationCheckClient.java

@@ -2,11 +2,15 @@
 
 import ch.admin.bag.covidcertificate.backend.transformation.model.HCertPayload;
 import ch.admin.bag.covidcertificate.backend.transformation.model.VerificationResponse;
+import ch.admin.bag.covidcertificate.backend.transformation.ws.client.exceptions.ResponseParseError;
 import ch.admin.bag.covidcertificate.backend.transformation.ws.client.exceptions.ValidationException;
 import ch.admin.bag.covidcertificate.sdk.core.models.healthcert.DccHolder;
 import ch.admin.bag.covidcertificate.sdk.core.models.state.CheckSignatureState;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.exc.InvalidDefinitionException;
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 import com.fasterxml.jackson.module.kotlin.KotlinModule;
 import java.io.IOException;
@@ -41,7 +45,7 @@ public VerificationCheckClient(String baseurl, String verifyEndpoint) {
                         .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
     }
 
-    private VerificationResponse verify(HCertPayload hCertPayload) throws InterruptedException {
+    private VerificationResponse verify(HCertPayload hCertPayload) throws InterruptedException, ResponseParseError {
         final String hCert;
         try {
             hCert = objectMapper.writeValueAsString(hCertPayload);
@@ -58,7 +62,11 @@ private VerificationResponse verify(HCertPayload hCertPayload) throws Interrupte
                         response.body());
                 return null;
             }
-            return objectMapper.readValue(response.body(), VerificationResponse.class);
+            try {
+                return objectMapper.readValue(response.body(), VerificationResponse.class);
+            } catch(InvalidDefinitionException ex) {
+                throw new ResponseParseError(objectMapper.readTree(response.body()));
+            }
         } catch (URISyntaxException | IOException e) {
             logger.error("Couldn't verify certificate", e);
             return null;
@@ -74,8 +82,9 @@ private VerificationResponse verify(HCertPayload hCertPayload) throws Interrupte
      * @param hCertPayload payload as sent with the original request
      * @return the decoded certificate if it decodeable and valid, null otherwise
      * @throws ValidationException
+     * @throws ResponseParseError
      */
-    public VerificationResponse validate(HCertPayload hCertPayload) throws InterruptedException, ValidationException {
+    public VerificationResponse validate(HCertPayload hCertPayload) throws InterruptedException, ValidationException, ResponseParseError {
         final var verificationResponse = verify(hCertPayload);
         if (verificationResponse != null && verificationResponse.getSuccessState() != null) {
             return verificationResponse;

ch-covidcertificate-backend-transformation/ch-covidcertificate-backend-transformation-ws/src/main/java/ch/admin/bag/covidcertificate/backend/transformation/ws/client/exceptions/ResponseParseError.java

@@ -0,0 +1,19 @@
+// Copyright (c) 2021 Patrick Amrein <amrein@ubique.ch>
+// 
+// This software is released under the MIT License.
+// https://opensource.org/licenses/MIT
+
+package ch.admin.bag.covidcertificate.backend.transformation.ws.client.exceptions;
+
+import com.fasterxml.jackson.databind.JsonNode;
+
+public class ResponseParseError extends Exception {
+    private final JsonNode state;
+    public ResponseParseError(JsonNode state) {
+        this.state = state;
+    }
+
+    public String getState() {
+        return state.toPrettyString();
+    }
+}

ch-covidcertificate-backend-transformation/ch-covidcertificate-backend-transformation-ws/src/main/java/ch/admin/bag/covidcertificate/backend/transformation/ws/controller/TransformationController.java

@@ -16,6 +16,7 @@
 import ch.admin.bag.covidcertificate.backend.transformation.model.Person;
 import ch.admin.bag.covidcertificate.backend.transformation.model.TransformPayload;
 import ch.admin.bag.covidcertificate.backend.transformation.ws.client.VerificationCheckClient;
+import ch.admin.bag.covidcertificate.backend.transformation.ws.client.exceptions.ResponseParseError;
 import ch.admin.bag.covidcertificate.backend.transformation.ws.client.exceptions.ValidationException;
 import ch.admin.bag.covidcertificate.backend.transformation.ws.util.MockHelper;
 import ch.admin.bag.covidcertificate.backend.transformation.ws.util.OauthWebClient;
@@ -88,7 +89,7 @@ public TransformationController(
     @PostMapping(path = "/certificateLight")
     public @ResponseBody ResponseEntity<CertLightPayload> getCertLight(
             @Valid @RequestBody HCertPayload hCertPayload)
-            throws IOException, InterruptedException, ValidationException {
+            throws IOException, InterruptedException, ValidationException, ResponseParseError {
         // Decode and verify hcert
         final var validationResponse = verificationCheckClient.validate(hCertPayload);
         final var dccHolder = validationResponse.getHcertDecoded();
@@ -159,4 +160,11 @@ public ResponseEntity<Object> validationFailed(ValidationException e) {
         return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(e.getState());
     }
 
+    @ExceptionHandler(ResponseParseError.class)
+    @ResponseStatus(HttpStatus.BAD_REQUEST)
+    public ResponseEntity<Object> validationParseFailed(ResponseParseError e) {
+        logger.error("Validation failed: {}", e.getState());
+        return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(e.getState());
+    }
+
 }