Merge pull request #293 from lowcoder-org/unify_max_request_size

new: unify usage of max request size across all components

Author: FalkWolsky

deploy/docker/Dockerfile

@@ -20,7 +20,7 @@ RUN --mount=type=cache,target=/root/.m2 mvn -f pom.xml clean package -DskipTests
 RUN mkdir -p /lowcoder/api-service/plugins /lowcoder/api-service/config /lowcoder/api-service/logs
 
 # Define lowcoder main jar and plugin jars
-ARG JAR_FILE=/lowcoder-server/lowcoder-server/target/lowcoder-server-1.0-SNAPSHOT.jar
+ARG JAR_FILE=/lowcoder-server/lowcoder-server/target/lowcoder-server-*.jar
 ARG PLUGIN_JARS=/lowcoder-server/lowcoder-plugins/*/target/*.jar
 
 # Copy Java runtime for running server

deploy/docker/README.md

@@ -36,6 +36,7 @@ Image can be configured by setting environment variables.
 | `ENCRYPTION_PASSWORD`           | Encryption password                                                 | `lowcoder.org`                                        |
 | `ENCRYPTION_SALT`               | Salt used for encrypting password                                   | `lowcoder.org`                                        |
 | `CORS_ALLOWED_DOMAINS`          | CORS allowed domains                                                | `*`                                                   |
+| `LOWCODER_MAX_REQUEST_SIZE`     | Lowcoder max request size                                           | `20m`                                                 |
 | `LOWCODER_API_SERVICE_URL`      | Lowcoder API service URL                                            | `http://localhost:8080`                               |
 | `LOWCODER_NODE_SERVICE_URL`     | Lowcoder Node service (js executor) URL                             | `http://localhost:6060`                               |
 | `DEFAULT_ORGS_PER_USER`         | Default maximum organizations per user                              | `100`                                                 |
@@ -121,6 +122,7 @@ Image can be configured by setting environment variables.
 | --------------------------------| --------------------------------------------------------------------| ------------------------------------------------------- |
 | `PUID`                          | ID of user running services. It will own all created logs and data. | `9001`                                                  |
 | `PGID`                          | ID of group of the user running services.                           | `9001`                                                  |
+| `LOWCODER_MAX_REQUEST_SIZE`     | Lowcoder max request size                                           | `20m`                                                   |
 | `LOWCODER_API_SERVICE_URL`      | Lowcoder API service URL                                            | `http://localhost:8080`                                 |
 | `LOWCODER_NODE_SERVICE_URL`     | Lowcoder Node service (js executor) URL                             | `http://localhost:6060`                                 |
 

deploy/docker/docker-compose-multi.yaml

@@ -75,6 +75,7 @@ services:
     environment:
       PUID: "9001"
       PGID: "9001"
+      LOWCODER_MAX_REQUEST_SIZE: 20m
       LOWCODER_API_SERVICE_URL: "http://lowcoder-api-service:8080"
       LOWCODER_NODE_SERVICE_URL: "http://lowcoder-node-service:6060"
     restart: unless-stopped

deploy/docker/docker-compose.yaml

@@ -36,6 +36,8 @@ services:
       # api and node service parameters
       LOWCODER_API_SERVICE_URL: "http://localhost:8080"
       LOWCODER_NODE_SERVICE_URL: "http://localhost:6060"
+      # frontend parameters
+      LOWCODER_MAX_REQUEST_SIZE: 20m
     volumes:
       - ./lowcoder-stacks:/lowcoder-stacks
     restart: unless-stopped

deploy/docker/frontend/01-update-nginx-conf.sh

@@ -18,9 +18,11 @@ else
    ln -s /etc/nginx/nginx-http.conf /etc/nginx/nginx.conf
 fi;
 
+sed -i "s@__LOWCODER_MAX_REQUEST_SIZE__@${LOWCODER_MAX_REQUEST_SIZE:=20m}@" /etc/nginx/nginx.conf
 sed -i "s@__LOWCODER_API_SERVICE_URL__@${LOWCODER_API_SERVICE_URL:=http://localhost:8080}@" /etc/nginx/nginx.conf
 sed -i "s@__LOWCODER_NODE_SERVICE_URL__@${LOWCODER_NODE_SERVICE_URL:=http://localhost:6060}@" /etc/nginx/nginx.conf
 
 echo "nginx config updated with:"
-echo "    Lowcoder api service URL: ${LOWCODER_API_SERVICE_URL}"
-echo "   Lowcoder node service URL: ${LOWCODER_NODE_SERVICE_URL}"
+echo "    Lowcoder max upload size: ${LOWCODER_MAX_REQUEST_SIZE:=20m}"
+echo "    Lowcoder api service URL: ${LOWCODER_API_SERVICE_URL:=http://localhost:8080}"
+echo "   Lowcoder node service URL: ${LOWCODER_NODE_SERVICE_URL:=http://localhost:6060}"

deploy/docker/frontend/nginx-http.conf

@@ -10,6 +10,7 @@ http {
 
     include       /etc/nginx/mime.types;
     default_type  application/octet-stream;
+    client_max_body_size __LOWCODER_MAX_REQUEST_SIZE__;
 
     log_format main '"$time_local" client=$remote_addr '
                'method=$request_method request="$request" '

deploy/docker/frontend/nginx-https.conf

@@ -10,6 +10,7 @@ http {
 
     include       /etc/nginx/mime.types;
     default_type  application/octet-stream;
+    client_max_body_size __LOWCODER_MAX_REQUEST_SIZE__;
 
     log_format main '"$time_local" client=$remote_addr '
                'method=$request_method request="$request" '

server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/config/CommonConfig.java

@@ -6,6 +6,8 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.ListUtils;
@@ -33,8 +35,9 @@ public class CommonConfig {
     private String version;
     private boolean blockHoundEnable;
     private String cookieName;
-    private int maxQueryRequestSizeInMb = 10;
-    private int maxQueryResponseSizeInMb = 10;
+    private String maxUploadSize = "20MB";
+    private String maxQueryRequestSize = "20MB";
+    private String maxQueryResponseSize = "20MB";
     private Query query = new Query();
     private Cookie cookie = new Cookie();
     private JsExecutor jsExecutor = new JsExecutor();
@@ -48,6 +51,37 @@ public boolean isEnterpriseMode() {
         return workspace.getMode() == WorkspaceMode.ENTERPRISE;
     }
 
+    private static final Pattern HUMAN_DATA_SIZE_PATTERN = Pattern.compile("^([ \t]*)(?<number>\\d+(\\.\\d+)?)([ \t]*)(?<unit>[kKmMgGtT]{1})?([bB \t]*)$");
+    public static String normalizeDataUnits(String dataWithUnits)
+    {
+    	String normalized = dataWithUnits;
+    	Matcher m = HUMAN_DATA_SIZE_PATTERN.matcher(dataWithUnits);
+    	if (m.matches())
+    	{
+    		normalized = m.group("number");
+    		if (StringUtils.isNotBlank(m.group("unit")))
+    		{
+    			normalized += m.group("unit").toUpperCase() + "B";
+    		}
+    	}
+    	return normalized;
+    }
+    
+    public void setMaxUploadSize(String size)
+    {
+    	this.maxUploadSize = normalizeDataUnits(size);
+    }
+    
+    public void setMaxQueryRequestSize(String size)
+    {
+    	this.maxQueryRequestSize = normalizeDataUnits(size);
+    }
+    
+    public void setMaxQueryResponseSize(String size)
+    {
+    	this.maxQueryResponseSize = normalizeDataUnits(size);
+    }
+    
     @Data
     public static class Domain {
         private String defaultValue;

server/api-service/lowcoder-server/pom.xml

@@ -153,8 +153,8 @@
             <artifactId>json-path</artifactId>
         </dependency>
         <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
+		    <groupId>jakarta.servlet</groupId>
+		    <artifactId>jakarta.servlet-api</artifactId>
         </dependency>
 
         <dependency>

server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/framework/configuration/ApplicationConfiguration.java

@@ -0,0 +1,26 @@
+package org.lowcoder.api.framework.configuration;
+
+import org.lowcoder.sdk.config.CommonConfig;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.web.servlet.MultipartConfigFactory;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.util.unit.DataSize;
+
+import jakarta.servlet.MultipartConfigElement;
+
+@Configuration
+public class ApplicationConfiguration 
+{
+	@Autowired
+	private CommonConfig common;  
+	
+	@Bean
+	public MultipartConfigElement multipartConfigElement() 
+	{
+		MultipartConfigFactory factory = new MultipartConfigFactory();
+		factory.setMaxRequestSize(DataSize.parse(common.getMaxUploadSize()));
+		factory.setMaxFileSize(DataSize.parse(common.getMaxUploadSize()));
+		return factory.createMultipartConfig();
+	}
+}