Merge pull request #4261 from NginxProxyManager/develop

v2.12.2

Jenkinsfile

@@ -128,7 +128,7 @@ pipeline {
 					sh 'docker-compose down --remove-orphans --volumes -t 30 || true'
 				}
 				unstable {
-					dir(path: 'test/results') {
+					dir(path: 'testing/results') {
 						archiveArtifacts(allowEmptyArchive: true, artifacts: '**/*', excludes: '**/*.xml')
 					}
 				}
@@ -161,7 +161,7 @@ pipeline {
 					sh 'docker-compose down --remove-orphans --volumes -t 30 || true'
 				}
 				unstable {
-					dir(path: 'test/results') {
+					dir(path: 'testing/results') {
 						archiveArtifacts(allowEmptyArchive: true, artifacts: '**/*', excludes: '**/*.xml')
 					}
 				}
@@ -199,7 +199,7 @@ pipeline {
 					sh 'docker-compose down --remove-orphans --volumes -t 30 || true'
 				}
 				unstable {
-					dir(path: 'test/results') {
+					dir(path: 'testing/results') {
 						archiveArtifacts(allowEmptyArchive: true, artifacts: '**/*', excludes: '**/*.xml')
 					}
 				}

backend/internal/access-list.js

@@ -258,7 +258,6 @@ const internalAccessList = {
 					})
 					.where('access_list.is_deleted', 0)
 					.andWhere('access_list.id', data.id)
-					.groupBy('access_list.id')
 					.allowGraph('[owner,items,clients,proxy_hosts.[certificate,access_list.[clients,items]]]')
 					.first();
 

backend/migrations/20241209025008_client_max_body_size.js

@@ -1,34 +0,0 @@
-const migrate_name = 'client_max_body_size';
-const logger       = require('../logger').migrate;
-
-/**
- * Migrate
- *
- * @see http://knexjs.org/#Schema
- *
- * @param   {Object}  knex
- * @param   {Promise} Promise
- * @returns {Promise}
- */
-exports.up = function (knex/*, Promise*/) {
-	logger.info('[' + migrate_name + '] Migrating Up...');
-
-	return knex.schema.table('proxy_host', function (proxy_host) {
-		proxy_host.integer('client_max_body_size').notNull().unsigned().defaultTo('1');
-	})
-		.then(() => {
-			logger.info('[' + migrate_name + '] proxy_host Table altered');
-		});
-};
-
-/**
- * Undo Migrate
- *
- * @param   {Object}  knex
- * @param   {Promise} Promise
- * @returns {Promise}
- */
-exports.down = function (knex, Promise) {
-	logger.warn('[' + migrate_name + '] You can\'t migrate down this one.');
-	return Promise.resolve(true);
-};

backend/schema/components/proxy-host-object.json

@@ -9,7 +9,6 @@
 		"domain_names",
 		"forward_host",
 		"forward_port",
-		"client_max_body_size",
 		"access_list_id",
 		"certificate_id",
 		"ssl_forced",
@@ -53,11 +52,6 @@
 			"minimum": 1,
 			"maximum": 65535
 		},
-		"client_max_body_size": {
-			"type": "integer",
-			"minimum": 1,
-			"maximum": 4096
-		},
 		"access_list_id": {
 			"$ref": "../common.json#/properties/access_list_id"
 		},
@@ -118,9 +112,6 @@
 					"forward_port": {
 						"$ref": "#/properties/forward_port"
 					},
-					"client_max_body_size": {
-						"$ref": "#/properties/client_max_body_size"
-					},
 					"forward_path": {
 						"type": "string"
 					},

backend/schema/paths/nginx/proxy-hosts/get.json

@@ -34,7 +34,6 @@
 									"domain_names": ["test.example.com"],
 									"forward_host": "127.0.0.1",
 									"forward_port": 8989,
-									"client_max_body_size": 1,
 									"access_list_id": 0,
 									"certificate_id": 0,
 									"ssl_forced": false,

backend/schema/paths/nginx/proxy-hosts/hostID/get.json

@@ -34,7 +34,6 @@
 								"domain_names": ["test.example.com"],
 								"forward_host": "192.168.0.10",
 								"forward_port": 8989,
-								"client_max_body_size": 1,
 								"access_list_id": 0,
 								"certificate_id": 0,
 								"ssl_forced": false,

backend/schema/paths/nginx/proxy-hosts/hostID/put.json

@@ -41,9 +41,6 @@
 						"forward_port": {
 							"$ref": "../../../../components/proxy-host-object.json#/properties/forward_port"
 						},
-						"client_max_body_size": {
-							"$ref": "../../../../components/proxy-host-object.json#/properties/client_max_body_size"
-						},
 						"certificate_id": {
 							"$ref": "../../../../components/proxy-host-object.json#/properties/certificate_id"
 						},
@@ -103,7 +100,6 @@
 								"domain_names": ["test.example.com"],
 								"forward_host": "192.168.0.10",
 								"forward_port": 8989,
-								"client_max_body_size": 1,
 								"access_list_id": 0,
 								"certificate_id": 0,
 								"ssl_forced": false,

backend/schema/paths/nginx/proxy-hosts/post.json

@@ -29,9 +29,6 @@
 						"forward_port": {
 							"$ref": "../../../components/proxy-host-object.json#/properties/forward_port"
 						},
-						"client_max_body_size": {
-							"$ref": "../../../components/proxy-host-object.json#/properties/client_max_body_size"
-						},
 						"certificate_id": {
 							"$ref": "../../../components/proxy-host-object.json#/properties/certificate_id"
 						},
@@ -91,7 +88,6 @@
 								"domain_names": ["test.example.com"],
 								"forward_host": "127.0.0.1",
 								"forward_port": 8989,
-								"client_max_body_size": 1,
 								"access_list_id": 0,
 								"certificate_id": 0,
 								"ssl_forced": false,

backend/templates/proxy_host.conf

@@ -47,8 +47,6 @@ proxy_http_version 1.1;
   }
 {% endif %}
 
