net/haproxy: support more sample fetches, closes #3702

Author: fraenki

net/haproxy/pkg-descr

@@ -14,6 +14,7 @@ Added:
 * support custom HTTP status code in "http-request deny" rules
 * add new backend option to control PROXY protocol for health checks (#2909)
 * add support for new map file type: reg (#3641)
+* add support for more sample fetches: quic_enabled, stopping, wait_end (#3702)
 
 Changed:
 * upgrade to HAProxy 3.2 release series (#5147)

net/haproxy/src/opnsense/mvc/app/models/OPNsense/HAProxy/HAProxy.xml

@@ -1720,6 +1720,7 @@
                 <expression type="OptionField">
                     <Required>Y</Required>
                     <OptionValues>
+                        <stopping>HAProxy process is currently stopping</stopping>
                         <http_auth>HTTP Basic Auth: username/password from client matches selected User/Group</http_auth>
                         <hdr_beg>Host starts with</hdr_beg>
                         <hdr_end>Host ends with</hdr_end>
@@ -1738,6 +1739,8 @@
                         <cust_hdr_reg>HTTP Header regex</cust_hdr_reg>
                         <cust_hdr_sub>HTTP Header contains</cust_hdr_sub>
                         <http_method>HTTP Method</http_method>
+                        <wait_end>Inspection period is over (WAIT_END)</wait_end>
+                        <quic_enabled>QUIC transport protocol is enabled</quic_enabled>
                         <url_param>URL parameter contains</url_param>
                         <ssl_c_verify>SSL Client certificate is valid</ssl_c_verify>
                         <ssl_c_verify_code>SSL Client certificate verify error result</ssl_c_verify_code>

net/haproxy/src/opnsense/service/templates/OPNsense/HAProxy/haproxy.conf

@@ -41,6 +41,7 @@
 {# Macro expects a CSV list of Actions and validates them. #}
 {%- macro AclsAndActions(linkedData) -%}
 {%   if linkedData is defined %}
+{%     set acl_boolean_types = ['quic_enabled', 'stopping', 'wait_end'] %}
 {#     # remember all ACLs to avoid duplicate declarations #}
 {%     set acls_seen = [] %}
 {%     set global_action_options = [] %}
@@ -411,6 +412,10 @@
 {%                 set acl_enabled = '0' %}
     # ERROR: missing parameters
 {%               endif %}
+{#             # handle boolean ACL types that do not require any input #}
+{%             elif acl_data.expression in acl_boolean_types %}
+{%               do acl_options.append(acl_data.expression) %}
+{#             # handle custom ACL types #}
 {%             elif acl_data.expression == 'custom_acl' %}
 {%               if acl_data.custom_acl|default("") != "" %}
 {%                 do acl_options.append(acl_data.custom_acl) %}