xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-05-29 09:13:08 +00:00
Code Issues Releases Wiki Activity

fix issue error message improvement when adding users in hierarchical configuration #4820

Browse Source
This commit is contained in:
immarvin 2018-02-12 08:40:56 -05:00
parent 3a2e3f5fee
commit 7d2c0e1926
2 changed files with 37 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
perl-xCAT/xCAT/RemoteShellExp.pm
View File

@ -541,7 +541,7 @@ sub sendnodeskeys
# command to make the temp directory on the node
my $spawnmkdir =
"$remoteshell $node -l $to_userid /bin/mkdir -p /tmp/$to_userid/.ssh";
"$remoteshell -o GlobalKnownHostsFile=/dev/null -o UserKnownHostsFile=/dev/null $node -l $to_userid /bin/mkdir -p /tmp/$to_userid/.ssh";
# command to copy the needed files to the node
@ -588,6 +588,11 @@ sub sendnodeskeys
##########################################
# Expect error - report
##########################################
if($rc==1){
my $rsp = {};
$rsp->{error}->[0] = "Permission denied, please make sure the user $to_userid has been created on the node $node and the input password is right\n";
xCAT::MsgUtils->message("E", $rsp, $::CALLBACK);
}
if (defined($result[1]))
{
my $msg = $result[1];
@ -629,11 +634,11 @@ sub sendnodeskeys
my $spawncopyfiles;
if ($ENV{'DSH_ENABLE_SSH'}) { # we will enable node to node ssh
$spawncopyfiles =
"$remotecopy $home/.ssh/id_rsa $home/.ssh/id_rsa.pub $home/.ssh/copy.sh $home/.ssh/tmp/authorized_keys $to_userid\@$node:/tmp/$to_userid/.ssh";
"$remotecopy -o GlobalKnownHostsFile=/dev/null -o UserKnownHostsFile=/dev/null $home/.ssh/id_rsa $home/.ssh/id_rsa.pub $home/.ssh/copy.sh $home/.ssh/tmp/authorized_keys $to_userid\@$node:/tmp/$to_userid/.ssh";
} else { # no node to node ssh ( don't send private key)
$spawncopyfiles =
"$remotecopy $home/.ssh/id_rsa.pub $home/.ssh/copy.sh $home/.ssh/tmp/authorized_keys $to_userid\@$node:/tmp/$to_userid/.ssh";
"$remotecopy -o GlobalKnownHostsFile=/dev/null -o UserKnownHostsFile=/dev/null $home/.ssh/id_rsa.pub $home/.ssh/copy.sh $home/.ssh/tmp/authorized_keys $to_userid\@$node:/tmp/$to_userid/.ssh";
}
# send copy command
@ -715,7 +720,7 @@ sub sendnodeskeys
# command to run copy.sh
my $spawnruncopy =
"$remoteshell $node -l $to_userid /tmp/$to_userid/.ssh/copy.sh $to_userid";
"$remoteshell -o GlobalKnownHostsFile=/dev/null -o UserKnownHostsFile=/dev/null $node -l $to_userid /tmp/$to_userid/.ssh/copy.sh $to_userid";
# send mkdir command
unless ($sendkeys->spawn($spawnruncopy))

31
perl-xCAT/xCAT/TableUtils.pm
View File

@ -186,6 +186,8 @@ sub bldnonrootSSHFiles
if (xCAT::Utils->isMN()) { # if on Management Node
if (!(-e "$home/.ssh/id_rsa.pub"))
{
$rsp->{data}->[0] = "$home/.ssh/id_rsa.pub does not exist!";
xCAT::MsgUtils->message("I", $rsp, $::CALLBACK);
return 1;
}
}
@ -208,6 +210,11 @@ sub bldnonrootSSHFiles
if (xCAT::Utils->isMN()) { # if on Management Node
$cmd = " cp $home/.ssh/id_rsa.pub $home/.ssh/tmp/authorized_keys";
} else { # SN
if(!(-e "$home/.ssh/authorized_keys")){
$rsp->{data}->[0] = "$home/.ssh/authorized_keys does not exist, make sure you have setup the ssh-keys on this service node.\n";
xCAT::MsgUtils->message("E", $rsp, $::CALLBACK);
return (1);
}
$cmd = " cp $home/.ssh/authorized_keys $home/.ssh/tmp/authorized_keys";
}
xCAT::Utils->runcmd($cmd, 0);
@ -344,6 +351,11 @@ sub setupSSH
# Get the home directory
my $home = xCAT::Utils->getHomeDir($from_userid);
unless($home){
$rsp->{data}->[0] = "Cannot get the home directory for user \"$from_userid\", please make sure \"$from_userid\" user exists!";
xCAT::MsgUtils->message("E", $rsp, $::CALLBACK);
return 1;
}
$ENV{'DSH_FROM_USERID_HOME'} = $home;
if ($from_userid eq "root")
{
@ -356,6 +368,10 @@ sub setupSSH
# generates new keys for root, if they do not already exist ~/.ssh
# nodes not used on this option but in there to preserve the interface
if($::VERBOSE){
$rsp->{data}->[0] = "Generating SSH keys for $from_userid.\n";
xCAT::MsgUtils->message("I", $rsp, $::CALLBACK);
}
my $rc =
xCAT::RemoteShellExp->remoteshellexp("k", $::CALLBACK, $::REMOTE_SHELL, $n_str, $expecttimeout);
if ($rc != 0) {
@ -363,11 +379,20 @@ sub setupSSH
xCAT::MsgUtils->message("E", $rsp, $::CALLBACK);
}
}
# build the shell copy script, needed Perl not always there
# for root and non-root ids
open(FILE, ">$home/.ssh/copy.sh")
or die "cannot open file $home/.ssh/copy.sh\n";
if($::VERBOSE){
$rsp->{data}->[0] = "Creating helper script \"$home/.ssh/copy.sh\" to install the ssh key files, which will be sent and invoked to target node then.\n";
xCAT::MsgUtils->message("I", $rsp, $::CALLBACK);
}
unless(open(FILE, ">$home/.ssh/copy.sh"))
{
$rsp->{data}->[0] ="cannot create file $home/.ssh/copy.sh, please make sure the directory \"$home/.ssh\" exists and ssh keys have been setup on this node!\n";
xCAT::MsgUtils->message("E", $rsp, $::CALLBACK);
return 1;
}
print FILE "#!/bin/sh
umask 0077
home=`egrep \"^$to_userid:\" /etc/passwd | cut -f6 -d :`