From 0e36f43a233baa627ca87b175f8f348adee63d7c Mon Sep 17 00:00:00 2001 From: Johannes Eschrig Date: Mon, 8 Jun 2020 14:49:25 +0200 Subject: [PATCH 1/4] Adherence to micrometer naming conventions (#468) Co-authored-by: Steve BE <5719743+stevesap@users.noreply.github.com> --- .../submission/controller/SubmissionController.java | 6 +++--- .../server/services/submission/monitoring/BatchCounter.java | 2 +- .../submission/monitoring/SubmissionControllerMonitor.java | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/services/submission/src/main/java/app/coronawarn/server/services/submission/controller/SubmissionController.java b/services/submission/src/main/java/app/coronawarn/server/services/submission/controller/SubmissionController.java index 44ffa8bd29..72889428e4 100644 --- a/services/submission/src/main/java/app/coronawarn/server/services/submission/controller/SubmissionController.java +++ b/services/submission/src/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/services/submission/src/main/java/app/coronawarn/server/services/submission/monitoring/BatchCounter.java b/services/submission/src/main/java/app/coronawarn/server/services/submission/monitoring/BatchCounter.java index a0db3f0f41..cfce087de4 100644 --- a/services/submission/src/main/java/app/coronawarn/server/services/submission/monitoring/BatchCounter.java +++ b/services/submission/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/services/submission/src/main/java/app/coronawarn/server/services/submission/monitoring/SubmissionControllerMonitor.java b/services/submission/src/main/java/app/coronawarn/server/services/submission/monitoring/SubmissionControllerMonitor.java index d739afe5a4..9779f0882a 100644 --- a/services/submission/src/main/java/app/coronawarn/server/services/submission/monitoring/SubmissionControllerMonitor.java +++ b/services/submission/src/main/java/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); } From 592fb8d14c05a9bfbccf3cc6a236790f90d06433 Mon Sep 17 00:00:00 2001 From: Johannes Eschrig Date: Mon, 8 Jun 2020 16:44:53 +0200 Subject: [PATCH 2/4] Mitigate CVE-2020-13692 (#477) --- common/persistence/pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/common/persistence/pom.xml b/common/persistence/pom.xml index 262454d8a6..70934f1426 100644 --- a/common/persistence/pom.xml +++ b/common/persistence/pom.xml @@ -77,6 +77,7 @@ org.postgresql postgresql + 42.2.13 runtime From 27126525b74906066f266352cf97acac23dc104e Mon Sep 17 00:00:00 2001 From: Johannes Eschrig Date: Mon, 8 Jun 2020 21:32:38 +0200 Subject: [PATCH 3/4] Fix CVE-2020-13692 in services too (#484) --- services/pom.xml | 7 +++++++ services/submission/pom.xml | 1 - 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/services/pom.xml b/services/pom.xml index 6748ed9fef..dbbe6f29db 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -89,6 +89,13 @@ snakeyaml 1.26 + + + org.postgresql + postgresql + 42.2.13 + runtime + diff --git a/services/submission/pom.xml b/services/submission/pom.xml index a7cb050881..a7bea2cc23 100644 --- a/services/submission/pom.xml +++ b/services/submission/pom.xml @@ -68,7 +68,6 @@ 2.26.3 test - From 26b07ee0dddded682d8cc24386233e9dee50516e Mon Sep 17 00:00:00 2001 From: Ole Lilienthal Date: Mon, 8 Jun 2020 22:04:50 +0200 Subject: [PATCH 4/4] Introduce new version 1.0.1 --- .mvn/maven.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.mvn/maven.config b/.mvn/maven.config index 2e001a9276..d3e9b3611d 100644 --- 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