proper regex escaping

Signed-off-by: Travis Glenn Hansen <[email protected]>

Author: travisghansen

CHANGELOG.md

@@ -1,3 +1,9 @@
+# v0.5.8
+
+Released 2021-09-05
+
+- properly escape regex values in `haproxy-ingress-proxy`
+
 # v0.5.7
 
 Released 2021-09-05

src/KubernetesPfSenseController/Plugin/HAProxyIngressProxy.php

@@ -266,9 +266,9 @@ public function doAction()
                             if (substr($host, 0, 2) == "*.") {
                                 // hdr(host) -m reg -i ^[^\.]+\.example\.org$
                                 // hdr(host) -m reg -i ^[^\.]+\.example\.org(:[0-9]+)?$
-                                $hostACL = "hdr(host) -m reg -i ^[^\.]+".str_replace(".", "\.", substr($host, 1))."(:[0-9]+)?$";
+                                $hostACL = "hdr(host) -m reg -i ^[^\.]+".str_replace([".", "-"], ["\.", "\-"], substr($host, 1))."(:[0-9]+)?$";
                             } else {
-                                $hostACL = "hdr(host) -m reg -i ^".str_replace(".", "\.", $host)."(:[0-9]+)?$";
+                                $hostACL = "hdr(host) -m reg -i ^".str_replace([".", "-"], ["\.", "\-"], $host)."(:[0-9]+)?$";
                             }
 
                             // https://kubernetes.io/docs/concepts/services-networking/ingress/#path-types
@@ -319,7 +319,7 @@ public function doAction()
                                 // hdr(host) -m reg -i ^[^\.]+\.example\.org$
                                 // hdr(host) -m reg -i ^[^\.]+\.example\.org(:[0-9]+)?$
                                 // sni should never have the port on the end as the host header may have
-                                $hostACL = "req_ssl_sni -m reg -i ^[^\.]+".str_replace(".", "\.", substr($host, 1));
+                                $hostACL = "req_ssl_sni -m reg -i ^[^\.]+".str_replace([".", "-"], ["\.", "\-"], substr($host, 1));
                             } else {
                                 $hostACL = "req_ssl_sni -m str -i ${host}"; // exact match case-insensitive
                             }