|
diff --git a/share/words.xml b/share/words.xml
index 7fa5c704..bd4242fa 100644
--- a/share/words.xml
+++ b/share/words.xml
@@ -803,7 +803,7 @@ Here we will inject 't_0006', which injects 't_0001' which has a variable: [#!st
Target
User
File
- Line
+ On Host
Welcome! Lets setup your #!string!brand_0003!# dashboard...
@@ -1020,7 +1020,7 @@ Failure! The return code: [#!variable!return_code!#] was received ('0' was expec
[ Error ] - The known hosts file: [#!variable!file!#] was not found. Skipping it.
Finished.
[ Error ] - There was a problem reading the known hosts file: [#!variable!file!#]. Skipping it.
- Found the offending line, removing it.
+ Found an entry for the target at line: [#!variable!line!#], removing it.
[ Error ] - The line number: [#!variable!line!#] in: [#!variable!file!#] does not appear to be for the target: [#!variable!target!#]. Has the file already been updated? Skipping it.
Rewriing: [#!variable!file!#].
Manage Keys
@@ -1042,7 +1042,7 @@ Failure! The return code: [#!variable!return_code!#] was received ('0' was expec
The IP address is not a valid IPv4 address
The SSH port is not a valid (usually it is 22, but it has to be between 1 ~ 65536)
Failed to log into the host. Is the IP or root user's password right?
- The target's host key has changed. If the target has been rebuilt, or the target IP reused, the old key will need to be removed. Problem file: [#!variable!file!#:#!variable!line!#].
+ Click here to resolve.]]>
There are not enough network interfaces on this machine. You have: [#!variable!interface_count!#] interface(s), and you need at least: [#!variable!required_interfaces_for_single!#] interfaces to connect to the requested networks (one for Back-Channel and one for each Internet-Facing network).
diff --git a/tools/anvil-manage-keys b/tools/anvil-manage-keys
index 17881492..37909174 100755
--- a/tools/anvil-manage-keys
+++ b/tools/anvil-manage-keys
@@ -11,6 +11,9 @@
# 2 = Job not found.
# 3 = No offending keys found.
#
+# TODO: We might want to offer an option to remove all keys found for a given target. Somehow, at least in
+# testing, multiple keys got into a single known_hosts file.
+#
use strict;
use warnings;
@@ -116,7 +119,7 @@ WHERE
if ($state_host_uuid ne $anvil->data->{sys}{host_uuid})
{
# Um...
- $anvil->data->{job}{progress} += 10; $anvil->data->{job}{progress} = 95 if $anvil->data->{job}{progress} > 95;
+ $anvil->data->{job}{progress} += 10;
update_progress($anvil, $anvil->data->{job}{progress}, "job_0058,!!state_uuid!".$state_uuid."!!,!!host_uuid!".$state_host_uuid."!!");
$anvil->Log->entry({source => $THIS_FILE, line => __LINE__, 'print' => 1, level => 2, key => "job_0058", variables => {
state_uuid => $state_uuid,
@@ -125,6 +128,7 @@ WHERE
next;
}
+ ### NOTE: We don't need the line anymore, but we're not removing it yet.
# Pull out the details.
my $bad_file = "";
my $bad_line = "";
@@ -155,8 +159,8 @@ WHERE
bad_line => $bad_line,
}});
- $anvil->data->{job}{progress} += 5; $anvil->data->{job}{progress} = 95 if $anvil->data->{job}{progress} > 95;
- update_progress($anvil, $anvil->data->{job}{progress}, "job_0049,!!line!:".$bad_line.",!!file!".$bad_file."!!,!!target!".$target."!!");
+ $anvil->data->{job}{progress} += 5;
+ update_progress($anvil, $anvil->data->{job}{progress}, "job_0049,!!line!:".$bad_line."!!,!!file!".$bad_file."!!,!!target!".$target."!!");
$anvil->Log->entry({source => $THIS_FILE, line => __LINE__, 'print' => 1, level => 2, key => "job_0049", variables => {
line => $bad_line,
file => $bad_file,
@@ -166,7 +170,7 @@ WHERE
# Read in the file, if it exists.
if (not -e $bad_file)
{
- $anvil->data->{job}{progress} += 10; $anvil->data->{job}{progress} = 95 if $anvil->data->{job}{progress} > 95;
+ $anvil->data->{job}{progress} += 10;
update_progress($anvil, $anvil->data->{job}{progress}, "job_0050,!!file!".$bad_file."!!");
$anvil->Log->entry({source => $THIS_FILE, line => __LINE__, 'print' => 1, level => 2, key => "job_0050", variables => { file => $bad_file }});
@@ -180,7 +184,7 @@ WHERE
if ($old_body eq "!!error!!")
{
# Failed to read the file
- $anvil->data->{job}{progress} += 10; $anvil->data->{job}{progress} = 95 if $anvil->data->{job}{progress} > 95;
+ $anvil->data->{job}{progress} += 10;
update_progress($anvil, $anvil->data->{job}{progress}, "job_0052,!!file!".$bad_file."!!");
$anvil->Log->entry({source => $THIS_FILE, line => __LINE__, 'print' => 1, level => 2, key => "job_0052", variables => { file => $bad_file }});
@@ -201,33 +205,16 @@ WHERE
's2:bad_line' => $bad_line,
's3:line' => $line,
}});
- if ($line_number eq $bad_line)
+
+ # If the line starts with our target, remove it.
+ if ($line =~ /^$target /)
{
- # Verify that this is, indeed, the right line.
- if ($line =~ /^$target /)
- {
- # Found it!
- $anvil->data->{job}{progress} += 5; $anvil->data->{job}{progress} = 95 if $anvil->data->{job}{progress} > 95;
- update_progress($anvil, $anvil->data->{job}{progress}, "job_0053");
- $anvil->Log->entry({source => $THIS_FILE, line => __LINE__, 'print' => 1, level => 2, key => "job_0053"});
- $update = 1;
- $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { update => $update }});
- }
- else
- {
- # Line found, but not for the target.
- $anvil->data->{job}{progress} += 10; $anvil->data->{job}{progress} = 95 if $anvil->data->{job}{progress} > 95;
- update_progress($anvil, $anvil->data->{job}{progress}, "job_0054,!!line!".$bad_line."!!,!!file!".$bad_file."!!,!!target!".$target."!!");
- $anvil->Log->entry({source => $THIS_FILE, line => __LINE__, 'print' => 1, level => 2, key => "job_0054", variables => {
- line => $bad_line,
- file => $bad_file,
- target => $target,
- }});
-
- # Remove this job and go on to the next bad key (if any).
- delete_state($anvil, $state_uuid);
- last;
- }
+ # Found it!
+ $anvil->data->{job}{progress} += 5;
+ update_progress($anvil, $anvil->data->{job}{progress}, "job_0053,!!line!".$line_number."!!");
+ $anvil->Log->entry({source => $THIS_FILE, line => __LINE__, 'print' => 1, level => 2, key => "job_0053", variables => { line => $line_number }});
+ $update = 1;
+ $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { update => $update }});
}
else
{
@@ -243,20 +230,33 @@ WHERE
if ($update)
{
# Write the file out.
- $anvil->data->{job}{progress} += 5; $anvil->data->{job}{progress} = 95 if $anvil->data->{job}{progress} > 95;
+ $anvil->data->{job}{progress} += 5;
update_progress($anvil, $anvil->data->{job}{progress}, "job_0055,!!file!".$bad_file."!!");
$anvil->Log->entry({source => $THIS_FILE, line => __LINE__, 'print' => 1, level => 2, key => "job_0055", variables => { file => $bad_file }});
+ # Get the owning user and group.
+ my ($owning_uid, $owning_gid) = (stat($bad_file))[4,5];
+ my $owning_user = getpwuid($owning_uid);
+ my $owning_group = getpwuid($owning_gid);
+ $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => {
+ owning_uid => $owning_uid,
+ owning_gid => $owning_gid,
+ owning_user => $owning_user,
+ owning_group => $owning_group,
+ }});
+
my $error = $anvil->Storage->write_file({
- body => $new_body,
- debug => 2,
- file => $bad_file,
- overwrite => 1,
+ body => $new_body,
+ debug => 2,
+ file => $bad_file,
+ overwrite => 1,
+ user => $owning_user,
+ group => $owning_group
});
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, secure => 0, list => { error => $error }});
if ($error)
{
- $anvil->data->{job}{progress} += 5; $anvil->data->{job}{progress} = 95 if $anvil->data->{job}{progress} > 95;
+ $anvil->data->{job}{progress} += 5;
update_progress($anvil, $anvil->data->{job}{progress}, "job_0059,!!file!".$bad_file."!!");
$anvil->Log->entry({source => $THIS_FILE, line => __LINE__, 'print' => 1, level => 2, key => "job_0059", variables => { file => $bad_file }});
}
@@ -264,7 +264,7 @@ WHERE
{
# Success!
delete_state($anvil, $state_uuid);
- $anvil->data->{job}{progress} += 5; $anvil->data->{job}{progress} = 95 if $anvil->data->{job}{progress} > 95;
+ $anvil->data->{job}{progress} += 5;
update_progress($anvil, $anvil->data->{job}{progress}, "job_0060,!!file!".$bad_file."!!");
$anvil->Log->entry({source => $THIS_FILE, line => __LINE__, 'print' => 1, level => 2, key => "job_0060", variables => { file => $bad_file }});
}
@@ -375,6 +375,8 @@ sub update_progress
{
my ($anvil, $progress, $message) = @_;
+ $progress = 95 if $progress > 100;
+
# Log the progress percentage.
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => {
progress => $progress,
diff --git a/tools/striker-initialize-host b/tools/striker-initialize-host
index ad08e55a..e44e34aa 100755
--- a/tools/striker-initialize-host
+++ b/tools/striker-initialize-host
@@ -233,7 +233,15 @@ EOF
error => $error,
return_code => $return_code,
}});
- if ($return_code)
+ if ($return_code eq "70")
+ {
+ # No Internet (or can't reach the subscriion servers)
+ $anvil->Log->entry({source => $THIS_FILE, line => __LINE__, level => 2, 'print' => 1, key => "job_0032"});
+ update_progress($anvil, 10, "job_0032");
+ $subscribe = 0;
+ $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { subscribe => $subscribe }});
+ }
+ elsif ($return_code)
{
# Something went wrong
$anvil->Log->entry({source => $THIS_FILE, line => __LINE__, level => 0, 'print' => 1, key => "job_0035", variables => {
@@ -592,9 +600,9 @@ sub get_job_details
$anvil->data->{data}{say_target} = "root\@".$anvil->data->{data}{host_ip_address}.":".$anvil->data->{data}{ssh_port};
# Update that we've picked the job up.
- $anvil->Log->entry({source => $THIS_FILE, line => __LINE__, level => 2, 'print' => 1, key => "job_0027,!!job-uuid!".$anvil->data->{switches}{'job-uuid'}."!!"});
+ $anvil->Log->entry({source => $THIS_FILE, line => __LINE__, level => 2, 'print' => 1, key => "job_0027", variables => { 'job-uuid' => $anvil->data->{switches}{'job-uuid'} }});
update_progress($anvil, 0, "clear");
- update_progress($anvil, 1, "job_0027");
+ update_progress($anvil, 1, "job_0027,!!job-uuid!".$anvil->data->{switches}{'job-uuid'}."!!");
return(0);
}
|