From 20088372a8c3c006aec0c8bac21762e8a43fd1a5 Mon Sep 17 00:00:00 2001
From: Julien Godin <julien.godin@camptocamp.com>
Date: Tue, 27 Feb 2024 15:48:39 +0100
Subject: [PATCH] bugfix: fix the vhost security configuration

The modified variable was never passed to the template, resulting in a
bad configuration of the vhost security if secrule were removed.

Signed-off-by: Julien Godin <julien.godin@camptocamp.com>
---
 manifests/vhost.pp            | 38 +++++++++++++++--------------------
 templates/vhost/_security.epp |  4 +---
 2 files changed, 17 insertions(+), 25 deletions(-)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 60f835673d..d4b2cc061c 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -2170,28 +2170,22 @@
   }
 
   ## Create a global LocationMatch if locations aren't defined
-  if $modsec_disable_ids {
-    if $modsec_disable_ids =~ Array {
-      $_modsec_disable_ids = { '.*' => $modsec_disable_ids }
-    } else {
-      $_modsec_disable_ids = $modsec_disable_ids
-    }
+  if $modsec_disable_ids =~ Array {
+    $_modsec_disable_ids = { '.*' => $modsec_disable_ids }
+  } else {
+    $_modsec_disable_ids = $modsec_disable_ids
   }
 
-  if $modsec_disable_msgs {
-    if $modsec_disable_msgs =~ Array {
-      $_modsec_disable_msgs = { '.*' => $modsec_disable_msgs }
-    } else {
-      $_modsec_disable_msgs = $modsec_disable_msgs
-    }
+  if $modsec_disable_msgs =~ Array {
+    $_modsec_disable_msgs = { '.*' => $modsec_disable_msgs }
+  } else {
+    $_modsec_disable_msgs = $modsec_disable_msgs
   }
 
-  if $modsec_disable_tags {
-    if $modsec_disable_tags =~ Array {
-      $_modsec_disable_tags = { '.*' => $modsec_disable_tags }
-    } else {
-      $_modsec_disable_tags = $modsec_disable_tags
-    }
+  if $modsec_disable_tags =~ Array {
+    $_modsec_disable_tags = { '.*' => $modsec_disable_tags }
+  } else {
+    $_modsec_disable_tags = $modsec_disable_tags
   }
 
   concat { "${priority_real}${filename}.conf":
@@ -2828,14 +2822,14 @@
     }
   }
 
-  if $modsec_disable_vhost or $modsec_disable_ids or !empty($modsec_disable_ips) or $modsec_disable_msgs or $modsec_disable_tags or $modsec_audit_log_destination or ($modsec_inbound_anomaly_threshold and $modsec_outbound_anomaly_threshold) or $modsec_allowed_methods {
+  if $modsec_disable_vhost or $_modsec_disable_ids or !empty($modsec_disable_ips) or $_modsec_disable_msgs or $_modsec_disable_tags or $modsec_audit_log_destination or ($modsec_inbound_anomaly_threshold and $modsec_outbound_anomaly_threshold) or $modsec_allowed_methods {
     $security_params = {
       'modsec_disable_vhost'              => $modsec_disable_vhost,
       'modsec_audit_log_destination'      => $modsec_audit_log_destination,
-      '_modsec_disable_ids'               => $modsec_disable_ids,
+      '_modsec_disable_ids'               => $_modsec_disable_ids,
       'modsec_disable_ips'                => $modsec_disable_ips,
-      '_modsec_disable_msgs'              => $modsec_disable_msgs,
-      '_modsec_disable_tags'              => $modsec_disable_tags,
+      '_modsec_disable_msgs'              => $_modsec_disable_msgs,
+      '_modsec_disable_tags'              => $_modsec_disable_tags,
       'modsec_body_limit'                 => $modsec_body_limit,
       'modsec_inbound_anomaly_threshold'  => $modsec_inbound_anomaly_threshold,
       'modsec_outbound_anomaly_threshold' => $modsec_outbound_anomaly_threshold,
diff --git a/templates/vhost/_security.epp b/templates/vhost/_security.epp
index 24d3b4a39c..1475013a81 100644
--- a/templates/vhost/_security.epp
+++ b/templates/vhost/_security.epp
@@ -1,7 +1,5 @@
 <IfModule mod_security2.c>
-<% if $modsec_disable_vhost {-%>
-  SecRuleEngine Off
-<% } -%>
+  SecRuleEngine <%= apache::bool2httpd(!$modsec_disable_vhost) %>
 <% if $modsec_audit_log_destination {-%>
   SecAuditLog "<%= $modsec_audit_log_destination %>"
 <% } -%>