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

Jump to bottom

Fix stdlib deprecation warnings #334

Merged
merged 4 commits into from
Dec 29, 2020
Merged

Fix stdlib deprecation warnings #334

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ccf321d
Fix stdlib deprecation warnings
Dec 28, 2020
fde21cf
Fix stdlib deprecation warnings
Dec 28, 2020
2ef3aa6
Merge branch 'fix-stdlib-deprecations' of git://github.com/Hexta/wazu…
Zenidd Dec 29, 2020
b437364
Merge latests changes
Zenidd Dec 29, 2020
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
6 changes: 6 additions & 0 deletions .fixtures.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
fixtures:
forge_modules:
stdlib:
repo: "puppetlabs/stdlib"
ref: "4.13.0"
20 changes: 10 additions & 10 deletions manifests/agent.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,8 +243,8 @@
# )
# This allows arrays of integers, sadly
# (commented due to stdlib version requirement)
validate_string($agent_package_name)
validate_string($agent_service_name)
validate_legacy(String, 'validate_string', $agent_package_name)
validate_legacy(String, 'validate_string', $agent_service_name)

if (( $ossec_syscheck_whodata_directories_1 == 'yes' ) or ( $ossec_syscheck_whodata_directories_2 == 'yes' )) {
class { 'wazuh::audit':
Expand Down Expand Up @@ -468,14 +468,14 @@
# Agent registration and service setup
if ($manage_client_keys == 'yes') {
if $agent_name {
validate_string($agent_name)
validate_legacy(String, 'validate_string', $agent_name)
$agent_auth_option_name = "-A \"${agent_name}\""
} else {
$agent_auth_option_name = ''
}

if $agent_group {
validate_string($agent_group)
validate_legacy(String, 'validate_string', $agent_group)
$agent_auth_option_group = "-G \"${agent_group}\""
} else {
$agent_auth_option_group = ''
Expand All @@ -500,7 +500,7 @@

# https://documentation.wazuh.com/4.0/user-manual/registering/manager-verification/manager-verification-registration.html
if $wazuh_manager_root_ca_pem != undef {
validate_string($wazuh_manager_root_ca_pem)
validate_legacy(String, 'validate_string', $wazuh_manager_root_ca_pem)
file { '/var/ossec/etc/rootCA.pem':
owner => $wazuh::params_agent::keys_owner,
group => $wazuh::params_agent::keys_group,
Expand All @@ -510,16 +510,16 @@
}
$agent_auth_option_manager = '-v /var/ossec/etc/rootCA.pem'
} elsif $wazuh_manager_root_ca_pem_path != undef {
validate_string($wazuh_manager_root_ca_pem)
validate_legacy(String, 'validate_string', $wazuh_manager_root_ca_pem)
$agent_auth_option_manager = "-v ${wazuh_manager_root_ca_pem_path}"
} else {
$agent_auth_option_manager = '' # Avoid errors when compounding final command
}

# https://documentation.wazuh.com/4.0/user-manual/registering/manager-verification/agent-verification-registration.html
if ($wazuh_agent_cert != undef) and ($wazuh_agent_key != undef) {
validate_string($wazuh_agent_cert)
validate_string($wazuh_agent_key)
validate_legacy(String, 'validate_string', $wazuh_agent_cert)
validate_legacy(String, 'validate_string', $wazuh_agent_key)
file { '/var/ossec/etc/sslagent.cert':
owner => $wazuh::params_agent::keys_owner,
group => $wazuh::params_agent::keys_group,
Expand All @@ -537,8 +537,8 @@

$agent_auth_option_agent = '-x /var/ossec/etc/sslagent.cert -k /var/ossec/etc/sslagent.key'
} elsif ($wazuh_agent_cert_path != undef) and ($wazuh_agent_key_path != undef) {
validate_string($wazuh_agent_cert_path)
validate_string($wazuh_agent_key_path)
validate_legacy(String, 'validate_string', $wazuh_agent_cert_path)
validate_legacy(String, 'validate_string', $wazuh_agent_key_path)
$agent_auth_option_agent = "-x ${wazuh_agent_cert_path} -k ${wazuh_agent_key_path}"
} else {
$agent_auth_option_agent = ''
Expand Down
20 changes: 10 additions & 10 deletions manifests/manager.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,11 +301,11 @@


) inherits wazuh::params_manager {
validate_bool(
$manage_repos, $syslog_output,$wazuh_manager_verify_manager_ssl
validate_legacy(
Boolean, 'validate_bool', $manage_repos, $syslog_output,$wazuh_manager_verify_manager_ssl
)
validate_array(
$decoder_exclude, $rule_exclude
validate_legacy(
Array, 'validate_array', $decoder_exclude, $rule_exclude
)

## Determine which kernel and family puppet is running on. Will be used on _localfile, _rootcheck, _syscheck & _sca
Expand Down Expand Up @@ -335,14 +335,14 @@

# This allows arrays of integers, sadly
# (commented due to stdlib version requirement)
validate_bool($ossec_emailnotification)
validate_legacy(Boolean, 'validate_bool', $ossec_emailnotification)
if ($ossec_emailnotification) {
if $ossec_smtp_server == undef {
fail('$ossec_emailnotification is enabled but $smtp_server was not set')
}
validate_string($ossec_smtp_server)
validate_string($ossec_emailfrom)
validate_array($ossec_emailto)
validate_legacy(String, 'validate_string', $ossec_smtp_server)
validate_legacy(String, 'validate_string', $ossec_emailfrom)
validate_legacy(Array, 'validate_array', $ossec_emailto)
}

if $::osfamily == 'windows' {
Expand Down Expand Up @@ -591,8 +591,8 @@
if $wazuh_manager_verify_manager_ssl {

if ($wazuh_manager_server_crt != undef) and ($wazuh_manager_server_key != undef) {
validate_string(
$wazuh_manager_server_crt, $wazuh_manager_server_key
validate_legacy(
String, 'validate_string', $wazuh_manager_server_crt, $wazuh_manager_server_key
)

file { '/var/ossec/etc/sslmanager.key':
Expand Down
2 changes: 1 addition & 1 deletion metadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"dependencies": [
{
"name": "puppetlabs/stdlib",
"version_requirement": ">= 1.0.0 < 7.0.0"
"version_requirement": ">= 4.13.0 < 7.0.0"
},
{
"name": "puppetlabs/concat",
Expand Down