Allow specifying file upload limit

https://pulp.plan.io/issues/8212 closes #8212
pulp · Mar 19, 2021 · d26a377 · d26a377
1 parent 3267ae8
commit d26a377
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 0 deletions.
diff --git a/CHANGES/8212.feature b/CHANGES/8212.feature
@@ -0,0 +1 @@
+Allow specifying file upload limit
diff --git a/roles/pulp_webserver/README.md b/roles/pulp_webserver/README.md
@@ -38,6 +38,7 @@ Role Variables
    directory for ACME (letsencrypt) files or SSL certs. This is not to be confused with the Pulp
    application's setting `STATIC_ROOT`, which is a function of Pulp itself (not the webserver) and servces
    a different set of files.
+- `pulp_client_max_body_size`: Sets the maximum allowed size of the client request body.
 
 Plugin Webserver Configs
 ------------------------

diff --git a/roles/pulp_webserver/defaults/main.yml b/roles/pulp_webserver/defaults/main.yml
@@ -31,3 +31,7 @@ pulp_webserver_https_port: 443
 pulp_webserver_tls_key: ''
 pulp_webserver_tls_cert: ''
 pulp_webserver_tls_custom_ca_cert: ''
+# Default values:
+# https://nginx.org/en/docs/http/ngx_http_core_module.html#client_max_body_size
+# https://httpd.apache.org/docs/2.0/mod/core.html#limitrequestbody
+pulp_client_max_body_size: "{{ '1m' if pulp_webserver_server == 'nginx' else '0' }}"
diff --git a/roles/pulp_webserver/templates/nginx.conf.j2 b/roles/pulp_webserver/templates/nginx.conf.j2
@@ -59,6 +59,7 @@ http {
 
         # The default client_max_body_size is 1m. Clients uploading
         # files larger than this will need to chunk said files.
+        client_max_body_size {{ pulp_client_max_body_size }};
 
         # Gunicorn docs suggest this value.
         keepalive_timeout 5;

diff --git a/roles/pulp_webserver/templates/pulp-vhost.conf.j2 b/roles/pulp_webserver/templates/pulp-vhost.conf.j2
@@ -4,6 +4,7 @@ Define pulp-api {{ __pulp_webserver_apache_api_bind }}
 {% if pulp_webserver_disable_https | bool %}
 <VirtualHost *:{{ pulp_webserver_http_port }}>
   ServerName {{ pulp_webserver_httpd_servername }}
+  LimitRequestBody {{ pulp_client_max_body_size }}
 
   ## Logging
   ErrorLog "{{ pulp_webserver_apache_log_dir }}/pulp_error.log"
@@ -35,11 +36,13 @@ Define pulp-api {{ __pulp_webserver_apache_api_bind }}
 {% else %}
 <VirtualHost *:{{ pulp_webserver_http_port }}>
   ServerName {{ pulp_webserver_httpd_servername }}
+  LimitRequestBody {{ pulp_client_max_body_size }}
   Redirect permanent / https://{{ pulp_webserver_httpd_servername }}/
 </VirtualHost>
 
 <VirtualHost *:{{ pulp_webserver_https_port }}>
   ServerName {{ pulp_webserver_httpd_servername }}
+  LimitRequestBody {{ pulp_client_max_body_size }}
 
   # static files that can change dynamically, or are needed for TLS
   # purposes are served through the webserver.