RC Patch 1.0.1 (#486)

* Adherence to micrometer naming conventions (#468) * Mitigate CVE-2020-13692 (#477) * Fix CVE-2020-13692 in services too (#484) * Introduce new version 1.0.1 Co-authored-by: Johannes Eschrig <[email protected]> Co-authored-by: Steve BE <[email protected]>
corona-warn-app · Jun 8, 2020 · 445f273 · 445f273
1 parent c814e51
commit 445f273
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 8 deletions.
diff --git a/.mvn/maven.config b/.mvn/maven.config
@@ -1,4 +1,4 @@
--Drevision=1.0.0
+-Drevision=1.0.1
 -Dlicense.projectName=Corona-Warn-App
 -Dlicense.inceptionYear=2020
 -Dlicense.licenseName=apache_v2
diff --git a/common/persistence/pom.xml b/common/persistence/pom.xml
@@ -77,6 +77,7 @@
     <dependency>
       <groupId>org.postgresql</groupId>
       <artifactId>postgresql</artifactId>
+      <version>42.2.13</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>

diff --git a/services/pom.xml b/services/pom.xml
@@ -89,6 +89,13 @@
       <artifactId>snakeyaml</artifactId>
       <version>1.26</version>
     </dependency>
+    <dependency>
+      <!-- https://nvd.nist.gov/vuln/detail/CVE-2020-13692 -->
+      <groupId>org.postgresql</groupId>
+      <artifactId>postgresql</artifactId>
+      <version>42.2.13</version>
+      <scope>runtime</scope>
+    </dependency>
   </dependencies>
 
   <build>

diff --git a/services/submission/pom.xml b/services/submission/pom.xml
@@ -68,7 +68,6 @@
       <version>2.26.3</version>
       <scope>test</scope>
     </dependency>
-
   </dependencies>
 
   <build>

diff --git a/.../main/java/app/coronawarn/server/services/submission/controller/SubmissionController.java b/.../main/java/app/coronawarn/server/services/submission/controller/SubmissionController.java
@@ -178,10 +178,10 @@ private void updateFakeDelay(long realRequestDuration) {
   }
 
   /**
-   * Gets the current fake delay. Used for monitoring.
+   * Gets the current fake delay in seconds. Used for monitoring.
    * @return the current fake delay
    */
-  public Double getFakeDelay() {
-    return fakeDelay;
+  public Double getFakeDelayInSeconds() {
+    return fakeDelay / 1000.;
   }
 }
diff --git a/...sion/src/main/java/app/coronawarn/server/services/submission/monitoring/BatchCounter.java b/...sion/src/main/java/app/coronawarn/server/services/submission/monitoring/BatchCounter.java
@@ -29,7 +29,7 @@
  */
 public class BatchCounter {
 
-  private static final String SUBMISSION_CONTROLLER_REQUESTS_COUNTER_NAME = "submissionController.requests";
+  private static final String SUBMISSION_CONTROLLER_REQUESTS_COUNTER_NAME = "submission_controller.requests";
   private static final String SUBMISSION_CONTROLLER_REQUESTS_COUNTER_DESCRIPTION
       = "Counts requests to the Submission Controller.";
 

diff --git a/...ava/app/coronawarn/server/services/submission/monitoring/SubmissionControllerMonitor.java b/...ava/app/coronawarn/server/services/submission/monitoring/SubmissionControllerMonitor.java
@@ -34,7 +34,7 @@
 @Component
 @ConfigurationProperties(prefix = "services.submission.monitoring")
 public class SubmissionControllerMonitor {
-  private static final String SUBMISSION_CONTROLLER_CURRENT_FAKE_DELAY = "submissionController.fakeDelay";
+  private static final String SUBMISSION_CONTROLLER_CURRENT_FAKE_DELAY = "submission_controller.fake_delay_seconds";
 
   private final MeterRegistry meterRegistry;
 
@@ -79,7 +79,7 @@ private void initializeCounters() {
    */
   public void initializeGauges(SubmissionController submissionController) {
     Gauge.builder(SUBMISSION_CONTROLLER_CURRENT_FAKE_DELAY, submissionController,
-        __ -> submissionController.getFakeDelay())
+        __ -> submissionController.getFakeDelayInSeconds())
         .description("The time that fake requests are delayed to make them indistinguishable from real requests.")
         .register(meterRegistry);
   }