From e75bb98962b0d909ec276aa13791d166afdcc28d Mon Sep 17 00:00:00 2001
From: latlon team <info@lat-lon.de>
Date: Mon, 24 Feb 2025 18:57:45 +0000
Subject: [PATCH] Code drop
- XPLANBOX-3701 - disable/enable chunk encoding in XPlanManagerWeb (186302aeb)
- XPLANBOX-3685 - ignore CVE-2024-36404 in xplan-manager-web (f343327d4)
Co-authored-by: Lyn Elisa Goltz <goltz@lat-lon.de>
Dropped from commit: fa2c86b30b398c5809144360e01f549d51c09172
---
.../xplan/commons/s3/config/AmazonS3ReadOnlyContext.java | 2 +-
xplan-manager/xplan-manager-web/.trivyignore | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/s3/config/AmazonS3ReadOnlyContext.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/s3/config/AmazonS3ReadOnlyContext.java
index 184da117d..007262d03 100644
--- a/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/s3/config/AmazonS3ReadOnlyContext.java
+++ b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/s3/config/AmazonS3ReadOnlyContext.java
@@ -55,7 +55,7 @@ public class AmazonS3ReadOnlyContext {
public S3Client s3Client(AwsCredentialsProvider credentialsProvider,
@Value("${xplanbox.s3.region:#{environment.XPLAN_S3_REGION}}") String region,
@Value("${xplanbox.s3.endpoint.url:#{environment.XPLAN_S3_ENDPOINT}}") String endpointUrl,
- @Value("${xplanbox.s3.chunkedEncodingEnabled:true}") boolean chunkedEncodingEnabled)
+ @Value("${xplanbox.s3.chunkedEncodingEnabled:#{environment.XPLAN_S3_CHUNKENCODING_ENABLED?:true}}") boolean chunkedEncodingEnabled)
throws URISyntaxException {
if (endpointUrl == null || endpointUrl.isEmpty()) {
LOG.info("Using S3 region {}", region);
diff --git a/xplan-manager/xplan-manager-web/.trivyignore b/xplan-manager/xplan-manager-web/.trivyignore
index e3d6fbd58..a579e8536 100644
--- a/xplan-manager/xplan-manager-web/.trivyignore
+++ b/xplan-manager/xplan-manager-web/.trivyignore
@@ -2,4 +2,5 @@
CVE-2017-11467
CVE-2015-7501
CVE-2024-1597
-CVE-2022-22965
\ No newline at end of file
+CVE-2022-22965
+CVE-2024-36404
\ No newline at end of file
--
GitLab