seasharp
/
anvil
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Updated System->check_ram_use() to set the maximum RAM based on the host type, and set those values in _set_default() so that the user can override if they want.

Browse Source 
* Got anvil-manage-alerts to the point where you can add, edit and delete mail servers.

Signed-off-by: Digimer <digimer@alteeve.ca>
main
Digimer 2 years ago
parent 8bfab0d0ac
commit 35cf0c37fb
5 changed files with 573 additions and 134 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      Anvil/Tools.pm
  2. 23
      Anvil/Tools/System.pm
  3. 71
      share/words.xml
  4. 4
      tools/Makefile.am
  5. 398
      tools/anvil-manage-alerts

5
Anvil/Tools.pm
Unescape View File

@ -906,6 +906,11 @@ sub _set_defaults
privacy => {
strong => 0,
},
ram_limits => {
striker => 3221225472, # 3 GiB
node => 1073741824, # 1 GiB
dr => 2147483648, # 2 GiB
},
# On actual RHEL systems, this will be used to ensure that given repos are enabled on given
# machines types. Obviously, this requires that the host has been subscribed.
rhel => {

23
Anvil/Tools/System.pm
Unescape View File

@ -684,12 +684,33 @@ sub check_ram_use
$anvil->Log->entry({source => $THIS_FILE, line => __LINE__, level => $debug, key => "log_0125", variables => { method => "System->check_ram_use()" }});
my $program = defined $parameter->{program} ? $parameter->{program} : "";
my $max_ram = defined $parameter->{max_ram} ? $parameter->{max_ram} : 1073741824;
my $max_ram = defined $parameter->{max_ram} ? $parameter->{max_ram} : 0;
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => {
program => $program,
max_ram => $max_ram,
}});
# If we weren't told what the max RAM is, set it from defaults
if (not $max_ram)
{
my $host_type = $anvil->Get->host_type({debug => $debug});
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => { host_type => $host_type }});
# We'll set '1073741824' (1 GiB) as max default. Then adjust if we have a device type.
$max_ram = 1073741824;
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => {
max_ram => $anvil->Convert->add_commas({number => $max_ram})." (".$anvil->Convert->bytes_to_human_readable({'bytes' => $max_ram}).")",
}});
if (exists $anvil->data->{sys}{ram_limits}{$host_type})
{
$max_ram = $anvil->data->{sys}{ram_limits}{$host_type};
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => {
max_ram => $anvil->Convert->add_commas({number => $max_ram})." (".$anvil->Convert->bytes_to_human_readable({'bytes' => $max_ram}).")",
}});
}
}
# Find the PID(s) of the program.
my $problem = 0;
my $ram_used = 0;

71
share/words.xml
Unescape View File

