From 1e9a25ae598184f609350bcac574a10cbaf3f27f Mon Sep 17 00:00:00 2001 From: Matthew Erispe Date: Mon, 22 Jul 2024 14:34:51 +0200 Subject: [PATCH] add max size byte setting for api and api-kc services --- JeMPI_Apps/JeMPI_API/src/main/resources/application.conf | 2 +- JeMPI_Apps/JeMPI_API_KC/src/main/resources/application.conf | 3 +++ devops/linux/docker/conf/env/create-env-linux-high-1.sh | 2 +- devops/linux/docker/conf/env/create-env-linux-low-1.sh | 2 +- devops/linux/docker/conf/stack/docker-stack-high-0.yml | 2 ++ devops/linux/docker/conf/stack/docker-stack-high-1.yml | 2 ++ devops/linux/docker/conf/stack/docker-stack-low-0.yml | 2 ++ devops/linux/docker/conf/stack/docker-stack-low-1.yml | 2 ++ 8 files changed, 14 insertions(+), 3 deletions(-) diff --git a/JeMPI_Apps/JeMPI_API/src/main/resources/application.conf b/JeMPI_Apps/JeMPI_API/src/main/resources/application.conf index d1f887834..392ad83a2 100644 --- a/JeMPI_Apps/JeMPI_API/src/main/resources/application.conf +++ b/JeMPI_Apps/JeMPI_API/src/main/resources/application.conf @@ -7,7 +7,7 @@ akka.http { request-timeout = 5 s linger-timeout = 5 s parsing { - max-to-strict-bytes = 128m + max-to-strict-bytes = ${JEMPI_FILE_IMPORT_MAX_SIZE_BYTE} } } } diff --git a/JeMPI_Apps/JeMPI_API_KC/src/main/resources/application.conf b/JeMPI_Apps/JeMPI_API_KC/src/main/resources/application.conf index 415e1d456..d9244c0c6 100644 --- a/JeMPI_Apps/JeMPI_API_KC/src/main/resources/application.conf +++ b/JeMPI_Apps/JeMPI_API_KC/src/main/resources/application.conf @@ -6,6 +6,9 @@ akka.http { idle-timeout = 10 s request-timeout = 5 s linger-timeout = 5 s + parsing { + max-to-strict-bytes = ${JEMPI_FILE_IMPORT_MAX_SIZE_BYTE} + } } } diff --git a/devops/linux/docker/conf/env/create-env-linux-high-1.sh b/devops/linux/docker/conf/env/create-env-linux-high-1.sh index cd627b468..a87720dd2 100755 --- a/devops/linux/docker/conf/env/create-env-linux-high-1.sh +++ b/devops/linux/docker/conf/env/create-env-linux-high-1.sh @@ -60,7 +60,7 @@ export KC_JEMPI_CLIENT_ID="jempi-oauth" export KC_JEMPI_CLIENT_SECRET="Nsuhj2lQiCgSE7eVPLBgnLEEeaijufeh" export KC_JEMPI_ROOT_URL="http://localhost:3000" export JEMPI_SESSION_SECRET="c05ll3lesrinf39t7mc5h6un6r0c69lgfno69dsak3vabeqamouq4328cuaekros401ajdpkh60rrt" -export JEMPI_FILE_IMPORT_MAX_SIZE_BYTE=10485760 +export JEMPI_FILE_IMPORT_MAX_SIZE_BYTE=128m # Deployment related env vars export JEMPI_SESSION_SECURE="false" export JEMPI_SESSION_DOMAIN_NAME="localhost" diff --git a/devops/linux/docker/conf/env/create-env-linux-low-1.sh b/devops/linux/docker/conf/env/create-env-linux-low-1.sh index bd7395339..01ca02385 100755 --- a/devops/linux/docker/conf/env/create-env-linux-low-1.sh +++ b/devops/linux/docker/conf/env/create-env-linux-low-1.sh @@ -51,7 +51,7 @@ export KC_JEMPI_CLIENT_ID="jempi-oauth" export KC_JEMPI_CLIENT_SECRET="Nsuhj2lQiCgSE7eVPLBgnLEEeaijufeh" export KC_JEMPI_ROOT_URL="http://localhost:3000" export JEMPI_SESSION_SECRET="c05ll3lesrinf39t7mc5h6un6r0c69lgfno69dsak3vabeqamouq4328cuaekros401ajdpkh60rrt" -export JEMPI_FILE_IMPORT_MAX_SIZE_BYTE=10485760 +export JEMPI_FILE_IMPORT_MAX_SIZE_BYTE=128m # Deployment related env vars export JEMPI_SESSION_SECURE="false" export JEMPI_SESSION_DOMAIN_NAME="localhost" diff --git a/devops/linux/docker/conf/stack/docker-stack-high-0.yml b/devops/linux/docker/conf/stack/docker-stack-high-0.yml index a2e7af138..d81dbb4f6 100644 --- a/devops/linux/docker/conf/stack/docker-stack-high-0.yml +++ b/devops/linux/docker/conf/stack/docker-stack-high-0.yml @@ -661,6 +661,7 @@ services: API_CONFIG_REFERENCE_FILENAME: ${API_CONFIG_REFERENCE_FILENAME} API_CONFIG_MASTER_FILENAME: ${API_CONFIG_MASTER_FILENAME} API_FIELDS_CONFIG_FILENAME: ${API_FIELDS_CONFIG_FILENAME} + JEMPI_FILE_IMPORT_MAX_SIZE_BYTE: ${JEMPI_FILE_IMPORT_MAX_SIZE_BYTE} networks: - backend volumes: @@ -726,6 +727,7 @@ services: API_CONFIG_REFERENCE_FILENAME: ${API_CONFIG_REFERENCE_FILENAME} API_CONFIG_MASTER_FILENAME: ${API_CONFIG_MASTER_FILENAME} API_FIELDS_CONFIG_FILENAME: ${API_FIELDS_CONFIG_FILENAME} + JEMPI_FILE_IMPORT_MAX_SIZE_BYTE: ${JEMPI_FILE_IMPORT_MAX_SIZE_BYTE} networks: - frontend - backend diff --git a/devops/linux/docker/conf/stack/docker-stack-high-1.yml b/devops/linux/docker/conf/stack/docker-stack-high-1.yml index 7835b1caf..4879700f2 100644 --- a/devops/linux/docker/conf/stack/docker-stack-high-1.yml +++ b/devops/linux/docker/conf/stack/docker-stack-high-1.yml @@ -661,6 +661,7 @@ services: API_CONFIG_REFERENCE_FILENAME: ${API_CONFIG_REFERENCE_FILENAME} API_CONFIG_MASTER_FILENAME: ${API_CONFIG_MASTER_FILENAME} API_FIELDS_CONFIG_FILENAME: ${API_FIELDS_CONFIG_FILENAME} + JEMPI_FILE_IMPORT_MAX_SIZE_BYTE: ${JEMPI_FILE_IMPORT_MAX_SIZE_BYTE} networks: - backend volumes: @@ -726,6 +727,7 @@ services: API_CONFIG_REFERENCE_FILENAME: ${API_CONFIG_REFERENCE_FILENAME} API_CONFIG_MASTER_FILENAME: ${API_CONFIG_MASTER_FILENAME} API_FIELDS_CONFIG_FILENAME: ${API_FIELDS_CONFIG_FILENAME} + JEMPI_FILE_IMPORT_MAX_SIZE_BYTE: ${JEMPI_FILE_IMPORT_MAX_SIZE_BYTE} networks: - frontend - backend diff --git a/devops/linux/docker/conf/stack/docker-stack-low-0.yml b/devops/linux/docker/conf/stack/docker-stack-low-0.yml index a8b16c6c9..e4db8c78a 100644 --- a/devops/linux/docker/conf/stack/docker-stack-low-0.yml +++ b/devops/linux/docker/conf/stack/docker-stack-low-0.yml @@ -453,6 +453,7 @@ services: API_CONFIG_REFERENCE_FILENAME: ${API_CONFIG_REFERENCE_FILENAME} API_CONFIG_MASTER_FILENAME: ${API_CONFIG_MASTER_FILENAME} API_FIELDS_CONFIG_FILENAME: ${API_FIELDS_CONFIG_FILENAME} + JEMPI_FILE_IMPORT_MAX_SIZE_BYTE: ${JEMPI_FILE_IMPORT_MAX_SIZE_BYTE} networks: - backend volumes: @@ -518,6 +519,7 @@ services: API_CONFIG_REFERENCE_FILENAME: ${API_CONFIG_REFERENCE_FILENAME} API_CONFIG_MASTER_FILENAME: ${API_CONFIG_MASTER_FILENAME} API_FIELDS_CONFIG_FILENAME: ${API_FIELDS_CONFIG_FILENAME} + JEMPI_FILE_IMPORT_MAX_SIZE_BYTE: ${JEMPI_FILE_IMPORT_MAX_SIZE_BYTE} networks: - frontend - backend diff --git a/devops/linux/docker/conf/stack/docker-stack-low-1.yml b/devops/linux/docker/conf/stack/docker-stack-low-1.yml index f4179844e..d31898ae7 100644 --- a/devops/linux/docker/conf/stack/docker-stack-low-1.yml +++ b/devops/linux/docker/conf/stack/docker-stack-low-1.yml @@ -453,6 +453,7 @@ services: API_CONFIG_REFERENCE_FILENAME: ${API_CONFIG_REFERENCE_FILENAME} API_CONFIG_MASTER_FILENAME: ${API_CONFIG_MASTER_FILENAME} API_FIELDS_CONFIG_FILENAME: ${API_FIELDS_CONFIG_FILENAME} + JEMPI_FILE_IMPORT_MAX_SIZE_BYTE: ${JEMPI_FILE_IMPORT_MAX_SIZE_BYTE} networks: - backend volumes: @@ -518,6 +519,7 @@ services: API_CONFIG_REFERENCE_FILENAME: ${API_CONFIG_REFERENCE_FILENAME} API_CONFIG_MASTER_FILENAME: ${API_CONFIG_MASTER_FILENAME} API_FIELDS_CONFIG_FILENAME: ${API_FIELDS_CONFIG_FILENAME} + JEMPI_FILE_IMPORT_MAX_SIZE_BYTE: ${JEMPI_FILE_IMPORT_MAX_SIZE_BYTE} networks: - frontend - backend