apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated jetty maxFormContentSize value to 1048576 bytes (default is 200000 bytes), to support user data upto 1048576 bytes (#8420)

Browse Source 
This PR enables support for user data content upto 1048576 bytes - updates jetty maxFormContentSize value to 1048576 bytes (default is 200000 bytes).

CloudStack can support max user data content to 1048576 bytes (the size can be configurable through vm.userdata.max.length setting, max 1048576), but it's limited due to the default Jetty max content size, which is 200000 bytes.

Configuration Reference from jetty doc:
https://eclipse.dev/jetty/documentation/jetty-9/index.html#configuring-specific-webapp-deployment (check with maxFormContentSize here)
This commit is contained in:
Suresh Kumar Anaparti 2024-01-09 17:38:44 +05:30 committed by GitHub
parent 9a915b11c4
commit 2b28a664fe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
client/conf/server.properties.in
View File

@ -29,6 +29,9 @@ http.port=8080
# Max inactivity time in minutes for the session # Max inactivity time in minutes for the session
session.timeout=30 session.timeout=30
# Max allowed API request payload / content size in bytes
request.content.size=1048576
# Options to configure and enable HTTPS on management server # Options to configure and enable HTTPS on management server
# #
# For management server to pickup these configuration settings, the configured # For management server to pickup these configuration settings, the configured

19
client/src/main/java/org/apache/cloudstack/ServerDaemon.java
View File

@ -26,10 +26,10 @@ import java.lang.management.ManagementFactory;
import java.net.URL; import java.net.URL;
import java.util.Properties; import java.util.Properties;
import com.cloud.utils.Pair;
import com.cloud.utils.server.ServerProperties;
import org.apache.commons.daemon.Daemon; import org.apache.commons.daemon.Daemon;
import org.apache.commons.daemon.DaemonContext; import org.apache.commons.daemon.DaemonContext;
import org.apache.commons.lang3.StringUtils;
import org.apache.log4j.Logger;
import org.eclipse.jetty.jmx.MBeanContainer; import org.eclipse.jetty.jmx.MBeanContainer;
import org.eclipse.jetty.server.ForwardedRequestCustomizer; import org.eclipse.jetty.server.ForwardedRequestCustomizer;
import org.eclipse.jetty.server.HttpConfiguration; import org.eclipse.jetty.server.HttpConfiguration;
@ -40,6 +40,7 @@ import org.eclipse.jetty.server.SecureRequestCustomizer;
import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.ServerConnector; import org.eclipse.jetty.server.ServerConnector;
import org.eclipse.jetty.server.SslConnectionFactory; import org.eclipse.jetty.server.SslConnectionFactory;
import org.eclipse.jetty.server.handler.ContextHandler;
import org.eclipse.jetty.server.handler.HandlerCollection; import org.eclipse.jetty.server.handler.HandlerCollection;
import org.eclipse.jetty.server.handler.MovedContextHandler; import org.eclipse.jetty.server.handler.MovedContextHandler;
import org.eclipse.jetty.server.handler.RequestLogHandler; import org.eclipse.jetty.server.handler.RequestLogHandler;
@ -50,10 +51,10 @@ import org.eclipse.jetty.util.ssl.SslContextFactory;
import org.eclipse.jetty.util.thread.QueuedThreadPool; import org.eclipse.jetty.util.thread.QueuedThreadPool;
import org.eclipse.jetty.util.thread.ScheduledExecutorScheduler; import org.eclipse.jetty.util.thread.ScheduledExecutorScheduler;
import org.eclipse.jetty.webapp.WebAppContext; import org.eclipse.jetty.webapp.WebAppContext;
import org.apache.log4j.Logger;
import com.cloud.utils.Pair;
import com.cloud.utils.PropertiesUtil; import com.cloud.utils.PropertiesUtil;
import org.apache.commons.lang3.StringUtils; import com.cloud.utils.server.ServerProperties;
/*** /***
* The ServerDaemon class implements the embedded server, it can be started either * The ServerDaemon class implements the embedded server, it can be started either
@ -79,6 +80,8 @@ public class ServerDaemon implements Daemon {
private static final String KEYSTORE_PASSWORD = "https.keystore.password"; private static final String KEYSTORE_PASSWORD = "https.keystore.password";
private static final String WEBAPP_DIR = "webapp.dir"; private static final String WEBAPP_DIR = "webapp.dir";
private static final String ACCESS_LOG = "access.log"; private static final String ACCESS_LOG = "access.log";
private static final String REQUEST_CONTENT_SIZE_KEY = "request.content.size";
private static final int DEFAULT_REQUEST_CONTENT_SIZE = 1048576;
//////////////////////////////////////////////////////// ////////////////////////////////////////////////////////
/////////////// Server Configuration /////////////////// /////////////// Server Configuration ///////////////////
@ -90,6 +93,7 @@ public class ServerDaemon implements Daemon {
private int httpPort = 8080; private int httpPort = 8080;
private int httpsPort = 8443; private int httpsPort = 8443;
private int sessionTimeout = 30; private int sessionTimeout = 30;
private int maxFormContentSize = DEFAULT_REQUEST_CONTENT_SIZE;
private boolean httpsEnable = false; private boolean httpsEnable = false;
private String accessLogFile = "access.log"; private String accessLogFile = "access.log";
private String bindInterface = null; private String bindInterface = null;
@ -136,6 +140,7 @@ public class ServerDaemon implements Daemon {
setWebAppLocation(properties.getProperty(WEBAPP_DIR)); setWebAppLocation(properties.getProperty(WEBAPP_DIR));
setAccessLogFile(properties.getProperty(ACCESS_LOG, "access.log")); setAccessLogFile(properties.getProperty(ACCESS_LOG, "access.log"));
setSessionTimeout(Integer.valueOf(properties.getProperty(SESSION_TIMEOUT, "30"))); setSessionTimeout(Integer.valueOf(properties.getProperty(SESSION_TIMEOUT, "30")));
setMaxFormContentSize(Integer.valueOf(properties.getProperty(REQUEST_CONTENT_SIZE_KEY, String.valueOf(DEFAULT_REQUEST_CONTENT_SIZE))));
} catch (final IOException e) { } catch (final IOException e) {
LOG.warn("Failed to read configuration from server.properties file", e); LOG.warn("Failed to read configuration from server.properties file", e);
} finally { } finally {
@ -186,6 +191,7 @@ public class ServerDaemon implements Daemon {
// Extra config options // Extra config options
server.setStopAtShutdown(true); server.setStopAtShutdown(true);
server.setAttribute(ContextHandler.MAX_FORM_CONTENT_SIZE_KEY, maxFormContentSize);
// HTTPS Connector // HTTPS Connector
createHttpsConnector(httpConfig); createHttpsConnector(httpConfig);
@ -257,6 +263,7 @@ public class ServerDaemon implements Daemon {
final WebAppContext webApp = new WebAppContext(); final WebAppContext webApp = new WebAppContext();
webApp.setContextPath(contextPath); webApp.setContextPath(contextPath);
webApp.setInitParameter("org.eclipse.jetty.servlet.Default.dirAllowed", "false"); webApp.setInitParameter("org.eclipse.jetty.servlet.Default.dirAllowed", "false");
webApp.setMaxFormContentSize(maxFormContentSize);
// GZIP handler // GZIP handler
final GzipHandler gzipHandler = new GzipHandler(); final GzipHandler gzipHandler = new GzipHandler();
@ -355,4 +362,8 @@ public class ServerDaemon implements Daemon {
public void setSessionTimeout(int sessionTimeout) { public void setSessionTimeout(int sessionTimeout) {
this.sessionTimeout = sessionTimeout; this.sessionTimeout = sessionTimeout;
} }
public void setMaxFormContentSize(int maxFormContentSize) {
this.maxFormContentSize = maxFormContentSize;
}
} }