Self-Report Submission (SRS)

.github/workflows/codeql-analysis.yml

@@ -24,10 +24,10 @@ jobs:
             with:
                 languages: java
                 queries: security-extended
-        -   name: Set up JDK 11
+        -   name: Set up JDK 17
             uses: actions/setup-java@v3
             with:
-                java-version: '11'
+                java-version: '17'
                 distribution: temurin
                 cache: maven
         -   name: Build

.github/workflows/maven-build.yml

@@ -22,10 +22,10 @@ jobs:
         steps:
         -   name: Checkout repository
             uses: actions/checkout@v3
-        -   name: Set up JDK 11
+        -   name: Set up JDK 17
             uses: actions/setup-java@v3
             with:
-                java-version: '11'
+                java-version: '17'
                 distribution: temurin
                 cache: maven
         -   name: mvn verify

.mvn/maven.config

@@ -1,4 +1,4 @@
--Drevision=2.29.0-SNAPSHOT
+-Drevision=3.0.0-SNAPSHOT
 -Dlicense.projectName=Corona-Warn-App
 -Dlicense.inceptionYear=2020
 -Dlicense.licenseName=apache_v2

common/federation/pom.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0">
+<project>
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
@@ -23,6 +23,12 @@
     <dependency>
       <groupId>org.springframework.cloud</groupId>
       <artifactId>spring-cloud-starter-openfeign</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>org.bouncycastle</groupId>
+          <artifactId>bcpkix-jdk15on</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>io.github.openfeign</groupId>

common/jupiterHelpers/pom.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0">
+<project>
   <modelVersion>4.0.0</modelVersion>
 
   <parent>

common/persistence/pom.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0">
+<project>
   <modelVersion>4.0.0</modelVersion>
 
   <parent>

common/persistence/src/main/java/app/coronawarn/server/common/persistence/domain/validation/ValidSubmissionTypeValidator.java

@@ -1,14 +1,25 @@
 package app.coronawarn.server.common.persistence.domain.validation;
 
+import static app.coronawarn.server.common.protocols.internal.SubmissionPayload.SubmissionType.SUBMISSION_TYPE_HOST_WARNING;
+
+import app.coronawarn.server.common.persistence.domain.CheckInProtectedReports;
+import app.coronawarn.server.common.persistence.domain.DiagnosisKey;
 import app.coronawarn.server.common.protocols.internal.SubmissionPayload.SubmissionType;
 import javax.validation.ConstraintValidator;
 import javax.validation.ConstraintValidatorContext;
 
+/**
+ * Validation applied onto the 'submission_type' column at 'diagnosis_key' table.
+ */
 public class ValidSubmissionTypeValidator implements ConstraintValidator<ValidSubmissionType, SubmissionType> {
 
+  /**
+   * In case of a host-warning (aka. on-behalf-of check-in warning), there won't be any {@link DiagnosisKey}s, but only
+   * {@link CheckInProtectedReports}. So SUBMISSION_TYPE_HOST_WARNING isn't allowed to be stored in diagnosis_key table.
+   */
   @Override
-  public boolean isValid(SubmissionType submissionType, ConstraintValidatorContext constraintValidatorContext) {
-    return SubmissionType.SUBMISSION_TYPE_PCR_TEST.equals(submissionType)
-        || SubmissionType.SUBMISSION_TYPE_RAPID_TEST.equals(submissionType);
+  public boolean isValid(final SubmissionType submissionType,
+      final ConstraintValidatorContext constraintValidatorContext) {
+    return !SUBMISSION_TYPE_HOST_WARNING.equals(submissionType);
   }
 }

common/persistence/src/main/java/app/coronawarn/server/common/persistence/repository/DiagnosisKeyRepository.java

@@ -1,6 +1,8 @@
 package app.coronawarn.server.common.persistence.repository;
 
 import app.coronawarn.server.common.persistence.domain.DiagnosisKey;
+import java.time.LocalDate;
+import java.util.Collection;
 import java.util.List;
 import org.springframework.data.jdbc.repository.query.Modifying;
 import org.springframework.data.jdbc.repository.query.Query;
@@ -24,6 +26,17 @@ public interface DiagnosisKeyRepository extends PagingAndSortingRepository<Diagn
       + "AND submission_type=:submission_type")
   boolean exists(@Param("key_data") byte[] keyData, @Param("submission_type") String submissionType);
 
+  /**
+   * Returns whether or not at least one of diagnosis keys with the specified key data exists in the DB.
+   *
+   * @param keyData The key data to search for
+   * @return whether or not a diagnosis key with the specified key data and submission type exists in the DB
+   */
+  @Query("SELECT CAST(CASE WHEN COUNT(*) > 0 THEN 1 ELSE 0 END AS BIT) "
+      + "FROM diagnosis_key "
+      + "WHERE key_data in (:key_data)")
+  boolean exists(@Param("key_data") Collection<byte[]> keyData);
+
   /**
    * Counts all entries that have a submission timestamp older than the specified one.
    *
@@ -90,4 +103,41 @@ boolean saveDoNothingOnConflict(
       + " ORDER BY submission_timestamp")
   List<DiagnosisKey> findAllWithTrlGreaterThanOrEqual(final @Param("minTrl") int minTrl,
       @Param("threshold") long submissionTimestamp);
+
+  /**
+   * For each Self-Reported-Submission, we'll create one record to get a glimpse on what's going on.
+   * 
+   * @param submissionType - depending on what the client has chosen
+   * @return <code>true</code>, when insert into self_report_submissions was successful
+   */
+  @Modifying
+  @Query("INSERT INTO self_report_submissions (submission_type) VALUES (:submission_type)")
+  boolean recordSrs(final @Param("submission_type") String submissionType);
+
+  /**
+   * Counts all entries that have a submission timestamp newer or equal than the specified one.
+   *
+   * @param submissionTimestamp The submission timestamp.
+   * @return The number of keys.
+   */
+  @Query("SELECT COUNT(*) FROM diagnosis_key WHERE submission_timestamp >= :threshold")
+  int countNewerThan(final @Param("threshold") long submissionTimestamp);
+
+  /**
+   * Counts all entries of 'self_report_submissions' that have a submission date older than the specified one.
+   *
+   * @param submissionDate The submission date up to which entries will be expired.
+   * @return The number of expired keys.
+   */
+  @Query("SELECT COUNT(*) FROM self_report_submissions WHERE submission_date <= :threshold")
+  int countSrsOlderThan(final @Param("threshold") LocalDate submissionDate);
+
+  /**
+   * Deletes all entries from 'self_report_submissions' that have a submission timestamp older than the specified one.
+   *
+   * @param submissionDate The submission date up to which entries will be deleted.
+   */
+  @Modifying
+  @Query("DELETE FROM self_report_submissions WHERE submission_date <= :threshold")
+  void deleteSrsOlderThan(final @Param("threshold") LocalDate submissionDate);
 }