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

Update Configuration to New Vulnerability Detector and Indexer #869

Merged
merged 5 commits into from
Dec 19, 2023
Merged

Update Configuration to New Vulnerability Detector and Indexer #869

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5aa336c
add new vuln detection conf
vcerenu Dec 18, 2023
c54fc7b
delete unused parameters
vcerenu Dec 18, 2023
1184778
fix errors
vcerenu Dec 18, 2023
f195844
fix errors
vcerenu Dec 19, 2023
d8b1e12
add newline and remove unused variable
vcerenu Dec 19, 2023
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
3 changes: 2 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,8 @@ This module installs and configure Wazuh agent and manager.
│ │ ├── _sca.erb
│ │ ├── _syscheck.erb
│ │ ├── _syslog_output.erb
│ │ ├── _vulnerability_detector.erb
│ │ ├── _vulnerability_detection.erb
│ │ ├── _vulnerability_indexer.erb
│ │ ├── _wodle_cis_cat.erb
│ │ ├── _wodle_openscap.erb
│ │ ├── _wodle_osquery.erb
Expand Down
83 changes: 29 additions & 54 deletions manifests/manager.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,8 @@
$configure_wodle_osquery = $wazuh::params_manager::configure_wodle_osquery,
$configure_wodle_syscollector = $wazuh::params_manager::configure_wodle_syscollector,
$configure_wodle_docker_listener = $wazuh::params_manager::configure_wodle_docker_listener,
$configure_vulnerability_detector = $wazuh::params_manager::configure_vulnerability_detector,
$configure_vulnerability_detection = $wazuh::params_manager::configure_vulnerability_detection,
$configure_vulnerability_indexer = $wazuh::params_manager::configure_vulnerability_indexer,
$configure_sca = $wazuh::params_manager::configure_sca,
$configure_syscheck = $wazuh::params_manager::configure_syscheck,
$configure_command = $wazuh::params_manager::configure_command,
Expand All @@ -57,7 +58,8 @@
$ossec_wodle_osquery_template = $wazuh::params_manager::ossec_wodle_osquery_template,
$ossec_wodle_syscollector_template = $wazuh::params_manager::ossec_wodle_syscollector_template,
$ossec_wodle_docker_listener_template = $wazuh::params_manager::ossec_wodle_docker_listener_template,
$ossec_vulnerability_detector_template = $wazuh::params_manager::ossec_vulnerability_detector_template,
$ossec_vulnerability_detection_template = $wazuh::params_manager::ossec_vulnerability_detection_template,
$ossec_vulnerability_indexer_template = $wazuh::params_manager::ossec_vulnerability_indexer_template,
$ossec_sca_template = $wazuh::params_manager::ossec_sca_template,
$ossec_syscheck_template = $wazuh::params_manager::ossec_syscheck_template,
$ossec_default_commands_template = $wazuh::params_manager::ossec_default_commands_template,
Expand Down Expand Up @@ -157,55 +159,20 @@
#docker-listener
$wodle_docker_listener_disabled = $wazuh::params_manager::wodle_docker_listener_disabled,

#vulnerability-detector
$vulnerability_detector_enabled = $wazuh::params_manager::vulnerability_detector_enabled,
$vulnerability_detector_interval = $wazuh::params_manager::vulnerability_detector_interval,
$vulnerability_detector_min_full_scan_interval = $wazuh::params_manager::vulnerability_detector_min_full_scan_interval,
$vulnerability_detector_run_on_start = $wazuh::params_manager::vulnerability_detector_run_on_start,
# lint:ignore:140chars
$vulnerability_detector_provider_canonical = $wazuh::params_manager::vulnerability_detector_provider_canonical,
$vulnerability_detector_provider_canonical_enabled = $wazuh::params_manager::vulnerability_detector_provider_canonical_enabled,
$vulnerability_detector_provider_canonical_os = $wazuh::params_manager::vulnerability_detector_provider_canonical_os,
$vulnerability_detector_provider_canonical_update_interval = $wazuh::params_manager::vulnerability_detector_provider_canonical_update_interval,

