Skip to content

fix modsec_disable_ids, modsec_disable_msgs, modsec_disable_tags hand… #2620

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
bovy89 wants to merge 2 commits into from
+14 −23
Closed

fix modsec_disable_ids, modsec_disable_msgs, modsec_disable_tags hand… #2620

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
44194a6
fix modsec_disable_ids, modsec_disable_msgs, modsec_disable_tags hand…
bovy89 Jan 13, 2026
ff5c4f1
Merge branch 'puppetlabs:main' into main
bovy89 Mar 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 14 additions & 23 deletions manifests/vhost.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1936,7 +1936,7 @@
Array[String[1]] $modsec_disable_ips = [],
Optional[Variant[Hash, Array]] $modsec_disable_msgs = undef,
Optional[Variant[Hash, Array]] $modsec_disable_tags = undef,
Optional[String] $modsec_body_limit = undef,
Optional[Integer] $modsec_body_limit = undef,
Optional[Integer[1, default]] $modsec_inbound_anomaly_threshold = undef,
Optional[Integer[1, default]] $modsec_outbound_anomaly_threshold = undef,
Optional[String] $modsec_allowed_methods = undef,
Expand Down Expand Up @@ -2181,28 +2181,19 @@
}

## 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
}
$_modsec_disable_ids = $modsec_disable_ids ? {
Array => { '.*' => $modsec_disable_ids },
default => $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
}
$_modsec_disable_msgs = $modsec_disable_msgs ? {
Array => { '.*' => $modsec_disable_msgs },
default => $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
}
$_modsec_disable_tags = $modsec_disable_tags ? {
Array => { '.*' => $modsec_disable_tags },
default => $modsec_disable_tags,
}

concat { "${priority_real}${filename}.conf":
Expand Down Expand Up @@ -2840,14 +2831,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_disable_vhost 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,
Expand Down
Loading