From c98ed17f93624cb1e329f4039667cf150d4e624f Mon Sep 17 00:00:00 2001 From: Renan Medina Date: Mon, 27 Oct 2025 19:15:13 -0300 Subject: [PATCH 1/5] feat: Adding timeout inputs for proxy configs at advanced tab --- frontend/js/app/nginx/proxy/form.ejs | 267 +++++++++++++++++---------- frontend/js/i18n/messages.json | 9 +- frontend/js/models/proxy-host.js | 49 ++--- 3 files changed, 205 insertions(+), 120 deletions(-) diff --git a/frontend/js/app/nginx/proxy/form.ejs b/frontend/js/app/nginx/proxy/form.ejs index 8e7a2a2df..77c7e27fc 100644 --- a/frontend/js/app/nginx/proxy/form.ejs +++ b/frontend/js/app/nginx/proxy/form.ejs @@ -1,16 +1,24 @@
-
<%- i18n('proxy-hosts', 'form-title', {id: id}) %>
+
<%- i18n('proxy-hosts', 'form-title' , {id: id}) %>
@@ -18,7 +26,8 @@
- +
@@ -29,64 +38,81 @@
- - + +
- +
- - + +
- - + +
- - +
@@ -98,46 +124,61 @@
- - + +
@@ -146,44 +187,38 @@
-
<%= i18n('ssl', 'certbot-warning') %>
+
+ <%= i18n('ssl', 'certbot-warning' ) %> +
- - + <% _.each(dns_plugins, function(plugin_info, plugin_name){ %> - - <% }); %> + + <% }); %>
@@ -193,19 +228,18 @@
- - + id="dns_provider_credentials"><%- getDnsProviderCredentials() %>
- <%= i18n('ssl', 'credentials-file-content-info') %> + <%= i18n('ssl', 'credentials-file-content-info' ) %>
- <%= i18n('ssl', 'stored-as-plaintext-info') %> + <%= i18n('ssl', 'stored-as-plaintext-info' ) %>
@@ -215,18 +249,13 @@
- - + +
- <%= i18n('ssl', 'propagation-seconds-info') %> + <%= i18n('ssl', 'propagation-seconds-info' ) %>
@@ -237,16 +266,23 @@
- - + +
@@ -257,17 +293,55 @@
-

<%- i18n('all-hosts', 'advanced-config-var-headline') %>

+

<%- i18n('all-hosts', 'advanced-config-var-headline' ) %>

    -
  • $server <%- i18n('proxy-hosts', 'forward-host') %>
    • -
  • $port <%- i18n('proxy-hosts', 'forward-port') %>
    • -
  • $forward_scheme <%- i18n('proxy-hosts', 'forward-scheme') %>
    • +
  • $server <%- i18n('proxy-hosts', 'forward-host' ) %>
    • +
  • $port <%- i18n('proxy-hosts', 'forward-port' ) %>
    • +
  • $forward_scheme <%- i18n('proxy-hosts', 'forward-scheme' ) %>
- - + + +
+

<%- + i18n('all-hosts', 'advanced-config-header-info' ) %>

+ +
+

<%- i18n('all-hosts', 'advanced-config-timeouts-headline' ) %>

+

<%- i18n('all-hosts', 'advanced-config-timeouts-info' ) %> +

+ +
+
+
+ + +
+
+
+
+ + +
+
+
+
+ + +
+
+
-

<%- i18n('all-hosts', 'advanced-config-header-info') %>

