From 74de769137cfa464e6c76a094554a56dbed87cad Mon Sep 17 00:00:00 2001 From: dataking Date: Tue, 2 Aug 2016 11:02:06 -0700 Subject: [PATCH] bug fixes --- lynis_report.pl | 115 ++++++++++++++++++++++++++---------------------- 1 file changed, 62 insertions(+), 53 deletions(-) diff --git a/lynis_report.pl b/lynis_report.pl index 61973ba..dd2f117 100755 --- a/lynis_report.pl +++ b/lynis_report.pl @@ -424,6 +424,7 @@ END print OUT "\t\t\t\t\t\t\t\n"; foreach my $plug ( sort @{$lynis_report_data{'plugin_enabled_phase1[]'}} ) { my ($n,$v) = split(/\|/, $plug); + if ((!defined($v)) or ($v eq "")) { $v = "AAAAAAAA"; } print OUT "\t\t\t\t\t\t\t\t\n"; } print OUT "\t\t\t\t\t\t\t
name:$nversion:$v
\n"; @@ -514,7 +515,15 @@ END binary paths:$lynis_report_data{'binary_paths'} END - print OUT "\t\t\t\t\t\tcertificates:".join("
\n",@{$lynis_report_data{'valid_certificate[]'}})."\n"; + if (exists($lynis_report_data{'valid_certificate[]'})) { + if (ref($lynis_report_data{'valid_certificate[]'}) eq 'ARRAY') { + print OUT "\t\t\t\t\t\tcertificates:".join("
\n",@{$lynis_report_data{'valid_certificate[]'}})."\n"; + } else { + print OUT "\t\t\t\t\t\tcertificates:$lynis_report_data{'valid_certificate[]'}\n"; + } + } else { + print OUT "\t\t\t\t\t\tcertificates: \n"; + } print OUT < @@ -641,36 +650,55 @@ END
- - - - +END + $lynis_report_data{'firewall_installed'} = 0 if ((!defined($lynis_report_data{'firewall_installed'})) or ($lynis_report_data{'firewall_installed'} eq '')); + print OUT "\t\t\t\t\t\n"; + $lynis_report_data{'firewall_software'} = " " if ((!defined($lynis_report_data{'firewall_software'})) or ($lynis_report_data{'firewall_software'} eq '')); + print OUT "\t\t\t\t\t\n"; + $lynis_report_data{'firewall_empty_ruleset'} = 0 if ((!defined($lynis_report_data{'firewall_empty_ruleset'})) or ($lynis_report_data{'firewall_empty_ruleset'} eq '')); + print OUT "\t\t\t\t\t\n"; + $lynis_report_data{'firewall_active'} = 0 if ((!defined($lynis_report_data{'firewall_active'})) or ($lynis_report_data{'firewall_active'} eq '')); + print OUT "\t\t\t\t\t\n"; + print OUT < - - - - +END + print OUT "\t\t\t\t\t\t\n"; + print OUT "\t\t\t\t\t\t\n"; + print OUT "\t\t\t\t\t\t\n"; + print OUT "\t\t\t\t\t\t\n"; + print OUT < - - - - +END + $lynis_report_data{'authentication_two_factor_enabled'} = 0 if ((!defined($lynis_report_data{'authentication_two_factor_enabled'})) or ($lynis_report_data{'authentication_two_factor_enabled'} eq '')); + print OUT "\t\t\t\t\t\t\n"; + $lynis_report_data{'authentication_two_factor_required'} = 0 if ((!defined($lynis_report_data{'authentication_two_factor_required'})) or ($lynis_report_data{'authentication_two_factor_required'} eq '')); + print OUT "\t\t\t\t\t\t\n"; + print OUT "\t\t\t\t\t\t\n"; + print OUT "\t\t\t\t\t\t\n"; + print OUT < - - - - +END + $lynis_report_data{'minimum_password_length'} = 0 if ((!defined($lynis_report_data{'minimum_password_length'})) or ($lynis_report_data{'minimum_password_length'} eq '')); + print OUT "\t\t\t\t\t\t\n"; + $lynis_report_data{'password_max_days'} = 0 if ((!defined($lynis_report_data{'password_max_days'})) or ($lynis_report_data{'password_max_days'} eq '')); + print OUT "\t\t\t\t\t\t\n"; + $lynis_report_data{'password_min_days'} = 0 if ((!defined($lynis_report_data{'password_min_days'})) or ($lynis_report_data{'password_min_days'} eq '')); + print OUT "\t\t\t\t\t\t\n"; + $lynis_report_data{'max_password_retry'} = 0 if ((!defined($lynis_report_data{'max_password_retry'})) or ($lynis_report_data{'max_password_retry'} eq '')); + print OUT "\t\t\t\t\t\t\n"; + print OUT < END printf OUT "\t\t\t\t\t\t\n", $pass_score; + print OUT "\t\t\t\t\t\t\n"; + $lynis_report_data{'password_strength_tested'} = 0 if ((!defined($lynis_report_data{'password_strength_tested'})) or ($lynis_report_data{'password_strength_tested'} eq '')); + print OUT "\t\t\t\t\t\t\n"; + print OUT "\t\t\t\t\t\t\n"; print OUT <PAM Cracklib Found: - - @@ -759,40 +787,21 @@ END
Host Firewall Installed:$to_bool{$lynis_report_data{'firewall_installed'}}Firewall Software:$lynis_report_data{'firewall_software'}Firewall Empty Ruleset:$to_bool{$lynis_report_data{'firewall_empty_ruleset'}}Firewall Active:$to_bool{$lynis_report_data{'firewall_active'}}Host Firewall Installed:$to_bool{$lynis_report_data{'firewall_installed'}}Firewall Software:$lynis_report_data{'firewall_software'}Firewall Empty Ruleset:$to_bool{$lynis_report_data{'firewall_empty_ruleset'}}Firewall Active:$to_bool{$lynis_report_data{'firewall_active'}}
Package Audit Tools Found:$to_bool{$lynis_report_data{'package_audit_tool_found'}}Package Audit Tool:$lynis_report_data{'package_audit_tool'}Vulnerable Packages Found:$lynis_report_data{'vulnerable_packages_found'}Package Manager:$lynis_report_data{'package_manager[]'}Package Audit Tools Found:$to_bool{$lynis_report_data{'package_audit_tool_found'}}Package Audit Tool:$lynis_report_data{'package_audit_tool'}Vulnerable Packages Found:$lynis_report_data{'vulnerable_packages_found'}Package Manager:$lynis_report_data{'package_manager[]'}
Two-Factor Authentication Enabled:$to_bool{$lynis_report_data{'authentication_two_factor_enabled'}}Two-Factor Authentication Required:$to_bool{$lynis_report_data{'authentication_two_factor_required'}}LDAP PAM Module Enabled:$to_bool{$lynis_report_data{'ldap_pam_enabled'}}LDAP Auth Enabled:$to_bool{$lynis_report_data{'ldap_auth_enabled'}}Two-Factor Authentication Enabled:$to_bool{$lynis_report_data{'authentication_two_factor_enabled'}}Two-Factor Authentication Required:$to_bool{$lynis_report_data{'authentication_two_factor_required'}}LDAP PAM Module Enabled:$to_bool{$lynis_report_data{'ldap_pam_enabled'}}LDAP Auth Enabled:$to_bool{$lynis_report_data{'ldap_auth_enabled'}}
Minimum Password Length:$lynis_report_data{'minimum_password_length'}Maximum Password Days:$lynis_report_data{'password_max_days'}Minimum Password Days:$lynis_report_data{'password_min_days'}Maximum Password Retries:$lynis_report_data{'max_password_retry'}Minimum Password Length:$lynis_report_data{'minimum_password_length'}Maximum Password Days:$lynis_report_data{'password_max_days'}Minimum Password Days:$lynis_report_data{'password_min_days'}Maximum Password Retries:$lynis_report_data{'max_password_retry'}
Password Complexity Score:%#bPAM Cracklib Found:$to_bool{$lynis_report_data{'pam_cracklib'}}Password Strength Tested:$to_bool{$lynis_report_data{'password_strength_tested'}}Failed Logins Logged:$lynis_report_data{'auth_failed_logins_logged'}$to_bool{$lynis_report_data{'pam_cracklib'}}Password Strength Tested:$to_bool{$lynis_report_data{'password_strength_tested'}}Failed Logins Logged:$lynis_report_data{'auth_failed_logins_logged'}
File Integrity Tool Installed:$to_bool{$lynis_report_data{'file_integrity_tool_installed'}}

PAM Modules:

> show <