diff --git a/pom.xml b/pom.xml index 438cc77048deeda027276370a3154dc9ec5d8467..8283366bd87267de2fe4ee30ce0671d1e7070c92 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>de.ozgcloud</groupId> <artifactId>antragsraum</artifactId> - <version>1.3.1</version> + <version>1.3.2</version> <name>OZG-Cloud Antragsraum</name> <packaging>pom</packaging> diff --git a/server/pom.xml b/server/pom.xml index 3085d8ee939e6286f6d9ffcc547ec674f61c0ba1..46e2d1b06b4a9c74d035a30eadc866dee678f53d 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -31,7 +31,7 @@ <groupId>de.ozgcloud.antragsraum</groupId> <artifactId>antragsraum-server</artifactId> - <version>1.3.1</version> + <version>1.3.2</version> <name>OZG-Cloud Antragsraum Server</name> <description>Server Implementierung des Antragsraums</description> diff --git a/server/src/main/helm/templates/deployment.yaml b/server/src/main/helm/templates/deployment.yaml index f70d00df638dc54df685ac47cc30a0bee74046d1..ca326aa2039978760ed215c82dd2512464be2db6 100644 --- a/server/src/main/helm/templates/deployment.yaml +++ b/server/src/main/helm/templates/deployment.yaml @@ -125,6 +125,8 @@ spec: value: {{.Values.antragsraum.servlet.maxFileSize }} - name: SPRING_SERVLET_MULTIPART_MAX-REQUEST-SIZE value: {{.Values.antragsraum.servlet.maxRequestSize }} + - name: SERVER_TOMCAT_MAX-SWALLOW-SIZE + value: {{((.Values.antragsraum).tomcat).maxSwallowSize }} - name: OZGCLOUD_JWT_SECRET valueFrom: diff --git a/server/src/main/helm/values.yaml b/server/src/main/helm/values.yaml index ddea7310a55a48d50ade5c970e73a0d46acdb0e3..23d4e2ab7fcaffadbd30ee119deef37d79862846 100644 --- a/server/src/main/helm/values.yaml +++ b/server/src/main/helm/values.yaml @@ -36,3 +36,5 @@ antragsraum: servlet: maxRequestSize: 50MB maxFileSize: 30MB + tomcat: + maxSwallowSize: -1 diff --git a/server/src/main/java/de/ozgcloud/antragsraum/SecurityConfiguration.java b/server/src/main/java/de/ozgcloud/antragsraum/SecurityConfiguration.java index 77cf8627f99d762fed6a68edd572fd767a0efc83..dd5b06f9f1556f9d28f205d49429890743084075 100644 --- a/server/src/main/java/de/ozgcloud/antragsraum/SecurityConfiguration.java +++ b/server/src/main/java/de/ozgcloud/antragsraum/SecurityConfiguration.java @@ -137,4 +137,12 @@ public class SecurityConfiguration { } }; } + + /*@Bean + public ServletContextInitializer servletContextInitializer() { + return servletContext -> { + var cookieConfig = servletContext.getSessionCookieConfig(); + cookieConfig.setSecure(true); + }; + }*/ } diff --git a/server/src/test/helm/deployment_env_test.yaml b/server/src/test/helm/deployment_env_test.yaml index d53e5e80f52e9a26ab9970466cab569d41f0d1af..3849f0508a08c26b8fd1768224cb571678db1c6f 100644 --- a/server/src/test/helm/deployment_env_test.yaml +++ b/server/src/test/helm/deployment_env_test.yaml @@ -206,12 +206,19 @@ tests: content: name: SPRING_SERVLET_MULTIPART_MAX-REQUEST-SIZE value: 50MB + - contains: + path: spec.template.spec.containers[0].env + content: + name: SERVER_TOMCAT_MAX-SWALLOW-SIZE + value: -1 - it: should set spring servlet envs set: antragsraum: servlet: maxRequestSize: 40MB maxFileSize: 35MB + tomcat: + maxSwallowSize: 50MB asserts: - contains: path: spec.template.spec.containers[0].env @@ -222,4 +229,9 @@ tests: path: spec.template.spec.containers[0].env content: name: SPRING_SERVLET_MULTIPART_MAX-REQUEST-SIZE - value: 40MB \ No newline at end of file + value: 40MB + - contains: + path: spec.template.spec.containers[0].env + content: + name: SERVER_TOMCAT_MAX-SWALLOW-SIZE + value: 50MB \ No newline at end of file