@@ -275,7 +349,8 @@
- - + +
-
+
\ No newline at end of file diff --git a/frontend/js/i18n/messages.json b/frontend/js/i18n/messages.json index d409942ff..b669ed9b6 100644 --- a/frontend/js/i18n/messages.json +++ b/frontend/js/i18n/messages.json @@ -86,6 +86,11 @@ "advanced-config": "Custom Nginx Configuration", "advanced-config-var-headline": "These proxy details are available as nginx variables:", "advanced-config-header-info": "Please note, that any add_header or set_header directives added here will not be used by nginx. You will have to add a custom location '/' and add the header in the custom config there.", + "advanced-config-timeouts-headline": "Timeouts", + "advanced-config-timeouts-info": "Set the timeouts for the proxy connection. The default values are 60 seconds for send, 60 seconds for read, and 60 seconds for connect.", + "advanced-config-timeouts-proxy-send-timeout": "Proxy Send Timeout (seconds)", + "advanced-config-timeouts-proxy-read-timeout": "Proxy Read Timeout (seconds)", + "advanced-config-timeouts-proxy-connect-timeout": "Proxy Connect Timeout (seconds)", "hsts-enabled": "HSTS Enabled", "hsts-subdomains": "HSTS Subdomains", "locations": "Custom locations" @@ -209,7 +214,7 @@ "download": "Download", "renew-title": "Renew Let's Encrypt Certificate", "search": "Search Certificate…", - "in-use" : "In use", + "in-use": "In use", "inactive": "Inactive", "active-domain_names": "Active domain names" }, @@ -298,4 +303,4 @@ "default-site-redirect": "Redirect" } } -} +} \ No newline at end of file diff --git a/frontend/js/models/proxy-host.js b/frontend/js/models/proxy-host.js index b82d09fef..7e4c1ee8c 100644 --- a/frontend/js/models/proxy-host.js +++ b/frontend/js/models/proxy-host.js @@ -5,35 +5,40 @@ const model = Backbone.Model.extend({ defaults: function () { return { - id: undefined, - created_on: null, - modified_on: null, - domain_names: [], - forward_scheme: 'http', - forward_host: '', - forward_port: null, - access_list_id: 0, - certificate_id: 0, - ssl_forced: false, - hsts_enabled: false, - hsts_subdomains: false, - caching_enabled: false, + id: undefined, + created_on: null, + modified_on: null, + domain_names: [], + forward_scheme: 'http', + forward_host: '', + forward_port: null, + access_list_id: 0, + certificate_id: 0, + ssl_forced: false, + hsts_enabled: false, + hsts_subdomains: false, + caching_enabled: false, allow_websocket_upgrade: false, - block_exploits: false, - http2_support: false, - advanced_config: '', - enabled: true, - meta: {}, + timeouts: { + proxy_send_timeout: 60, + proxy_read_timeout: 60, + proxy_connect_timeout: 60 + }, + block_exploits: false, + http2_support: false, + advanced_config: '', + enabled: true, + meta: {}, // The following are expansions: - owner: null, - access_list: null, - certificate: null + owner: null, + access_list: null, + certificate: null }; } }); module.exports = { - Model: model, + Model: model, Collection: Backbone.Collection.extend({ model: model }) From 7737d2f9e5f71a3c7ac2d391538fadf92b6965fd Mon Sep 17 00:00:00 2001 From: Renan Medina Date: Mon, 27 Oct 2025 19:16:27 -0300 Subject: [PATCH 2/5] chore: Changing timeout info message to a more simple one --- frontend/js/i18n/messages.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/js/i18n/messages.json b/frontend/js/i18n/messages.json index b669ed9b6..030ff9384 100644 --- a/frontend/js/i18n/messages.json +++ b/frontend/js/i18n/messages.json @@ -87,7 +87,7 @@ "advanced-config-var-headline": "These proxy details are available as nginx variables:", "advanced-config-header-info": "Please note, that any add_header or set_header directives added here will not be used by nginx. You will have to add a custom location '/' and add the header in the custom config there.", "advanced-config-timeouts-headline": "Timeouts", - "advanced-config-timeouts-info": "Set the timeouts for the proxy connection. The default values are 60 seconds for send, 60 seconds for read, and 60 seconds for connect.", + "advanced-config-timeouts-info": "Set the timeouts for the proxy connection.", "advanced-config-timeouts-proxy-send-timeout": "Proxy Send Timeout (seconds)", "advanced-config-timeouts-proxy-read-timeout": "Proxy Read Timeout (seconds)", "advanced-config-timeouts-proxy-connect-timeout": "Proxy Connect Timeout (seconds)", From 75aee185bc87bd94f5b30f461bd7562d5fe7e513 Mon Sep 17 00:00:00 2001 From: Renan Medina Date: Mon, 27 Oct 2025 19:53:00 -0300 Subject: [PATCH 3/5] feat: Adding persistence for timeout values and writing it to template configs --- ...51027193925_add_timeouts_to_proxy_hosts.js | 44 +++++++++++++++++++ .../schema/components/proxy-host-object.json | 35 +++++++++++++-- .../paths/nginx/proxy-hosts/hostID/put.json | 27 +++++++++--- .../schema/paths/nginx/proxy-hosts/post.json | 34 +++++++++++--- backend/templates/proxy_host.conf | 4 ++ frontend/js/app/nginx/proxy/form.ejs | 18 ++++---- frontend/js/i18n/messages.json | 1 + frontend/js/models/proxy-host.js | 8 ++-- 8 files changed, 143 insertions(+), 28 deletions(-) create mode 100644 backend/migrations/20251027193925_add_timeouts_to_proxy_hosts.js diff --git a/backend/migrations/20251027193925_add_timeouts_to_proxy_hosts.js b/backend/migrations/20251027193925_add_timeouts_to_proxy_hosts.js new file mode 100644 index 000000000..da523f8a2 --- /dev/null +++ b/backend/migrations/20251027193925_add_timeouts_to_proxy_hosts.js @@ -0,0 +1,44 @@ +const migrate_name = 'pass_auth'; +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('proxy_send_timeout').notNull().defaultTo(60); + proxy_host.integer('proxy_read_timeout').notNull().defaultTo(60); + proxy_host.integer('proxy_connect_timeout').notNull().defaultTo(60); + }) + .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.info('[' + migrate_name + '] Migrating Down...'); + + return knex.schema.table('proxy_host', function (proxy_host) { + proxy_host.dropColumn('proxy_send_timeout'); + proxy_host.dropColumn('proxy_read_timeout'); + proxy_host.dropColumn('proxy_connect_timeout'); + }) + .then(() => { + logger.info('[' + migrate_name + '] proxy_host proxy_send_timeout, proxy_read_timeout, proxy_connect_timeout Columns dropped'); + }); +}; diff --git a/backend/schema/components/proxy-host-object.json b/backend/schema/components/proxy-host-object.json index e9dcacb5e..54e2449a3 100644 --- a/backend/schema/components/proxy-host-object.json +++ b/backend/schema/components/proxy-host-object.json @@ -15,6 +15,7 @@ "caching_enabled", "block_exploits", "advanced_config", + "timeouts", "meta", "allow_websocket_upgrade", "http2_support", @@ -69,6 +70,21 @@ "advanced_config": { "type": "string" }, + "proxy_send_timeout": { + "description": "Proxy Send Timeout", + "type": "integer", + "minimum": 0 + }, + "proxy_read_timeout": { + "description": "Proxy Read Timeout", + "type": "integer", + "minimum": 0 + }, + "proxy_connect_timeout": { + "description": "Proxy Connect Timeout", + "type": "integer", + "minimum": 0 + }, "meta": { "type": "object" }, @@ -82,7 +98,10 @@ }, "forward_scheme": { "type": "string", - "enum": ["http", "https"] + "enum": [ + "http", + "https" + ] }, "enabled": { "$ref": "../common.json#/properties/enabled" @@ -92,11 +111,19 @@ "minItems": 0, "items": { "type": "object", - "required": ["forward_scheme", "forward_host", "forward_port", "path"], + "required": [ + "forward_scheme", + "forward_host", + "forward_port", + "path" + ], "additionalProperties": false, "properties": { "id": { - "type": ["integer", "null"] + "type": [ + "integer", + "null" + ] }, "path": { "type": "string", @@ -150,4 +177,4 @@ ] } } -} +} \ No newline at end of file diff --git a/backend/schema/paths/nginx/proxy-hosts/hostID/put.json b/backend/schema/paths/nginx/proxy-hosts/hostID/put.json index 5cab6e752..a59228d08 100644 --- a/backend/schema/paths/nginx/proxy-hosts/hostID/put.json +++ b/backend/schema/paths/nginx/proxy-hosts/hostID/put.json @@ -1,10 +1,14 @@ { "operationId": "updateProxyHost", "summary": "Update a Proxy Host", - "tags": ["Proxy Hosts"], + "tags": [ + "Proxy Hosts" + ], "security": [ { - "BearerAuth": ["proxy_hosts"] + "BearerAuth": [ + "proxy_hosts" + ] } ], "parameters": [ @@ -71,6 +75,15 @@ "advanced_config": { "$ref": "../../../../components/proxy-host-object.json#/properties/advanced_config" }, + "proxy_send_timeout": { + "$ref": "../../../../components/proxy-host-object.json#/properties/proxy_send_timeout" + }, + "proxy_read_timeout": { + "$ref": "../../../../components/proxy-host-object.json#/properties/proxy_read_timeout" + }, + "proxy_connect_timeout": { + "$ref": "../../../../components/proxy-host-object.json#/properties/proxy_connect_timeout" + }, "enabled": { "$ref": "../../../../components/proxy-host-object.json#/properties/enabled" }, @@ -97,7 +110,9 @@ "created_on": "2024-10-08T23:23:03.000Z", "modified_on": "2024-10-08T23:26:37.000Z", "owner_user_id": 1, - "domain_names": ["test.example.com"], + "domain_names": [ + "test.example.com" + ], "forward_host": "192.168.0.10", "forward_port": 8989, "access_list_id": 0, @@ -126,7 +141,9 @@ "name": "Administrator", "nickname": "some guy", "avatar": "//www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?default=mm", - "roles": ["admin"] + "roles": [ + "admin" + ] }, "certificate": null, "access_list": null @@ -140,4 +157,4 @@ } } } -} +} \ No newline at end of file diff --git a/backend/schema/paths/nginx/proxy-hosts/post.json b/backend/schema/paths/nginx/proxy-hosts/post.json index 85455fb6b..158798b27 100644 --- a/backend/schema/paths/nginx/proxy-hosts/post.json +++ b/backend/schema/paths/nginx/proxy-hosts/post.json @@ -1,10 +1,14 @@ { "operationId": "createProxyHost", "summary": "Create a Proxy Host", - "tags": ["Proxy Hosts"], + "tags": [ + "Proxy Hosts" + ], "security": [ { - "BearerAuth": ["proxy_hosts"] + "BearerAuth": [ + "proxy_hosts" + ] } ], "requestBody": { @@ -15,7 +19,12 @@ "schema": { "type": "object", "additionalProperties": false, - "required": ["domain_names", "forward_scheme", "forward_host", "forward_port"], + "required": [ + "domain_names", + "forward_scheme", + "forward_host", + "forward_port" + ], "properties": { "domain_names": { "$ref": "../../../components/proxy-host-object.json#/properties/domain_names" @@ -59,6 +68,15 @@ "advanced_config": { "$ref": "../../../components/proxy-host-object.json#/properties/advanced_config" }, + "proxy_send_timeout": { + "$ref": "../../../components/proxy-host-object.json#/properties/proxy_send_timeout" + }, + "proxy_read_timeout": { + "$ref": "../../../components/proxy-host-object.json#/properties/proxy_read_timeout" + }, + "proxy_connect_timeout": { + "$ref": "../../../components/proxy-host-object.json#/properties/proxy_connect_timeout" + }, "enabled": { "$ref": "../../../components/proxy-host-object.json#/properties/enabled" }, @@ -85,7 +103,9 @@ "created_on": "2024-10-08T23:23:03.000Z", "modified_on": "2024-10-08T23:23:03.000Z", "owner_user_id": 1, - "domain_names": ["test.example.com"], + "domain_names": [ + "test.example.com" + ], "forward_host": "127.0.0.1", "forward_port": 8989, "access_list_id": 0, @@ -112,7 +132,9 @@ "name": "Administrator", "nickname": "some guy", "avatar": "//www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?default=mm", - "roles": ["admin"] + "roles": [ + "admin" + ] }, "access_list": null } @@ -125,4 +147,4 @@ } } } -} +} \ No newline at end of file diff --git a/backend/templates/proxy_host.conf b/backend/templates/proxy_host.conf index d23ca46fa..02685a498 100644 --- a/backend/templates/proxy_host.conf +++ b/backend/templates/proxy_host.conf @@ -25,6 +25,10 @@ proxy_http_version 1.1; access_log /data/logs/proxy-host-{{ id }}_access.log proxy; error_log /data/logs/proxy-host-{{ id }}_error.log warn; +proxy_send_timeout {{ proxy_send_timeout }}; +proxy_read_timeout {{ proxy_read_timeout }}; +proxy_connect_timeout {{ proxy_connect_timeout }}; + {{ advanced_config }} {{ locations }} diff --git a/frontend/js/app/nginx/proxy/form.ejs b/frontend/js/app/nginx/proxy/form.ejs index 77c7e27fc..d7c6161c8 100644 --- a/frontend/js/app/nginx/proxy/form.ejs +++ b/frontend/js/app/nginx/proxy/form.ejs @@ -309,17 +309,19 @@

<%- i18n('all-hosts', 'advanced-config-timeouts-headline' ) %>

-

<%- i18n('all-hosts', 'advanced-config-timeouts-info' ) %> +

+ <%- i18n('all-hosts', 'advanced-config-timeouts-info' ) %>
+ <%- + i18n('all-hosts', 'advanced-config-timeouts-warning' ) %>

-
- +
@@ -327,8 +329,8 @@ - +
@@ -336,8 +338,8 @@ - +
diff --git a/frontend/js/i18n/messages.json b/frontend/js/i18n/messages.json index 030ff9384..3058366cd 100644 --- a/frontend/js/i18n/messages.json +++ b/frontend/js/i18n/messages.json @@ -88,6 +88,7 @@ "advanced-config-header-info": "Please note, that any add_header or set_header directives added here will not be used by nginx. You will have to add a custom location '/' and add the header in the custom config there.", "advanced-config-timeouts-headline": "Timeouts", "advanced-config-timeouts-info": "Set the timeouts for the proxy connection.", + "advanced-config-timeouts-warning": "Setting timeouts fields in the above custom configuration will override these values.", "advanced-config-timeouts-proxy-send-timeout": "Proxy Send Timeout (seconds)", "advanced-config-timeouts-proxy-read-timeout": "Proxy Read Timeout (seconds)", "advanced-config-timeouts-proxy-connect-timeout": "Proxy Connect Timeout (seconds)", diff --git a/frontend/js/models/proxy-host.js b/frontend/js/models/proxy-host.js index 7e4c1ee8c..5e2a88d53 100644 --- a/frontend/js/models/proxy-host.js +++ b/frontend/js/models/proxy-host.js @@ -19,11 +19,9 @@ const model = Backbone.Model.extend({ hsts_subdomains: false, caching_enabled: false, allow_websocket_upgrade: false, - timeouts: { - proxy_send_timeout: 60, - proxy_read_timeout: 60, - proxy_connect_timeout: 60 - }, + proxy_send_timeout: 60, + proxy_read_timeout: 60, + proxy_connect_timeout: 60, block_exploits: false, http2_support: false, advanced_config: '', From 49253b343f2252920f145450c05f1ae5b06f9cd1 Mon Sep 17 00:00:00 2001 From: Renan Medina Date: Mon, 27 Oct 2025 20:03:39 -0300 Subject: [PATCH 4/5] chore: running lint fix --- ...51027193925_add_timeouts_to_proxy_hosts.js | 38 +++++++++---------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/backend/migrations/20251027193925_add_timeouts_to_proxy_hosts.js b/backend/migrations/20251027193925_add_timeouts_to_proxy_hosts.js index da523f8a2..00c1e3521 100644 --- a/backend/migrations/20251027193925_add_timeouts_to_proxy_hosts.js +++ b/backend/migrations/20251027193925_add_timeouts_to_proxy_hosts.js @@ -1,5 +1,5 @@ const migrate_name = 'pass_auth'; -const logger = require('../logger').migrate; +const logger = require('../logger').migrate; /** * Migrate @@ -11,16 +11,16 @@ const logger = require('../logger').migrate; * @returns {Promise} */ exports.up = function (knex/*, Promise*/) { - logger.info('[' + migrate_name + '] Migrating Up...'); + logger.info('[' + migrate_name + '] Migrating Up...'); - return knex.schema.table('proxy_host', function (proxy_host) { - proxy_host.integer('proxy_send_timeout').notNull().defaultTo(60); - proxy_host.integer('proxy_read_timeout').notNull().defaultTo(60); - proxy_host.integer('proxy_connect_timeout').notNull().defaultTo(60); - }) - .then(() => { - logger.info('[' + migrate_name + '] proxy_host Table altered'); - }); + return knex.schema.table('proxy_host', function (proxy_host) { + proxy_host.integer('proxy_send_timeout').notNull().defaultTo(60); + proxy_host.integer('proxy_read_timeout').notNull().defaultTo(60); + proxy_host.integer('proxy_connect_timeout').notNull().defaultTo(60); + }) + .then(() => { + logger.info('[' + migrate_name + '] proxy_host Table altered'); + }); }; /** @@ -31,14 +31,14 @@ exports.up = function (knex/*, Promise*/) { * @returns {Promise} */ exports.down = function (knex/*, Promise*/) { - logger.info('[' + migrate_name + '] Migrating Down...'); + logger.info('[' + migrate_name + '] Migrating Down...'); - return knex.schema.table('proxy_host', function (proxy_host) { - proxy_host.dropColumn('proxy_send_timeout'); - proxy_host.dropColumn('proxy_read_timeout'); - proxy_host.dropColumn('proxy_connect_timeout'); - }) - .then(() => { - logger.info('[' + migrate_name + '] proxy_host proxy_send_timeout, proxy_read_timeout, proxy_connect_timeout Columns dropped'); - }); + return knex.schema.table('proxy_host', function (proxy_host) { + proxy_host.dropColumn('proxy_send_timeout'); + proxy_host.dropColumn('proxy_read_timeout'); + proxy_host.dropColumn('proxy_connect_timeout'); + }) + .then(() => { + logger.info('[' + migrate_name + '] proxy_host proxy_send_timeout, proxy_read_timeout, proxy_connect_timeout Columns dropped'); + }); }; From d571279e148f47bdb6efe8a55015baa10c263445 Mon Sep 17 00:00:00 2001 From: Renan Medina Date: Mon, 27 Oct 2025 20:33:42 -0300 Subject: [PATCH 5/5] fix: Fixing schema proxy-host-object to use separate timeout fields properly --- backend/schema/components/proxy-host-object.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/backend/schema/components/proxy-host-object.json b/backend/schema/components/proxy-host-object.json index 54e2449a3..e45685de3 100644 --- a/backend/schema/components/proxy-host-object.json +++ b/backend/schema/components/proxy-host-object.json @@ -15,7 +15,9 @@ "caching_enabled", "block_exploits", "advanced_config", - "timeouts", + "proxy_send_timeout", + "proxy_read_timeout", + "proxy_connect_timeout", "meta", "allow_websocket_upgrade", "http2_support",