Add expired batch check for wallet lockup endpoint

eu-digital-green-certificates · Feb 25, 2022 · fb17239 · fb17239
1 parent 1263ab4
commit fb17239
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 10 deletions.
diff --git a/src/main/java/eu/europa/ec/dgc/revocationdistribution/entity/HashesEntity.java b/src/main/java/eu/europa/ec/dgc/revocationdistribution/entity/HashesEntity.java
@@ -23,6 +23,8 @@
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.OneToOne;
 import javax.persistence.Table;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
@@ -75,8 +77,9 @@ public class HashesEntity {
     /**
      * ID of the Batch.
      */
-    @Column(name = "batch_id", length = 36)
-    private String batchId;
+    @OneToOne()
+    @JoinColumn(name = "batch_id")
+    private BatchListEntity batch;
 
     /**
      * Update status of the hash value.

diff --git a/src/main/java/eu/europa/ec/dgc/revocationdistribution/repository/HashesRepository.java b/src/main/java/eu/europa/ec/dgc/revocationdistribution/repository/HashesRepository.java
@@ -21,6 +21,7 @@
 package eu.europa.ec.dgc.revocationdistribution.repository;
 
 import eu.europa.ec.dgc.revocationdistribution.entity.HashesEntity;
+import java.time.ZonedDateTime;
 import java.util.List;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Modifying;
@@ -34,10 +35,15 @@ public interface HashesRepository extends JpaRepository<HashesEntity, String> {
     void setAllUpdatedStatesToFalse();
 
     @Modifying
-    @Query("DELETE HashesEntity h WHERE  h.batchId = null")
+    @Query("DELETE HashesEntity h WHERE  h.batch = null")
     void deleteAllOrphanedHashes();
 
     @Query("SELECT h.id FROM HashesEntity h WHERE h.id IN :hashes")
     List<String> getHashesPresentInListAndDb(@Param("hashes") List<String> hashes);
 
+    @Query("SELECT h.id FROM HashesEntity h INNER JOIN h.batch b WHERE h.id IN :hashes AND b.expires > :checkTime")
+    List<String> getHashesPresentInListAndDbAndNotExpired(
+        @Param("hashes") List<String> hashes,
+        @Param("checkTime") ZonedDateTime checkTime);
+
 }
diff --git a/src/main/java/eu/europa/ec/dgc/revocationdistribution/service/LookupService.java b/src/main/java/eu/europa/ec/dgc/revocationdistribution/service/LookupService.java
@@ -36,6 +36,7 @@
 import java.security.PublicKey;
 import java.text.ParseException;
 import java.time.Instant;
+import java.time.ZonedDateTime;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -107,7 +108,7 @@ public List<String> checkForRevocation(List<RevocationCheckTokenPayload> tokenPa
         List<String> hashes = tokenPayloads.stream().map(RevocationCheckTokenPayload::getPayload)
             .flatMap(List::stream).collect(Collectors.toList());
 
-        return hashesRepository.getHashesPresentInListAndDb(hashes);
+        return hashesRepository.getHashesPresentInListAndDbAndNotExpired(hashes, ZonedDateTime.now());
 
     }
 

diff --git a/src/main/java/eu/europa/ec/dgc/revocationdistribution/service/RevocationListService.java b/src/main/java/eu/europa/ec/dgc/revocationdistribution/service/RevocationListService.java
@@ -76,13 +76,13 @@ public class RevocationListService {
     @Transactional
     public void updateRevocationListBatch(String batchId, RevocationBatchDto revocationBatchDto) {
 
-        saveBatchList(batchId, revocationBatchDto);
+        BatchListEntity batchListEntity =  saveBatchList(batchId, revocationBatchDto);
 
         List<HashesEntity> hashes = new ArrayList<>();
 
         for (RevocationBatchDto.BatchEntryDto hash : revocationBatchDto.getEntries()) {
             try {
-                hashes.add(getHashEntity(batchId, hash, revocationBatchDto.getKid()));
+                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);
@@ -420,7 +420,7 @@ private String decodeBase64Hash(String b64Hash) {
     }
 
 
-    private void saveBatchList(String batchId, RevocationBatchDto revocationBatchDto) {
+    private BatchListEntity saveBatchList(String batchId, RevocationBatchDto revocationBatchDto) {
         BatchListEntity batchListEntity = new BatchListEntity();
 
         batchListEntity.setBatchId(batchId);
@@ -429,11 +429,11 @@ private void saveBatchList(String batchId, RevocationBatchDto revocationBatchDto
         batchListEntity.setType(BatchListEntity.RevocationHashType.valueOf(revocationBatchDto.getHashType().name()));
         batchListEntity.setKid(revocationBatchDto.getKid());
 
-        batchListRepository.save(batchListEntity);
+        return batchListRepository.save(batchListEntity);
     }
 
 
-    private HashesEntity getHashEntity(String batchId, RevocationBatchDto.BatchEntryDto hash, String kid)
+    private HashesEntity getHashEntity(BatchListEntity batch, RevocationBatchDto.BatchEntryDto hash, String kid)
         throws IndexOutOfBoundsException {
 
         String hexHash = decodeBase64Hash(hash.getHash());
@@ -443,7 +443,7 @@ private HashesEntity getHashEntity(String batchId, RevocationBatchDto.BatchEntry
         hashesEntity.setY(hexHash.charAt(1));
         hashesEntity.setZ(hexHash.charAt(2));
         hashesEntity.setKid(kid);
-        hashesEntity.setBatchId(batchId);
+        hashesEntity.setBatch(batch);
         hashesEntity.setUpdated(true);
 
         return hashesEntity;