diff --git a/net/haproxy/Makefile b/net/haproxy/Makefile index 4722f822c..f277a2c24 100644 --- a/net/haproxy/Makefile +++ b/net/haproxy/Makefile @@ -1,5 +1,5 @@ PLUGIN_NAME= haproxy -PLUGIN_VERSION= 1.13 +PLUGIN_VERSION= 1.14 PLUGIN_COMMENT= Reliable, high performance TCP/HTTP load balancer PLUGIN_DEPENDS= haproxy PLUGIN_MAINTAINER= opnsense@moov.de 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 e58f30271..cd504b932 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 @@ -797,6 +797,7 @@ Path regex Path contains URL parameter contains + SSL/TLS connection established SSL Client certificate verify error result SSL Client certificate is valid SSL Client issued by CA common-name diff --git a/net/haproxy/src/opnsense/scripts/OPNsense/HAProxy/exportCerts.php b/net/haproxy/src/opnsense/scripts/OPNsense/HAProxy/exportCerts.php index 1fc074053..1e6b29024 100755 --- a/net/haproxy/src/opnsense/scripts/OPNsense/HAProxy/exportCerts.php +++ b/net/haproxy/src/opnsense/scripts/OPNsense/HAProxy/exportCerts.php @@ -77,7 +77,7 @@ foreach ($configNodes as $key => $value) { if (!empty((string)$cert->caref)) { $cert = (array)$cert; $ca = ca_chain($cert); - $pem_content .= $ca; + $pem_content .= "\n" . $ca; } } // generate pem file 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 fa69fda53..1a111cd26 100644 --- a/net/haproxy/src/opnsense/service/templates/OPNsense/HAProxy/haproxy.conf +++ b/net/haproxy/src/opnsense/service/templates/OPNsense/HAProxy/haproxy.conf @@ -155,6 +155,8 @@ {% set acl_enabled = '0' %} # ERROR: missing parameters {% endif %} +{% elif acl_data.expression == 'ssl_fc' %} +{% do acl_options.append('ssl_fc') %} {% elif acl_data.expression == 'source_ip' %} {% if acl_data.value|default("") != "" %} {% do acl_options.append('src ' ~ acl_data.value) %}