From 99462eafc806d2c4cc89ed2ee38ca24c46c92572 Mon Sep 17 00:00:00 2001 From: Thomas Manninger Date: Tue, 2 Nov 2021 08:01:50 +0100 Subject: [PATCH 1/2] ciscat add content options --- manifests/agent.pp | 1 + manifests/manager.pp | 2 ++ manifests/params_agent.pp | 1 + manifests/params_manager.pp | 1 + templates/fragments/_wodle_cis_cat.erb | 11 +++++++++++ 5 files changed, 16 insertions(+) diff --git a/manifests/agent.pp b/manifests/agent.pp index 1b8f8c8c..f2431ad6 100644 --- a/manifests/agent.pp +++ b/manifests/agent.pp @@ -162,6 +162,7 @@ $wodle_ciscat_scan_on_start = $wazuh::params_agent::wodle_ciscat_scan_on_start, $wodle_ciscat_java_path = $wazuh::params_agent::wodle_ciscat_java_path, $wodle_ciscat_ciscat_path = $wazuh::params_agent::wodle_ciscat_ciscat_path, + wodle_ciscat_content = $wazuh::params_agent::wodle_ciscat_content, #Osquery diff --git a/manifests/manager.pp b/manifests/manager.pp index 99eee310..1b2d7f00 100644 --- a/manifests/manager.pp +++ b/manifests/manager.pp @@ -133,6 +133,8 @@ $wodle_ciscat_scan_on_start = $wazuh::params_manager::wodle_ciscat_scan_on_start, $wodle_ciscat_java_path = $wazuh::params_manager::wodle_ciscat_java_path, $wodle_ciscat_ciscat_path = $wazuh::params_manager::wodle_ciscat_ciscat_path, + $wodle_ciscat_content = $wazuh::params_manager::wodle_ciscat_content, + #osquery $wodle_osquery_disabled = $wazuh::params_manager::wodle_osquery_disabled, diff --git a/manifests/params_agent.pp b/manifests/params_agent.pp index 00276846..09eff28f 100644 --- a/manifests/params_agent.pp +++ b/manifests/params_agent.pp @@ -199,6 +199,7 @@ $wodle_ciscat_scan_on_start = 'yes' $wodle_ciscat_java_path = 'wodles/java' $wodle_ciscat_ciscat_path = 'wodles/ciscat' + $wodle_ciscat_content = {} ## osquery $wodle_osquery_disabled = 'yes' diff --git a/manifests/params_manager.pp b/manifests/params_manager.pp index c9c0847d..5a23b4f5 100644 --- a/manifests/params_manager.pp +++ b/manifests/params_manager.pp @@ -124,6 +124,7 @@ $wodle_ciscat_scan_on_start = 'yes' $wodle_ciscat_java_path = 'wodles/java' $wodle_ciscat_ciscat_path = 'wodles/ciscat' + $wodle_ciscat_content = {} #osquery diff --git a/templates/fragments/_wodle_cis_cat.erb b/templates/fragments/_wodle_cis_cat.erb index f61edfe9..0e8ccda5 100644 --- a/templates/fragments/_wodle_cis_cat.erb +++ b/templates/fragments/_wodle_cis_cat.erb @@ -18,5 +18,16 @@ <% if @wodle_ciscat_ciscat_path -%> <%= @wodle_ciscat_ciscat_path %> <%- end -%> + <%- if not @wodle_ciscat_content.nil? -%> + <%- @wodle_ciscat_content.each do |path, value| -%> + + <%- if value['profiles'] then -%> + <%- value['profiles'].each do |profile| -%> + <%= profile %> + <%- end -%> + <%- end -%> + + <%- end -%> + <%- end -%> From 20273138364a633e86923848d238a022beca5120 Mon Sep 17 00:00:00 2001 From: Thomas Manninger Date: Tue, 2 Nov 2021 08:17:44 +0100 Subject: [PATCH 2/2] wazuh ciscat content --- manifests/agent.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/agent.pp b/manifests/agent.pp index f2431ad6..ec765f6c 100644 --- a/manifests/agent.pp +++ b/manifests/agent.pp @@ -162,7 +162,7 @@ $wodle_ciscat_scan_on_start = $wazuh::params_agent::wodle_ciscat_scan_on_start, $wodle_ciscat_java_path = $wazuh::params_agent::wodle_ciscat_java_path, $wodle_ciscat_ciscat_path = $wazuh::params_agent::wodle_ciscat_ciscat_path, - wodle_ciscat_content = $wazuh::params_agent::wodle_ciscat_content, + $wodle_ciscat_content = $wazuh::params_agent::wodle_ciscat_content, #Osquery