Skip to content
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

Fix ossec rules_exclude and add support for multiple files in exclude #1080

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix ossec rules_exclude and add support for multiple files in exclude #1080

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
efe6532
Fix rules_exclude and add support for multiple exclude
jzelina Aug 15, 2024
cf3b27d
fix missing endline
jzelina Aug 15, 2024
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
2 changes: 1 addition & 1 deletion manifests/manager.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@
$local_decoder_template = $wazuh::params_manager::local_decoder_template,
$decoder_exclude = $wazuh::params_manager::decoder_exclude,
$local_rules_template = $wazuh::params_manager::local_rules_template,
$rule_exclude = $wazuh::params_manager::rule_exclude,
$ossec_ruleset_rule_exclude = $wazuh::params_manager::ossec_ruleset_rule_exclude,
$shared_agent_template = $wazuh::params_manager::shared_agent_template,

$wazuh_manager_verify_manager_ssl = $wazuh::params_manager::wazuh_manager_verify_manager_ssl,
Expand Down
11 changes: 0 additions & 11 deletions manifests/params_agent.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,17 +289,6 @@
$wodle_syscollector_processes = 'yes'
$wodle_syscollector_hotfixes = undef

$ossec_ruleset_decoder_dir = 'ruleset/decoders'
$ossec_ruleset_rule_dir = 'ruleset/rules'
$ossec_ruleset_rule_exclude = '0215-policy_rules.xml'
$ossec_ruleset_list = [ 'etc/lists/audit-keys',
'etc/lists/amazon/aws-eventnames',
'etc/lists/security-eventchannel',
]

$ossec_ruleset_user_defined_decoder_dir = 'etc/decoders'
$ossec_ruleset_user_defined_rule_dir = 'etc/rules'

case $::osfamily {
'Debian': {
$service_has_status = false
Expand Down
3 changes: 1 addition & 2 deletions manifests/params_manager.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@

$ossec_ruleset_decoder_dir = 'ruleset/decoders'
$ossec_ruleset_rule_dir = 'ruleset/rules'
$ossec_ruleset_rule_exclude = '0215-policy_rules.xml'
$ossec_ruleset_rule_exclude = ['0215-policy_rules.xml']
$ossec_ruleset_list = [ 'etc/lists/audit-keys',
'etc/lists/amazon/aws-eventnames',
'etc/lists/security-eventchannel',
Expand Down Expand Up @@ -280,7 +280,6 @@
$local_decoder_template = 'wazuh/local_decoder.xml.erb'
$decoder_exclude = []
$local_rules_template = 'wazuh/local_rules.xml.erb'
$rule_exclude = []
$shared_agent_template = 'wazuh/ossec_shared_agent.conf.erb'

$wazuh_manager_verify_manager_ssl = false
Expand Down
7 changes: 4 additions & 3 deletions templates/fragments/_ruleset.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,10 @@
<% if @ossec_ruleset_rule_dir -%>
<rule_dir><%= @ossec_ruleset_rule_dir %></rule_dir>
<%- end -%>
<% if @ossec_ruleset_rule_exclude -%>
<rule_exclude><%= @ossec_ruleset_rule_exclude %></rule_exclude>
<%- if @ossec_ruleset_rule_exclude -%>
<%- @ossec_ruleset_rule_exclude.each do |list_element| -%>
<rule_exclude><%= list_element %></rule_exclude>
<%- end -%>
<%- end -%>
<%- @ossec_ruleset_list.each do |list_element| -%>
<list><%= list_element %></list>
Expand All @@ -24,4 +26,3 @@
<rule_dir><%= @ossec_ruleset_user_defined_rule_dir %></rule_dir>
<%- end -%>
</ruleset>