@ -534,18 +534,25 @@ The definition data passed in was:
<key name="error_0377">[ Error ] - The '--type' must be 'host' or 'dr'. Was given: [#!variable!type!#].</key>
<key name="error_0378">[ Error ] - The UUID: [#!variable!uuid!#] is not a valid UUID.</key>
<key name="error_0379">[ Error ] - Neither '--host-ip-address' or '--target' were used to define who we are trying to connect to.</key>
<key name="error_0380">[ Error ] - The UUID: [#!variable!uuid!#] passed in by the switch: [#!variable!switch!#] appears to be invalid.</key>
<key name="error_0381">[ Error ] - The domain or IP: [#!variable!name!#] passed in by the switch: [#!variable!switch!#] appears to be invalid.</key>
<key name="error_0382">[ Error ] - The alert level: [#!variable!level!#] passed in by the switch: [#!variable!switch!#] appears to be invalid. Valid values are '1', '2', '3' or '4'. These represent;
1 = "critical" alerts only
2 = "warning" and critical alerts
3 = "notice", warning and critical alerts
4 = "info"; All alerts. This generates almost constant alerts!
</key>
<key name="error_0383">[ Error ] - The TCP port: [#!variable!port!#] passed in by the switch: [#!variable!switch!#] appears to be invalid. TCP ports must be integers between 1 and 65535.</key>
<key name="error_0380">[ Error ] - The UUID: [#!variable!uuid!#] passed in by the switch: [--#!variable!switch!#] appears to be invalid.</key>
<key name="error_0381">[ Error ] - The domain or IP: [#!variable!name!#] passed in by the switch: [--#!variable!switch!#] appears to be invalid.</key>
<key name="error_0382">[ Error ] - The alert level: [#!variable!level!#] passed in by the switch: [--#!variable!switch!#] appears to be invalid. Valid values are '1', '2', '3' or '4'. These represent;
* 1 = "critical" alerts only
* 2 = "warning" and critical alerts
* 3 = "notice", warning and critical alerts
* 4 = "info"; All alerts. This generates almost constant alerts!</key>
<key name="error_0383">[ Error ] - The TCP port: [#!variable!port!#] passed in by the switch: [--#!variable!switch!#] appears to be invalid. TCP ports must be integers between 1 and 65535.</key>
<key name="error_0384">[ Error ] - The mail server security: [#!variable!security!#] appears to be invalid. Valid options are 'none', 'starttls' or 'tls-ssl'.</key>
<key name="error_0385">[ Error ] - The mail server authentication: [#!variable!auth!#] appears to be invalid. Valid options are 'none', 'plain-text', or 'encrypted'.</key>
<key name="error_0385">[ Error ] - The mail server authentication: [#!variable!auth!#] appears to be invalid. Valid options are:
* none = Normal Password
* encrypted = Encrypted Password
* kerberos = Kerberos GSSAPI
* ntlm = NTLM
* tls = TLS
* oauth2 = oauth2</key>
<key name="error_0386">[ Error ] - The email address: [#!variable!email!#] appears to be invalid.</key>
<key name="error_0387">[ Error ] - The switch: [--#!variable!switch!#] is required, but not provided.</key>
<key name="error_0388">[ Error ] - The mail server UUID: [#!variable!uuid!#] was not found.</key>
<!-- Files templates -->
<!-- NOTE: Translating these files requires an understanding of which lines are translatable -->
@ -2689,6 +2696,50 @@ Available options;
# configuration option. It will be removed in a future release.
# Please consider disabling it now.</key>
<key name="message_0293">Migration Network</key>
<key name="message_0294">Are you sure you want to create the new mail server:
* Address: ...... [#!variable!new_address!#]
* TCP port: ..... [#!variable!new_port!#]
* User name: .... [#!variable!new_username!#]
* Password: ..... [#!variable!new_password!#]
* Authentication: [#!variable!new_authentication!#]
* Security: ..... [#!variable!new_security!#]
* HELO domain: .. [#!variable!new_helo_domain!#]
Proceed? [y/N]
</key>
<key name="message_0295">Are you sure you want to change the mail server thusly:
* Address: ...... [#!variable!old_address!#] -> [#!variable!new_address!#]
* TCP port: ..... [#!variable!old_port!#] -> [#!variable!new_port!#]
* User name: .... [#!variable!old_username!#] -> [#!variable!new_username!#]
* Password: ..... [#!variable!old_password!#] -> [#!variable!new_password!#]
* Authentication: [#!variable!old_authentication!#] -> [#!variable!new_authentication!#]
* Security: ..... [#!variable!old_security!#] -> [#!variable!new_security!#]
* HELO domain: .. [#!variable!old_helo_domain!#] -> [#!variable!new_helo_domain!#]
Proceed? [y/N]
</key>
<key name="message_0296">Are you sure you want to delete the mail server:
* Address: ...... [#!variable!old_address!#]
* TCP port: ..... [#!variable!old_port!#]
* User name: .... [#!variable!old_username!#]
* Password: ..... [#!variable!old_password!#]
* Authentication: [#!variable!old_authentication!#]
* Security: ..... [#!variable!old_security!#]
* HELO domain: .. [#!variable!old_helo_domain!#]
Proceed? [y/N]
</key>
<key name="message_0297">The new mail server was created with the UUID: [#!variable!uuid!#].</key>
<key name="message_0298">The mail server has been updated.</key>
<key name="message_0299">The mail server has been deleted.</key>
<!-- Translate names (protocols, etc) -->
<key name="name_0001">Normal Password</key> <!-- none in mail-server -->
<key name="name_0002">Enctrypted Password</key> <!-- encrypted in mail-server -->
<key name="name_0003">Kerberos GSSAPI</key> <!-- kerberos in mail-server -->
<key name="name_0004">NTLM</key> <!-- ntlm in mail-server -->
<key name="name_0005">TLS Certificate</key> <!-- tls in mail-server -->
<key name="name_0006">OAuth2</key> <!-- oauth2 in mail-server -->
<key name="name_0007">None</key> <!-- none in mail-server -->
<key name="name_0008">STARTTLS</key> <!-- starttls in mail-server -->
<key name="name_0009">TLS/SSL</key> <!-- tls-ssl in mail-server -->
<!-- Success messages shown to the user -->
<key name="ok_0001">Saved the mail server information successfully!</key>

4
tools/Makefile.am
Unescape View File

@ -17,6 +17,7 @@ dist_sbin_SCRIPTS = \
anvil-get-server-screenshot \
anvil-join-anvil \
anvil-maintenance-mode \
anvil-manage-alerts \
anvil-manage-dr \
anvil-manage-files \
anvil-manage-firewall \
@ -25,6 +26,7 @@ dist_sbin_SCRIPTS = \
anvil-manage-power \
anvil-manage-server \
anvil-migrate-server \
anvil-network-profiler \
anvil-parse-fence-agents \
anvil-provision-server \
anvil-rename-server \
@ -70,3 +72,5 @@ dist_fence_SCRIPTS = \
sharedir = ${datarootdir}/anvil
dist_share_DATA = striker-auto-initialize-all.example
# -rwxr-xr-x. 1 digimer digimer 34K Feb 1 2020 tool-fio-tester

398
tools/anvil-manage-alerts
Unescape View File

@ -42,6 +42,8 @@ $anvil->Get->switches({list => [
"recipient-email",
"recipient-language",
"recipient-level",
"y",
"yes",
]});
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => $anvil->data->{switches}});
@ -62,14 +64,32 @@ if ($anvil->data->{switches}{"mail-servers"})
}
elsif ($anvil->data->{switches}{"notifications"})
{
$anvil->data->{sys}{show}{notifications} = 1;
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => {
'sys::show::notifications' => $anvil->data->{sys}{show}{notifications},
}});
handle_notifications($anvil);
}
elsif ($anvil->data->{switches}{"recipients"})
{
$anvil->data->{sys}{show}{recipients} = 1;
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => {
'sys::show::recipients' => $anvil->data->{sys}{show}{recipients},
}});
handle_recipients($anvil);
}
else
{
$anvil->data->{sys}{show}{mail_servers} = 1;
$anvil->data->{sys}{show}{recipients} = 1;
$anvil->data->{sys}{show}{notifications} = 1;
$anvil->data->{sys}{show}{systems} = 1;
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => {
'sys::show::mail_servers' => $anvil->data->{sys}{show}{mail_servers},
'sys::show::recipients' => $anvil->data->{sys}{show}{recipients},
'sys::show::notifications' => $anvil->data->{sys}{show}{notifications},
'sys::show::systems' => $anvil->data->{sys}{show}{systems},
}});
show_existing($anvil);
}
@ -93,7 +113,155 @@ sub handle_mail_servers
{
my ($anvil) = @_;
### Are we adding, editing or deleting?
# If we're adding or editing, all fields are required.
my $confirm_needed = 0;
if (($anvil->data->{switches}{add}) or ($anvil->data->{switches}{edit}) or ($anvil->data->{switches}{'delete'}))
{
# Did the user confirm yet?
if ((not $anvil->data->{switches}{'y'}) and (not $anvil->data->{switches}{'yes'}))
{
$confirm_needed = 1;
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { confirm_needed => $confirm_needed }});
}
}
if (($anvil->data->{switches}{add}) or ($anvil->data->{switches}{edit}))
{
# Do we have what we need?
my $problem = 0;
foreach my $switch ("mail-server-address", "mail-server-port", "mail-server-username", "mail-server-password", "mail-server-security", "mail-server-authentication", "mail-server-helo-domain")
{
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => {
switch => $switch,
"switches::$switch" => $anvil->data->{switches}{$switch},
}});
if (not $anvil->data->{switches}{$switch})
{
$anvil->Log->entry({source => $THIS_FILE, line => __LINE__, level => 0, 'print' => 1, key => "error_0387", variables => { switch => $switch }});
$problem = 1;
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { problem => $problem }});
}
}
if ($problem)
{
$anvil->nice_exit({exit_code => 1});
}
}
# If we're editing or deleting, make sure we have a valid UUID.
my $mail_server_uuid = $anvil->data->{switches}{"mail-server-uuid"};
if (($anvil->data->{switches}{edit}) or ($anvil->data->{switches}{'delete'}))
{
if (not $mail_server_uuid)
{
$anvil->Log->entry({source => $THIS_FILE, line => __LINE__, level => 0, 'print' => 1, key => "error_0387", variables => { switch => "mail-server-uuid" }});
$anvil->nice_exit({exit_code => 1});
}
if (not exists $anvil->data->{mail_servers}{mail_server}{$mail_server_uuid})
{
$anvil->Log->entry({source => $THIS_FILE, line => __LINE__, level => 0, 'print' => 1, key => "error_0388", variables => { uuid => $mail_server_uuid }});
$anvil->nice_exit({exit_code => 1});
}
}
# Confirmed?
if ($confirm_needed)
{
my $key = "";
if ($anvil->data->{switches}{add})
{
$key = "message_0294";
}
elsif ($anvil->data->{switches}{edit})
{
$key = "message_0295";
}
elsif ($anvil->data->{switches}{'delete'})
{
$key = "message_0296";
}
print $anvil->Words->string({key => $key, variables => {
new_address => $anvil->data->{switches}{"mail-server-address"},
new_port => $anvil->data->{switches}{"mail-server-port"},
new_username => $anvil->data->{switches}{"mail-server-username"},
new_password => $anvil->data->{switches}{"mail-server-password"},
new_authentication => $anvil->Words->string({key => $anvil->data->{sys}{say_new_auth}}),
new_security => $anvil->Words->string({key => $anvil->data->{sys}{say_new_security}}),
new_helo_domain => $anvil->data->{switches}{"mail-server-helo-domain"},
old_address => $mail_server_uuid ? $anvil->data->{mail_servers}{mail_server}{$mail_server_uuid}{mail_server_address} : "",
old_port => $mail_server_uuid ? $anvil->data->{mail_servers}{mail_server}{$mail_server_uuid}{mail_server_port} : "",
old_username => $mail_server_uuid ? $anvil->data->{mail_servers}{mail_server}{$mail_server_uuid}{mail_server_username} : "",
old_password => $mail_server_uuid ? $anvil->data->{mail_servers}{mail_server}{$mail_server_uuid}{mail_server_password} : "",
old_authentication => $mail_server_uuid ? $anvil->Words->string({key => $anvil->data->{sys}{say_old_auth}}) : "",
old_security => $mail_server_uuid ? $anvil->Words->string({key => $anvil->data->{sys}{say_old_security}}) : "",
old_helo_domain => $mail_server_uuid ? $anvil->data->{mail_servers}{mail_server}{$mail_server_uuid}{mail_server_helo_domain} : "",
}})."\n";
my $answer = <STDIN>;
chomp $answer;
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { answer => $answer }});
if (lc($answer) !~ /^y/)
{
print $anvil->Words->string({key => "message_0022"})."\n";
$anvil->nice_exit({exit_code => 0});
}
}
# Still alive?
if ($anvil->data->{switches}{add})
{
# Create the new entry.
my ($mail_server_uuid) = $anvil->Database->insert_or_update_mail_servers({
debug => 2,
mail_server_address => $anvil->data->{switches}{"mail-server-address"},
mail_server_port => $anvil->data->{switches}{"mail-server-port"},
mail_server_username => $anvil->data->{switches}{"mail-server-username"},
mail_server_password => $anvil->data->{switches}{"mail-server-password"},
mail_server_authentication => $anvil->data->{switches}{"mail-server-authentication"},
mail_server_security => $anvil->data->{switches}{"mail-server-security"},
mail_server_helo_domain => $anvil->data->{switches}{"mail-server-helo-domain"},
});
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { mail_server_uuid => $mail_server_uuid }});
print $anvil->Words->string({key => "message_0297", variables => { uuid => $mail_server_uuid }})."\n";
$anvil->nice_exit({exit_code => 0});
}
elsif ($anvil->data->{switches}{edit})
{
my ($mail_server_uuid) = $anvil->Database->insert_or_update_mail_servers({
debug => 2,
mail_server_uuid => $anvil->data->{switches}{"mail-server-uuid"},
mail_server_address => $anvil->data->{switches}{"mail-server-address"},
mail_server_port => $anvil->data->{switches}{"mail-server-port"},
mail_server_username => $anvil->data->{switches}{"mail-server-username"},
mail_server_password => $anvil->data->{switches}{"mail-server-password"},
mail_server_authentication => $anvil->data->{switches}{"mail-server-authentication"},
mail_server_security => $anvil->data->{switches}{"mail-server-security"},
mail_server_helo_domain => $anvil->data->{switches}{"mail-server-helo-domain"},
});
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { mail_server_uuid => $mail_server_uuid }});
print $anvil->Words->string({key => "message_0298"})."\n";
$anvil->nice_exit({exit_code => 0});
}
elsif ($anvil->data->{switches}{'delete'})
{
my ($mail_server_uuid) = $anvil->Database->insert_or_update_mail_servers({
debug => 2,
'delete' => 1,
mail_server_uuid => $anvil->data->{switches}{"mail-server-uuid"},
});
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { mail_server_uuid => $mail_server_uuid }});
print $anvil->Words->string({key => "message_0299"})."\n";
$anvil->nice_exit({exit_code => 0});
}
else
{
$anvil->data->{sys}{show}{mail_servers} = 1;
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => {
'sys::show::mail_servers' => $anvil->data->{sys}{show}{mail_servers},
}});
show_existing($anvil);
}
return(0);
}
@ -161,6 +329,9 @@ sub show_existing
's8:mail_server_helo_domain' => $mail_server_helo_domain,
}});
# mail_server_helo_domain is 'DELETED' if, well, deleted.
next if $mail_server_helo_domain eq "DELETED";
if (length($mail_server_address) > $anvil->data->{longest}{mail_server_address})
{
$anvil->data->{longest}{mail_server_address} = length($mail_server_address);
@ -335,6 +506,8 @@ sub show_existing
}
# Now show the data.
if ($anvil->data->{sys}{show}{mail_servers})
{
# my $break_line = "+-".sprintf("%0${longest_anvil_name}d", 0);
# my $header_line = "| ".sprintf("%-${longest_anvil_name}s", $anvil_header)." ";
# my $blank_lead = "| ".sprintf("%-${longest_anvil_name}s", $anvil_header)." ";
@ -360,15 +533,20 @@ sub show_existing
's7:mail_server_authentication' => $mail_server_authentication,
's8:mail_server_helo_domain' => $mail_server_helo_domain,
}});
next if $mail_server_helo_domain eq "DELETED";
print $mail_server_address.", ".$mail_server_port.", ".$mail_server_username.", ".$mail_server_password.", ".$mail_server_security.", ".$mail_server_authentication.", ".$mail_server_helo_domain.", ".$mail_server_uuid."\n";
$mail_servers++;
}
if (not $mail_servers)
{
print "No mail servers configured yet!\n";
print "# No mail servers configured yet!\n";
}
print "\n";
}
if ($anvil->data->{sys}{show}{recipients})
{
print "-=] Recipients;\n";
print "Name, Email, Alert Level, Language, Recipient UUID\n";
my $recipients = 0;
@ -393,10 +571,13 @@ sub show_existing
}
if (not $recipients)
{
print "No alert recipients added yet!\n";
print "# No alert recipients added yet!\n";
}
print "\n";
}
if ($anvil->data->{sys}{show}{notifications})
{
print "-=] Notification Over-rides;\n";
print "Recipient, Host, Anvil!, Alert Level, Notification UUID\n";
my $notifications = 0;
@ -420,11 +601,14 @@ sub show_existing
}
if (not $notifications)
{
print "No notification over-rides found.\n";
print "# No notification over-rides found.\n";
}
print "\n";
}
# Lastly, show machines.
print "\n";
if ($anvil->data->{sys}{show}{systems})
{
print "-=] Striker Dashboards;\n";
foreach my $host_name (sort {$a cmp $b} keys %{$anvil->data->{sys}{hosts}{by_name}})
{
@ -454,6 +638,7 @@ sub show_existing
print " - Node 2: .. [".$anvil->data->{hosts}{host_uuid}{$anvil_node2_host_uuid}{short_host_name}."], UUID: [".$anvil_node2_host_uuid."]\n";
print " - DR Host 1: [".$say_dr1_name."], UUID: [".$say_dr1_uuid."]\n";
}
}
return(0);
}
@ -474,6 +659,14 @@ sub check_switches
### Now sanity check
my $problem = 0;
# These will be used to limit the display of things, if/when appropriate
$anvil->data->{sys}{show}{mail_servers} = 0;
$anvil->data->{sys}{show}{recipients} = 0;
$anvil->data->{sys}{show}{notifications} = 0;
$anvil->data->{sys}{show}{systems} = 0;
$anvil->data->{sys}{say_old_security} = "";
$anvil->data->{sys}{say_old_auth} = "";
# Validate UUIDs.
foreach my $switch ("mail-server-uuid", "notification-uuid", "recipient-uuid", "notification-recipient-uuid", "notification-host-uuid")
{
@ -481,7 +674,7 @@ sub check_switches
if (($anvil->data->{switches}{$switch}) && (not $anvil->Validate->uuid({uuid => $anvil->data->{switches}{$switch}})))
{
# Invalid UUID.
$anvil->Log->entry({source => $THIS_FILE, line => __LINE__, level => 2, key => "error_0380", variables => {
$anvil->Log->entry({source => $THIS_FILE, line => __LINE__, level => 0, 'print' => 1, key => "error_0380", variables => {
uuid => $anvil->data->{switches}{$switch},
switch => "--".$switch,
}});
@ -489,6 +682,90 @@ sub check_switches
$problem = 1;
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { problem => $problem }});
}
# If it's a Security or Authentication UUID, translate the strings.
if ((not $problem) && ($switch eq "mail-server-uuid") && ($anvil->data->{switches}{$switch}))
{
my $mail_server_uuid = $anvil->data->{switches}{$switch};
my $mail_server_security = $anvil->data->{mail_servers}{mail_server}{$mail_server_uuid}{mail_server_security};
my $mail_server_authentication = $anvil->data->{mail_servers}{mail_server}{$mail_server_uuid}{mail_server_authentication};
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => {
mail_server_uuid => $mail_server_uuid,
mail_server_security => $mail_server_security,
mail_server_authentication => $mail_server_authentication,
}});
if ($mail_server_security eq "none")
{
$anvil->data->{sys}{say_old_security} = "name_0007";
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => {
"sys::say_old_security" => $anvil->data->{sys}{say_old_security},
}});
}
elsif ($mail_server_security eq "starttls")
{
$anvil->data->{sys}{say_old_security} = "name_0008";
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => {
"sys::say_old_security" => $anvil->data->{sys}{say_old_security},
}});
}
elsif ($mail_server_security eq "ssl_tls")
{
$anvil->data->{sys}{say_old_security} = "name_0009";
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => {
"sys::say_old_security" => $anvil->data->{sys}{say_old_security},
}});
}
if ($mail_server_authentication eq "normal_password")
{
# normal_password
$anvil->data->{sys}{say_old_auth} = "name_0001";
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => {
"sys::say_old_auth" => $anvil->data->{sys}{say_old_auth},
}});
}
elsif ($mail_server_authentication eq "encrypted_password")
{
# encrypted_password
$anvil->data->{sys}{say_old_auth} = "name_0002";
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => {
"sys::say_old_auth" => $anvil->data->{sys}{say_old_auth},
}});
}
elsif ($mail_server_authentication eq "kerberos_gssapi")
{
# kerberos_gssapi
$anvil->data->{sys}{say_old_auth} = "name_0003";
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => {
"sys::say_old_auth" => $anvil->data->{sys}{say_old_auth},
}});
}
elsif ($mail_server_authentication eq "ntlm")
{
# ntlm, no need to translate
$anvil->data->{sys}{say_old_auth} = "name_0004";
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => {
"sys::say_old_auth" => $anvil->data->{sys}{say_old_auth},
}});
}
elsif ($mail_server_authentication eq "tls_certificate")
{
# tls_certificate
$anvil->data->{sys}{say_old_auth} = "name_0005";
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => {
"sys::say_old_auth" => $anvil->data->{sys}{say_old_auth},
}});
}
elsif ($mail_server_authentication eq "oauth2")
{
# oauth2, no need to translate
$anvil->data->{sys}{say_old_auth} = "name_0006";
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => {
"sys::say_old_auth" => $anvil->data->{sys}{say_old_auth},
}});
}
}
}
# Validate domain or IP data.
@ -500,7 +777,7 @@ sub check_switches
# Make sure it's a domain or IP address.
if ((not $anvil->Validate->domain_name({name => $anvil->data->{switches}{$switch}})) && (not $anvil->Validate->ip({ip => $anvil->data->{switches}{$switch}})))
{
$anvil->Log->entry({source => $THIS_FILE, line => __LINE__, level => 2, key => "error_0381", variables => {
$anvil->Log->entry({source => $THIS_FILE, line => __LINE__, level => 0, 'print' => 1, key => "error_0381", variables => {
name => $anvil->data->{switches}{$switch},
switch => "--".$switch,
}});
@ -547,7 +824,7 @@ sub check_switches
($anvil->data->{switches}{$switch} < 1) or
($anvil->data->{switches}{$switch} > 4))
{
$anvil->Log->entry({source => $THIS_FILE, line => __LINE__, level => 2, key => "error_0382", variables => {
$anvil->Log->entry({source => $THIS_FILE, line => __LINE__, level => 0, 'print' => 1, key => "error_0382", variables => {
level => $anvil->data->{switches}{$switch},
switch => "--".$switch,
}});
@ -566,7 +843,7 @@ sub check_switches
($anvil->data->{switches}{"mail-server-port"} < 1) or
($anvil->data->{switches}{"mail-server-port"} > 65535))
{
$anvil->Log->entry({source => $THIS_FILE, line => __LINE__, level => 2, key => "error_0383", variables => {
$anvil->Log->entry({source => $THIS_FILE, line => __LINE__, level => 0, 'print' => 1, key => "error_0383", variables => {
port => $anvil->data->{switches}{"mail-server-port"},
switch => "--mail-server-port",
}});
@ -577,14 +854,37 @@ sub check_switches
}
# Make sure mail server security is correct.
$anvil->data->{sys}{say_new_security} = "";
if ($anvil->data->{switches}{"mail-server-security"})
{
$anvil->data->{switches}{"mail-server-security"} = lc($anvil->data->{switches}{"mail-server-security"});
if (($anvil->data->{switches}{"mail-server-security"} ne "none") &&
($anvil->data->{switches}{"mail-server-security"} ne "starttls") &&
($anvil->data->{switches}{"mail-server-security"} ne "tls-ssl"))
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => {
"switches::mail-server-security" => $anvil->data->{switches}{"mail-server-security"},
}});
if ($anvil->data->{switches}{"mail-server-security"} eq "none")
{
$anvil->Log->entry({source => $THIS_FILE, line => __LINE__, level => 2, key => "error_0384", variables => {
$anvil->data->{sys}{say_new_security} = "name_0007";
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => {
"sys::say_new_security" => $anvil->data->{sys}{say_new_security},
}});
}
elsif ($anvil->data->{switches}{"mail-server-security"} eq "starttls")
{
$anvil->data->{sys}{say_new_security} = "name_0008";
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => {
"sys::say_new_security" => $anvil->data->{sys}{say_new_security},
}});
}
elsif ($anvil->data->{switches}{"mail-server-security"} eq "tls-ssl")
{
$anvil->data->{sys}{say_new_security} = "name_0009";
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => {
"sys::say_new_security" => $anvil->data->{sys}{say_new_security},
}});
}
else
{
$anvil->Log->entry({source => $THIS_FILE, line => __LINE__, level => 0, 'print' => 1, key => "error_0384", variables => {
security => $anvil->data->{switches}{"mail-server-security"},
}});
@ -593,26 +893,84 @@ sub check_switches
}
}
$anvil->data->{sys}{say_new_auth} = "";
if ($anvil->data->{switches}{"mail-server-authentication"})
{
$anvil->data->{switches}{"mail-server-authentication"} = lc($anvil->data->{switches}{"mail-server-authentication"});
if (($anvil->data->{switches}{"mail-server-authentication"} ne "none") &&
($anvil->data->{switches}{"mail-server-authentication"} ne "plain-text") &&
($anvil->data->{switches}{"mail-server-authentication"} ne "encrypted"))
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => {
"switches::mail-server-authentication" => $anvil->data->{switches}{"mail-server-authentication"},
}});
if ($anvil->data->{switches}{"mail-server-authentication"} eq "none")
{
$anvil->Log->entry({source => $THIS_FILE, line => __LINE__, level => 2, key => "error_0385", variables => {
auth => $anvil->data->{switches}{"mail-server-authentication"},
# normal_password
$anvil->data->{sys}{say_new_auth} = "name_0001";
$anvil->data->{switches}{"mail-server-authentication"} = "normal_password";
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => {
"sys::say_new_auth" => $anvil->data->{sys}{say_new_auth},
"switches::mail-server-authentication" => $anvil->data->{switches}{"mail-server-authentication"},
}});
}
elsif ($anvil->data->{switches}{"mail-server-authentication"} eq "encrypted")
{
# encrypted_password
$anvil->data->{sys}{say_new_auth} = "name_0002";
$anvil->data->{switches}{"mail-server-authentication"} = "encrypted_password";
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => {
"sys::say_new_auth" => $anvil->data->{sys}{say_new_auth},
"switches::mail-server-authentication" => $anvil->data->{switches}{"mail-server-authentication"},
}});
}
elsif ($anvil->data->{switches}{"mail-server-authentication"} eq "kerberos")
{
# kerberos_gssapi
$anvil->data->{sys}{say_new_auth} = "name_0003";
$anvil->data->{switches}{"mail-server-authentication"} = "kerberos_gssapi";
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => {
"sys::say_new_auth" => $anvil->data->{sys}{say_new_auth},
"switches::mail-server-authentication" => $anvil->data->{switches}{"mail-server-authentication"},
}});
}
elsif ($anvil->data->{switches}{"mail-server-authentication"} eq "ntlm")
{
# ntlm, no need to translate
$anvil->data->{sys}{say_new_auth} = "name_0004";
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => {
"sys::say_new_auth" => $anvil->data->{sys}{say_new_auth},
}});
}
elsif ($anvil->data->{switches}{"mail-server-authentication"} eq "tls")
{
# tls_certificate
$anvil->data->{sys}{say_new_auth} = "name_0005";
$anvil->data->{switches}{"mail-server-authentication"} = "tls_certificate";
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => {
"sys::say_new_auth" => $anvil->data->{sys}{say_new_auth},
"switches::mail-server-authentication" => $anvil->data->{switches}{"mail-server-authentication"},
}});
}
elsif ($anvil->data->{switches}{"mail-server-authentication"} eq "oauth2")
{
# oauth2, no need to translate
$anvil->data->{sys}{say_new_auth} = "name_0006";
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => {
"sys::say_new_auth" => $anvil->data->{sys}{say_new_auth},
}});
}
else
{
# Not valid
$problem = 1;
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { problem => $problem }});
$anvil->Log->entry({source => $THIS_FILE, line => __LINE__, level => 0, 'print' => 1, key => "error_0385", variables => {
auth => $anvil->data->{switches}{"mail-server-authentication"},
}});
}
}
if ($anvil->data->{switches}{"recipient-email"})
{
if (not $anvil->Validate->email({email => $anvil->data->{switches}{"recipient-email"}}))
{
$anvil->Log->entry({source => $THIS_FILE, line => __LINE__, level => 2, key => "error_0386", variables => {
$anvil->Log->entry({source => $THIS_FILE, line => __LINE__, level => 0, 'print' => 1, key => "error_0386", variables => {
email => $anvil->data->{switches}{"recipient-email"},
}});

Write Preview
Loading…
Cancel
Save