-  client_max_body_size {{ client_max_body_size }}m;
-
   # Custom
   include /data/nginx/custom/server_proxy[.]conf;
 }

docker/docker-compose.ci.yml

@@ -40,7 +40,7 @@ services:
           - ca.internal
 
   pdns:
-    image: pschiffe/pdns-mysql:4.8
+    image: pschiffe/pdns-mysql
     volumes:
       - '/etc/localtime:/etc/localtime:ro'
     environment:

docker/docker-compose.dev.yml

@@ -132,7 +132,7 @@ services:
       - 8128:3128
 
   pdns:
-    image: pschiffe/pdns-mysql:4.8
+    image: pschiffe/pdns-mysql
     container_name: npm2dev.pdns
     volumes:
       - '/etc/localtime:/etc/localtime:ro'
@@ -218,7 +218,7 @@ services:
     env_file:
       - ci.env
     ports:
-      - 9000:9000
+      - 9000:9000 
     depends_on:
       - authentik-redis
       - db-postgres

docs/yarn.lock

@@ -1065,9 +1065,9 @@ vfile@^6.0.0:
     vfile-message "^4.0.0"
 
 vite@^5.4.8:
-  version "5.4.14"
+  version "5.4.8"
-  resolved "https://registry.yarnpkg.com/vite/-/vite-5.4.14.tgz#ff8255edb02134df180dcfca1916c37a6abe8408"
+  resolved "https://registry.yarnpkg.com/vite/-/vite-5.4.8.tgz#af548ce1c211b2785478d3ba3e8da51e39a287e8"
-  integrity sha512-EK5cY7Q1D8JNhSaPKVK4pwBFvaTmZxEnoKXLG/U9gmdDcihQGNzFlgIvaxezFR4glP1LsuiedwMBqCXH3wZccA==
+  integrity sha512-FqrItQ4DT1NC4zCUqMB4c4AZORMKIa0m8/URVCZ77OZ/QSNeJ54bU1vrFADbDsuwfIPcgknRkmqakQcgnL4GiQ==
   dependencies:
     esbuild "^0.21.3"
     postcss "^8.4.43"

frontend/js/app/nginx/proxy/form.ejs

@@ -81,12 +81,7 @@
                                 </label>
                             </div>
                         </div>
-                        <div class="col-sm-12 col-md-12">
+
-                            <div class="form-group">
-                                <label class="form-label"><%- i18n('proxy-hosts', 'client-max-body-size' ) %></label>
-                                <input name="client_max_body_size" type="number" class="form-control text-monospace" placeholder="1" value="<%- client_max_body_size %>" required>
-                            </div>
-                        </div>
                         <div class="col-sm-12 col-md-12">
                             <div class="form-group">
                                 <label class="form-label"><%- i18n('proxy-hosts', 'access-list') %></label>

frontend/js/app/nginx/proxy/form.js

@@ -160,7 +160,6 @@ module.exports = Mn.View.extend({
 
             // Manipulate
             data.forward_port            = parseInt(data.forward_port, 10);
-            data.client_max_body_size    = parseInt(data.client_max_body_size, 10);
             data.block_exploits          = !!data.block_exploits;
             data.caching_enabled         = !!data.caching_enabled;
             data.allow_websocket_upgrade = !!data.allow_websocket_upgrade;

frontend/js/i18n/messages.json

@@ -125,7 +125,6 @@
       "forward-scheme": "Scheme",
       "forward-host": "Forward Hostname / IP",
       "forward-port": "Forward Port",
-      "client-max-body-size": "Max proxied upload size (Mb)",
       "delete": "Delete Proxy Host",
       "delete-confirm": "Are you sure you want to delete the Proxy host for: <strong>{domains}</strong>?",
       "help-title": "What is a Proxy Host?",

frontend/js/models/proxy-host.js

@@ -12,7 +12,6 @@ const model = Backbone.Model.extend({
             forward_scheme:          'http',
             forward_host:            '',
             forward_port:            null,
-            client_max_body_size:    1,
             access_list_id:          0,
             certificate_id:          0,
             ssl_forced:              false,

global/certbot-dns-plugins.json

@@ -215,14 +215,6 @@
 		"credentials": "# Gandi personal access token\ndns_gandi_token=PERSONAL_ACCESS_TOKEN",
 		"full_plugin_name": "dns-gandi"
 	},
-	"gcore": {
-		"name": "Gcore DNS",
-		"package_name": "certbot-dns-gcore",
-		"version": "~=0.1.8",
-		"dependencies": "",
-		"credentials": "dns_gcore_apitoken = 0123456789abcdef0123456789abcdef01234567",
-		"full_plugin_name": "dns-gcore"
-	},
 	"godaddy": {
 		"name": "GoDaddy",
 		"package_name": "certbot-dns-godaddy",

test/cypress/e2e/api/ProxyHosts.cy.js

@@ -18,7 +18,6 @@ describe('Proxy Hosts endpoints', () => {
 				forward_scheme: 'http',
 				forward_host:   '1.1.1.1',
 				forward_port:   80,
-				client_max_body_size: 1,
 				access_list_id: '0',
 				certificate_id: 0,
 				meta:           {