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 <[email protected]>
puppetlabs · Feb 28, 2024 · 3601886 · 3601886
1 parent bde17ea
commit 3601886
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
@@ -2828,14 +2828,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
@@ -1,6 +1,8 @@
 <IfModule mod_security2.c>
 <% if $modsec_disable_vhost {-%>
   SecRuleEngine Off
+<% } else { -%>
+  SecRuleEngine On
 <% } -%>
 <% if $modsec_audit_log_destination {-%>
   SecAuditLog "<%= $modsec_audit_log_destination %>"