Merge pull request #210 from xenit-eu/DOCKER-457_multipart

Adapt default Tomcat 10 configuration

Author: WimCrols

Changelog.md

@@ -5,11 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 
 ## released
-### Fixed
 
+### Fixed
 * [PR #118](https://github.com/xenit-eu/docker-alfresco/pull/118) ALFREDOPS-842 upgrade json logging version to 0.0.6
 * [PR #112](https://github.com/xenit-eu/docker-alfresco/pull/111) DOCKER-423 SOLR_SSL setting secret does not disable the tomcat ssl connector
 * [PR #110](https://github.com/xenit-eu/docker-alfresco/pull/110) XM2C-81 fix alfresco environment and default system properties
+* [PR #78](https://github.com/xenit-eu/docker-alfresco/pull/78) DOCKER-408 Add timeout to health check commands
 
 ### Added
 * [PR #208](https://xenitsupport.jira.com/browse/DOCKER-450) DOCKER-450 Add Alfresco V23.1 & V23.2 support
@@ -32,14 +33,11 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 * [PR #74](https://github.com/xenit-eu/docker-alfresco/pull/74) DOCKER-406 Added Alfresco 7.2 to subprojects
 * [PR #76](https://github.com/xenit-eu/docker-alfresco/pull/76) Allow manual triggers of workflow
 
-### Fixed
-
-* [PR #78](https://github.com/xenit-eu/docker-alfresco/pull/78) DOCKER-408 Add timeout to health check commands
-
 ### Changed
-
-* [PR #201](https://github.com/xenit-eu/docker-alfresco/pull/201) XENOPS-1127 Bumped acs packageing version to the latest path version
+* [PR #210](https://github.com/xenit-eu/docker-alfresco/pull/210) DOCKER-457 Adapt default context settings for Tomcat 10 (this includes multipart form data parsing)
 * [PR #205](https://github.com/xenit-eu/docker-alfresco/pull/205) DOCKER-446 Instead of webscript org/alfresco/enterprise/repository/person/people-enterprise.get, webscript org/alfresco/repository/person/people.get is now used by default to list the Alfresco users in the admin tools.
+* [PR #201](https://github.com/xenit-eu/docker-alfresco/pull/201) XENOPS-1127 Bumped acs packageing version to the latest path version
+
 
 ## 2022-02.03 (2022-02-03)
 

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id "eu.xenit.docker-alfresco" version "5.4.0" apply false
+    id "eu.xenit.docker-alfresco" version "5.5.0" apply false
     id "be.vbgn.ci-detect" version "0.5.0"
     id "org.sonarqube" version "4.3.0.3225"
 }

tomcat-base/tomcat-embedded-10/src/main/java/eu/xenit/alfresco/tomcat/embedded/tomcat/TomcatFactory.java

@@ -1,7 +1,15 @@
 package eu.xenit.alfresco.tomcat.embedded.tomcat;
 
+import static eu.xenit.alfresco.tomcat.embedded.utils.Utils.redirectLog4j;
+
 import eu.xenit.alfresco.tomcat.embedded.config.TomcatConfiguration;
 import eu.xenit.logging.json.valve.JsonAccessLogValve10;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.stream.Stream;
 import org.apache.catalina.LifecycleException;
 import org.apache.catalina.LifecycleListener;
 import org.apache.catalina.Service;
@@ -12,15 +20,6 @@
 import org.apache.catalina.webresources.DirResourceSet;
 import org.apache.catalina.webresources.StandardRoot;
 
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.stream.Stream;
-
-import static eu.xenit.alfresco.tomcat.embedded.utils.Utils.redirectLog4j;
-
 public class TomcatFactory {
 
     private final TomcatConfiguration configuration;
@@ -29,7 +28,16 @@ public TomcatFactory(TomcatConfiguration configuration) {
         this.configuration = configuration;
     }
 
-    public static Connector getConnector(Tomcat tomcat, String protocol, int port, boolean sslEnabled, String scheme, int maxThreads, int maxHttpHeaderSize, String relaxedPathChars, String relaxedQueryChars) {
+    public static Connector getConnector(
+            Tomcat tomcat,
+            String protocol,
+            int port,
+            boolean sslEnabled,
+            String scheme,
+            int maxThreads,
+            int maxHttpHeaderSize,
+            String relaxedPathChars,
+            String relaxedQueryChars) {
         Connector connector = new Connector(protocol);
         connector.setPort(port);
         connector.setProperty("connectionTimeout", "240000");
@@ -56,8 +64,16 @@ public Tomcat getTomcat() throws IOException {
         tomcat.setPort(getConfiguration().getTomcatPort());
         tomcat.getServer().setPort(getConfiguration().getTomcatServerPort());
         createDefaultConnector(tomcat);
-        addUserWithRole(tomcat, "CN=Alfresco Repository Client, OU=Unknown, O=Alfresco Software Ltd., L=Maidenhead, ST=UK, C=GB", null, "repoclient");
-        addUserWithRole(tomcat, "CN=Alfresco Repository, OU=Unknown, O=Alfresco Software Ltd., L=Maidenhead, ST=UK, C=GB", null, "repository");
+        addUserWithRole(
+                tomcat,
+                "CN=Alfresco Repository Client, OU=Unknown, O=Alfresco Software Ltd., L=Maidenhead, ST=UK, C=GB",
+                null,
+                "repoclient");
+        addUserWithRole(
+                tomcat,
+                "CN=Alfresco Repository, OU=Unknown, O=Alfresco Software Ltd., L=Maidenhead, ST=UK, C=GB",
+                null,
+                "repository");
         Path webapps = Paths.get(getConfiguration().getWebappsPath());
         if (Files.exists(webapps)) {
             try (var directoryStream = Files.newDirectoryStream(webapps)) {
@@ -93,9 +109,12 @@ private void addWebapp(Tomcat tomcat, Path path) {
                 if (event.getType().equals("before_start")) {
                     WebResourceRoot resources = new StandardRoot(ctx);
                     resources.setCacheMaxSize(getConfiguration().getTomcatCacheMaxSize());
-                    resources.addPostResources(new DirResourceSet(resources, "/WEB-INF/classes", getConfiguration().getSharedClasspathDir(), "/"));
-                    resources.addPostResources(new DirResourceSet(resources, "/WEB-INF/classes", getConfiguration().getGeneratedClasspathDir(), "/"));
-                    resources.addJarResources(new DirResourceSet(resources, "/WEB-INF/lib", getConfiguration().getSharedLibDir(), "/"));
+                    resources.addPostResources(new DirResourceSet(resources, "/WEB-INF/classes",
+                            getConfiguration().getSharedClasspathDir(), "/"));
+                    resources.addPostResources(new DirResourceSet(resources, "/WEB-INF/classes",
+                            getConfiguration().getGeneratedClasspathDir(), "/"));
+                    resources.addJarResources(
+                            new DirResourceSet(resources, "/WEB-INF/lib", getConfiguration().getSharedLibDir(), "/"));
                     if (getConfiguration().isJsonLogging()) {
                         redirectLog4j(path, Paths.get(configuration.getGeneratedClasspathDir()));
                     }
@@ -112,6 +131,10 @@ private void addWebapp(Tomcat tomcat, Path path) {
                 ctx.addValve(valve);
                 ctx.getAccessLog();
             }
+
+            ctx.setAllowCasualMultipartParsing(true);
+            ctx.setAllowMultipleLeadingForwardSlashInPath(true);
+            ctx.setCrossContext(true);
         }
     }
 
@@ -135,7 +158,6 @@ private void addUserWithRole(Tomcat tomcat, String username, String password, St
         tomcat.addRole(username, role);
     }
 
-
     private void stopTomcat(Tomcat tomcat) {
         Thread thread = new Thread(() -> {
             try {
@@ -146,8 +168,5 @@ private void stopTomcat(Tomcat tomcat) {
             }
         });
         thread.start();
-
     }
-
-
 }