Merge pull request #43 from admin-ch/feature/PTAPP-1049-m2m-sperre

lockdown extended for v1/v2 onset, interceptor log change
admin-ch · Mar 19, 2022 · 0afd530 · 0afd530
2 parents 3de8065 + 04421a0
commit 0afd530
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/src/main/java/ch/admin/bag/covidcode/authcodegeneration/lockdown/LockdownInterceptor.java b/src/main/java/ch/admin/bag/covidcode/authcodegeneration/lockdown/LockdownInterceptor.java
@@ -30,7 +30,7 @@ public boolean preHandle(HttpServletRequest request, HttpServletResponse respons
     protected boolean isUriLocked(LocalDateTime now, String requestUri, List<Endpoint> endpoints) {
 
         String uri = removeTrailingLeading(requestUri, '/');
-        log.debug("called uri '{}' intercepted by #{}", uri, this.hashCode());
+        log.debug("intercepting call to uri '{}'", uri);
 
         Optional<Endpoint.FromUntil> result = endpoints.stream()
                 // check for restrictions on given url

diff --git a/src/main/resources/application-lockdown.yml b/src/main/resources/application-lockdown.yml
@@ -8,3 +8,19 @@ lockdown:
           until: 2020-03-23T23:59:59.000Z
         -
           from:  2022-04-01T00:00:00.000Z
+    -
+      uri: v1/onset
+      applicable:
+        -
+          from:  2022-03-22T00:00:00.000Z
+          until: 2020-03-23T23:59:59.000Z
+        -
+          from:  2022-04-01T00:00:00.000Z
+    -
+      uri: v2/onset
+      applicable:
+        -
+          from:  2022-03-22T00:00:00.000Z
+          until: 2020-03-23T23:59:59.000Z
+        -
+          from:  2022-04-01T00:00:00.000Z