diff --git a/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/forms/dialogAction.xml b/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/forms/dialogAction.xml index 67b7c8919..56f12a5cd 100644 --- a/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/forms/dialogAction.xml +++ b/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/forms/dialogAction.xml @@ -332,6 +332,17 @@ text + + + header + + + + action.tcp_request_inspect_delay + + text + + header @@ -343,6 +354,17 @@ text + + + header + + + + action.tcp_response_inspect_delay + + text + + header diff --git a/net/haproxy/src/opnsense/mvc/app/models/OPNsense/HAProxy/HAProxy.xml b/net/haproxy/src/opnsense/mvc/app/models/OPNsense/HAProxy/HAProxy.xml index 159b55eca..a5be01a92 100644 --- a/net/haproxy/src/opnsense/mvc/app/models/OPNsense/HAProxy/HAProxy.xml +++ b/net/haproxy/src/opnsense/mvc/app/models/OPNsense/HAProxy/HAProxy.xml @@ -1763,10 +1763,12 @@ tcp-request content reject tcp-request content lua script tcp-request content use-service + tcp-request inspect-delay tcp-response content accept tcp-response content close tcp-response content reject tcp-response content lua script + tcp-response inspect-delay Custom rule (option pass-through) @@ -1909,10 +1911,18 @@ /^.{1,4096}$/u N + + /^.{1,32}$/u + N + /^.{1,4096}$/u N + + /^.{1,32}$/u + N + /^.{1,4096}$/u N diff --git a/net/haproxy/src/opnsense/service/templates/OPNsense/HAProxy/haproxy.conf b/net/haproxy/src/opnsense/service/templates/OPNsense/HAProxy/haproxy.conf index 6bf38aecf..22c450175 100644 --- a/net/haproxy/src/opnsense/service/templates/OPNsense/HAProxy/haproxy.conf +++ b/net/haproxy/src/opnsense/service/templates/OPNsense/HAProxy/haproxy.conf @@ -490,6 +490,13 @@ {% set action_enabled = '0' %} # ERROR: missing parameters {% endif %} +{% elif action_data.type == 'tcp-request_inspect-delay' %} +{% if action_data.tcp_request_inspect_delay|default("") != "" %} +{% do action_options.append('tcp-request inspect-delay ' ~ action_data.tcp_request_inspect_delay) %} +{% else %} +{% set action_enabled = '0' %} + # ERROR: missing parameters +{% endif %} {% elif action_data.type == 'tcp-response_content_accept' %} {% do action_options.append('tcp-response content accept') %} {% elif action_data.type == 'tcp-response_content_close' %} @@ -503,6 +510,13 @@ {% set action_enabled = '0' %} # ERROR: missing parameters {% endif %} +{% elif action_data.type == 'tcp-response_inspect-delay' %} +{% if action_data.tcp_response_inspect_delay|default("") != "" %} +{% do action_options.append('tcp-response inspect-delay ' ~ action_data.tcp_response_inspect_delay) %} +{% else %} +{% set action_enabled = '0' %} + # ERROR: missing parameters +{% endif %} {% elif action_data.type == 'custom' %} {% if action_data.custom|default("") != "" %} {% do action_options.append(action_data.custom) %}