From dfd40cad5483cf790823e925055d97c06d8ff5c4 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 24 Dec 2022 07:59:47 +0000 Subject: [PATCH 1/4] Update dependency org.postgresql:postgresql to v42.5.1 [SECURITY] --- .../ch-covidcertificate-backend-delivery-data/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ch-covidcertificate-backend-delivery/ch-covidcertificate-backend-delivery-data/pom.xml b/ch-covidcertificate-backend-delivery/ch-covidcertificate-backend-delivery-data/pom.xml index 9935b28..5c1335f 100644 --- a/ch-covidcertificate-backend-delivery/ch-covidcertificate-backend-delivery-data/pom.xml +++ b/ch-covidcertificate-backend-delivery/ch-covidcertificate-backend-delivery-data/pom.xml @@ -36,7 +36,7 @@ org.postgresql postgresql - 42.5.0 + 42.5.1 org.flywaydb From 4b5b7b297f4f237c3686ceab784bde8bca572296 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 28 Jan 2023 03:23:17 +0000 Subject: [PATCH 2/4] Update dependencies --- .../ch-covidcertificate-backend-delivery-ws/pom.xml | 2 +- ch-covidcertificate-backend-delivery/pom.xml | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ch-covidcertificate-backend-delivery/ch-covidcertificate-backend-delivery-ws/pom.xml b/ch-covidcertificate-backend-delivery/ch-covidcertificate-backend-delivery-ws/pom.xml index 2bc3951..315d379 100644 --- a/ch-covidcertificate-backend-delivery/ch-covidcertificate-backend-delivery-ws/pom.xml +++ b/ch-covidcertificate-backend-delivery/ch-covidcertificate-backend-delivery-ws/pom.xml @@ -100,7 +100,7 @@ com.eatthepath pushy - 0.15.1 + 0.15.2 diff --git a/ch-covidcertificate-backend-delivery/pom.xml b/ch-covidcertificate-backend-delivery/pom.xml index 8fab2eb..8e9648c 100644 --- a/ch-covidcertificate-backend-delivery/pom.xml +++ b/ch-covidcertificate-backend-delivery/pom.xml @@ -16,12 +16,12 @@ UTF-8 UTF-8 - 2.7.5 + 2.7.8 2.11.1 0.11.5 1.17.6 - 4.42.0 - 3.1.5 + 4.44.0 + 3.1.6 @@ -65,13 +65,13 @@ org.junit.jupiter junit-jupiter-api - 5.9.1 + 5.9.2 test org.junit.jupiter junit-jupiter-engine - 5.9.1 + 5.9.2 test @@ -102,7 +102,7 @@ ch.admin.bag.covidcertificate cc-backend-logging - 1.0.4 + 1.0.5 From 4f654e601a6491a34953a66d50ff6418f8ee0961 Mon Sep 17 00:00:00 2001 From: Daniel Gstoehl Date: Thu, 16 Feb 2023 07:40:54 +0000 Subject: [PATCH 3/4] change jwt role and remove defaults --- .../backend/delivery/ws/config/JwtConfig.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ch-covidcertificate-backend-delivery/ch-covidcertificate-backend-delivery-ws/src/main/java/ch/admin/bag/covidcertificate/backend/delivery/ws/config/JwtConfig.java b/ch-covidcertificate-backend-delivery/ch-covidcertificate-backend-delivery-ws/src/main/java/ch/admin/bag/covidcertificate/backend/delivery/ws/config/JwtConfig.java index 0b0cc9a..0e9012e 100644 --- a/ch-covidcertificate-backend-delivery/ch-covidcertificate-backend-delivery-ws/src/main/java/ch/admin/bag/covidcertificate/backend/delivery/ws/config/JwtConfig.java +++ b/ch-covidcertificate-backend-delivery/ch-covidcertificate-backend-delivery-ws/src/main/java/ch/admin/bag/covidcertificate/backend/delivery/ws/config/JwtConfig.java @@ -38,13 +38,13 @@ public class JwtConfig extends WebSecurityConfigurerAdapter { @Value("${ws.jwt.openid-configuration-url}") private String url; - @Value("${ws.jwt.jwks-json-key:jwks_uri}") + @Value("${ws.jwt.jwks-json-key}") private String jwksUriJsonKey; - @Value("${ws.jwt.verification.resource-access-path:resource_access}") + @Value("${ws.jwt.verification.resource-access-path}") private String resourceAccessPath; - @Value("${ws.jwt.verification.certificate-creator-role:certificatecreator}") - private String certificateCreatorRole; - @Value("${ws.jwt.verification.role-path:/ch-covidcertificate-backend-delivery-ws/roles}") + @Value("${ws.jwt.verification.certificate-delivery-role}") + private String certificateDeliveryRole; + @Value("${ws.jwt.verification.role-path}") private String rolePath; @Override @@ -69,7 +69,7 @@ protected void configure(HttpSecurity http) throws Exception { @Bean public DeliveryJWTValidator jwtValidator() { - return new DeliveryJWTValidator(resourceAccessPath, rolePath, certificateCreatorRole); + return new DeliveryJWTValidator(resourceAccessPath, rolePath, certificateDeliveryRole); } @Bean From cd55648e729e326d924a4aa2e0ec92f8934dec81 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 3 Feb 2023 13:48:31 +0000 Subject: [PATCH 4/4] Update dependencies --- ch-covidcertificate-backend-delivery/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ch-covidcertificate-backend-delivery/pom.xml b/ch-covidcertificate-backend-delivery/pom.xml index 8e9648c..5015d8a 100644 --- a/ch-covidcertificate-backend-delivery/pom.xml +++ b/ch-covidcertificate-backend-delivery/pom.xml @@ -102,7 +102,7 @@ ch.admin.bag.covidcertificate cc-backend-logging - 1.0.5 + 1.0.6