$vulnerability_detector_provider_debian = $wazuh::params_manager::vulnerability_detector_provider_debian,
$vulnerability_detector_provider_debian_enabled = $wazuh::params_manager::vulnerability_detector_provider_debian_enabled,
$vulnerability_detector_provider_debian_os = $wazuh::params_manager::vulnerability_detector_provider_debian_os,
$vulnerability_detector_provider_debian_update_interval = $wazuh::params_manager::vulnerability_detector_provider_debian_update_interval,

$vulnerability_detector_provider_redhat = $wazuh::params_manager::vulnerability_detector_provider_redhat,
$vulnerability_detector_provider_redhat_enabled = $wazuh::params_manager::vulnerability_detector_provider_redhat_enabled,
$vulnerability_detector_provider_redhat_os = $wazuh::params_manager::vulnerability_detector_provider_redhat_os,
$vulnerability_detector_provider_redhat_update_interval = $wazuh::params_manager::vulnerability_detector_provider_redhat_update_interval,

$vulnerability_detector_provider_nvd = $wazuh::params_manager::vulnerability_detector_provider_nvd,
$vulnerability_detector_provider_nvd_enabled = $wazuh::params_manager::vulnerability_detector_provider_nvd_enabled,
$vulnerability_detector_provider_nvd_os = $wazuh::params_manager::vulnerability_detector_provider_nvd_os,
$vulnerability_detector_provider_nvd_update_interval = $wazuh::params_manager::vulnerability_detector_provider_nvd_update_interval,
#lint:endignore

$vulnerability_detector_provider_arch = $wazuh::params_manager::vulnerability_detector_provider_arch,
$vulnerability_detector_provider_arch_enabled = $wazuh::params_manager::vulnerability_detector_provider_arch_enabled,
$vulnerability_detector_provider_arch_update_interval = $wazuh::params_manager::vulnerability_detector_provider_arch_update_interval,

$vulnerability_detector_provider_alas = $wazuh::params_manager::vulnerability_detector_provider_alas,
$vulnerability_detector_provider_alas_enabled = $wazuh::params_manager::vulnerability_detector_provider_alas_enabled,
$vulnerability_detector_provider_alas_os = $wazuh::params_manager::vulnerability_detector_provider_alas_os,
$vulnerability_detector_provider_alas_update_interval = $wazuh::params_manager::vulnerability_detector_provider_alas_update_interval,

$vulnerability_detector_provider_suse = $wazuh::params_manager::vulnerability_detector_provider_suse,
$vulnerability_detector_provider_suse_enabled = $wazuh::params_manager::vulnerability_detector_provider_suse_enabled,
$vulnerability_detector_provider_suse_os = $wazuh::params_manager::vulnerability_detector_provider_suse_os,
$vulnerability_detector_provider_suse_update_interval = $wazuh::params_manager::vulnerability_detector_provider_suse_update_interval,

$vulnerability_detector_provider_msu = $wazuh::params_manager::vulnerability_detector_provider_msu,
$vulnerability_detector_provider_msu_enabled = $wazuh::params_manager::vulnerability_detector_provider_msu_enabled,
$vulnerability_detector_provider_msu_update_interval = $wazuh::params_manager::vulnerability_detector_provider_msu_update_interval,

$vulnerability_detector_provider_almalinux = $wazuh::params_manager::vulnerability_detector_provider_almalinux,
$vulnerability_detector_provider_almalinux_enabled = $wazuh::params_manager::vulnerability_detector_provider_almalinux_enabled,
$vulnerability_detector_provider_almalinux_os = $wazuh::params_manager::vulnerability_detector_provider_almalinux_os,
$vulnerability_detector_provider_almalinux_update_interval = $wazuh::params_manager::vulnerability_detector_provider_almalinux_update_interval,
#vulnerability-detection
$vulnerability_detection_enabled = $wazuh::params_manager::vulnerability_detection_enabled,
$vulnerability_detection_index_status = $wazuh::params_manager::vulnerability_detection_index_status,
$vulnerability_detection_feed_update_interval = $wazuh::params_manager::vulnerability_detection_feed_update_interval,

