Added error handling for hashes with null value

Author: slaurenz

src/main/java/eu/europa/ec/dgc/revocationdistribution/service/RevocationListDownloadServiceGatewayImpl.java

@@ -77,6 +77,13 @@ private void postConstruct() {
             } catch (DateTimeParseException e) {
                 log.error("Could not parse loaded last Updated timestamp: {}", lastUpdatedString);
             }
+        } else {
+            // Load initial timestamp
+            try {
+                lastUpdatedBatchDate = ZonedDateTime.parse("2021-06-01T00:00:00Z");
+            } catch (DateTimeParseException e) {
+                log.error("Could not parse loaded last Updated timestamp: 2021-06-01T00:00:00Z");
+            }
         }
     }
 

src/main/java/eu/europa/ec/dgc/revocationdistribution/service/RevocationListService.java

@@ -80,12 +80,19 @@ public void updateRevocationListBatch(String batchId, RevocationBatchDto revocat
 
         List<HashesEntity> hashes = new ArrayList<>();
 
-        for (RevocationBatchDto.BatchEntryDto hash : revocationBatchDto.getEntries()) {
-            try {
-                hashes.add(getHashEntity(batchListEntity, hash, revocationBatchDto.getKid()));
-            } catch (IndexOutOfBoundsException e) {
-                log.error("Error calculating x,y,z. Hash value length is to short: {}",
-                    hash.getHash().getBytes(StandardCharsets.UTF_8).length);
+
+        for (RevocationBatchDto.BatchEntryDto batchEntry : revocationBatchDto.getEntries()) {
+            if (batchEntry.getHash() != null) {
+                try {
+                    hashes.add(getHashEntity(batchListEntity, batchEntry, revocationBatchDto.getKid()));
+                } catch (IndexOutOfBoundsException e) {
+                    log.error("Error calculating x,y,z. Hash value length is to short: {}",
+                        batchEntry.getHash().getBytes(StandardCharsets.UTF_8).length);
+                } catch (IllegalArgumentException e) {
+                    log.error("Hash failed base64 decoding: {}", batchEntry.getHash());
+                }
+            } else {
+                log.warn("Batch ({}) includes hash with null value, hash is ignored", batchId);
             }
         }
         hashesRepository.saveAll(hashes);