#vulnerability-indexer
$vulnerability_indexer_enabled = $wazuh::params_manager::vulnerability_indexer_enabled,
$vulnerability_indexer_hosts_host = $wazuh::params_manager::vulnerability_indexer_hosts_host,
$vulnerability_indexer_hosts_port = $wazuh::params_manager::vulnerability_indexer_hosts_port,
$vulnerability_indexer_username = $wazuh::params_manager::vulnerability_indexer_username,
$vulnerability_indexer_password = $wazuh::params_manager::vulnerability_indexer_password,
$vulnerability_indexer_ssl_ca = $wazuh::params_manager::vulnerability_indexer_ssl_ca,
$vulnerability_indexer_ssl_certificate = $wazuh::params_manager::vulnerability_indexer_ssl_certificate,
$vulnerability_indexer_ssl_key = $wazuh::params_manager::vulnerability_indexer_ssl_key,

# syslog
$syslog_output = $wazuh::params_manager::syslog_output,
Expand Down Expand Up @@ -545,12 +512,20 @@
content => template($ossec_sca_template);
}
}
if($configure_vulnerability_detector == true){
if($configure_vulnerability_detection == true){
concat::fragment {
'ossec.conf_vulnerability_detector':
'ossec.conf_vulnerability_detection':
order => 45,
target => 'manager_ossec.conf',
content => template($ossec_vulnerability_detector_template);
content => template($ossec_vulnerability_detection_template);
}
}
if($configure_vulnerability_detection == true) or ($configure_vulnerability_indexer == true){
concat::fragment {
'ossec.conf_vulnerability_indexer':
order => 49,
target => 'manager_ossec.conf',
content => template($ossec_vulnerability_indexer_template);
}
}
if($configure_syscheck == true){
Expand Down
84 changes: 16 additions & 68 deletions manifests/params_manager.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,8 @@
$configure_wodle_osquery = true
$configure_wodle_syscollector = true
$configure_wodle_docker_listener = false
$configure_vulnerability_detector = true
$configure_vulnerability_detection = true
$configure_vulnerability_indexer = true
$configure_sca = true
$configure_syscheck = true
$configure_command = true
Expand All @@ -58,7 +59,8 @@
$ossec_wodle_osquery_template = 'wazuh/fragments/_wodle_osquery.erb'
$ossec_wodle_syscollector_template = 'wazuh/fragments/_wodle_syscollector.erb'
$ossec_wodle_docker_listener_template = 'wazuh/fragments/_wodle_docker_listener.erb'
$ossec_vulnerability_detector_template = 'wazuh/fragments/_vulnerability_detector.erb'
$ossec_vulnerability_detection_template = 'wazuh/fragments/_vulnerability_detection.erb'
$ossec_vulnerability_indexer_template = 'wazuh/fragments/_vulnerability_indexer.erb'
$ossec_sca_template = 'wazuh/fragments/_sca.erb'
$ossec_syscheck_template = 'wazuh/fragments/_syscheck.erb'
$ossec_default_commands_template = 'wazuh/default_commands.erb'
Expand Down Expand Up @@ -158,74 +160,20 @@
$active_response_timeout = 300
$active_response_repeated_offenders = ['30,60,120']

#vulnerability-detector
#vulnerability-detection

$vulnerability_detector_enabled = 'no'
$vulnerability_detector_interval = '5m'
$vulnerability_detector_min_full_scan_interval = '6h'
$vulnerability_detector_run_on_start = 'yes'
$vulnerability_detection_enabled = 'yes'
$vulnerability_detection_index_status = 'yes'
$vulnerability_detection_feed_update_interval = '60m'

$vulnerability_detector_provider_canonical = 'yes'
$vulnerability_detector_provider_canonical_enabled = 'no'
$vulnerability_detector_provider_canonical_os = ['trusty',
'xenial',
'bionic',
'focal',
'jammy'
]
$vulnerability_detector_provider_canonical_update_interval = '1h'


$vulnerability_detector_provider_debian = 'yes'
$vulnerability_detector_provider_debian_enabled = 'no'
$vulnerability_detector_provider_debian_os = ['buster',
'bullseye'
]
$vulnerability_detector_provider_debian_update_interval = '1h'
$vulnerability_detector_provider_redhat = 'yes'
$vulnerability_detector_provider_redhat_enabled = 'no'
$vulnerability_detector_provider_redhat_os = ['5','6','7','8','9']
$vulnerability_detector_provider_redhat_update_interval = '1h' # syslog


$vulnerability_detector_provider_nvd = 'yes'
$vulnerability_detector_provider_nvd_enabled = 'no'
$vulnerability_detector_provider_nvd_os = []
$vulnerability_detector_provider_nvd_update_interval = '1h'

$vulnerability_detector_provider_arch = 'yes'
$vulnerability_detector_provider_arch_enabled = 'no'
$vulnerability_detector_provider_arch_update_interval = '1h'

$vulnerability_detector_provider_alas = 'yes'
$vulnerability_detector_provider_alas_enabled = 'no'
$vulnerability_detector_provider_alas_os = ['amazon-linux',
'amazon-linux-2',
'amazon-linux-2023'
]
$vulnerability_detector_provider_alas_update_interval = '1h'

$vulnerability_detector_provider_suse = 'yes'
$vulnerability_detector_provider_suse_enabled = 'no'
$vulnerability_detector_provider_suse_os = ['11-server',
'11-desktop',
'12-server',
'12-desktop',
'15-server',
'15-desktop'
]
$vulnerability_detector_provider_suse_update_interval = '1h'

$vulnerability_detector_provider_msu = 'yes'
$vulnerability_detector_provider_msu_enabled = 'no'
$vulnerability_detector_provider_msu_update_interval = '1h'

$vulnerability_detector_provider_almalinux = 'yes'
$vulnerability_detector_provider_almalinux_enabled = 'no'
$vulnerability_detector_provider_almalinux_os = ['8',
'9'
]
$vulnerability_detector_provider_almalinux_update_interval = '1h'
$vulnerability_indexer_enabled = 'yes'
$vulnerability_indexer_hosts_host = ['127.0.0.1']
$vulnerability_indexer_hosts_port = '9200'
$vulnerability_indexer_username = 'admin'
$vulnerability_indexer_password = 'admin'
$vulnerability_indexer_ssl_ca = '/etc/filebeat/certs/root-ca.pem'
$vulnerability_indexer_ssl_certificate = '/etc/filebeat/certs/filebeat.pem'
$vulnerability_indexer_ssl_key = '/etc/filebeat/certs/filebeat-key.pem'

$syslog_output = false
$syslog_output_level = 2
Expand Down
2 changes: 1 addition & 1 deletion manifests/repo.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
ensure => present,
comment => 'This is the WAZUH Ubuntu repository',
location => 'https://packages.wazuh.com/4.x/apt',
release => 'unstable',
release => 'stable',
repos => 'main',
include => {
'src' => false,
Expand Down
6 changes: 6 additions & 0 deletions templates/fragments/_vulnerability_detection.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# Configuration for Vulnerability detection
<vulnerability-detection>
<% if @vulnerability_detection_enabled %><enabled><%= @vulnerability_detection_enabled %></enabled><% end %>
<% if @vulnerability_detection_index_status %><index-status><%= @vulnerability_detection_index_status %></index-status><% end %>
<% if @vulnerability_detection_feed_update_interval %><feed-update-interval><%= @vulnerability_detection_enabled %></vulnerability_detection_feed_update_interval><% end %>
</vulnerability-detection>
Loading
Loading