xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-05-22 11:42:05 +00:00
Code Issues Releases Wiki Activity

Check if cons script is excutable before register into console server

Browse Source 
This patch check the script file, if it is not excutable, just print
ignore message.
This commit is contained in:
chenglch 2018-03-28 15:09:06 +08:00
parent 965dc960ea
commit 46c611f11a
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
xCAT-server/lib/perl/xCAT/Goconserver.pm
View File

@ -192,6 +192,10 @@ sub init_local_console {
unless ($_->{cons}) {
$_->{cons} = $_->{mgt};
}
if ( $_->{cons} ne 'openbmc' && ! -x $::XCATROOT . "/share/xcat/cons/".$_->{cons}) {
xCAT::MsgUtils->message("S", $_->{node} .": ignore, ". $::XCATROOT . "/share/xcat/cons/".$_->{cons}." is not excutable. Please check mgt or cons attribute.");
next;
}
if ($_->{conserver} && exists($iphash{ $_->{conserver} })) {
$cons_map{ $_->{node} } = $_;
}
@ -406,6 +410,11 @@ sub get_cons_map {
if ($_->{cons} or defined($_->{'serialport'})) {
unless ($_->{cons}) { $_->{cons} = $_->{mgt}; } #populate with fallback
if ($isSN && $_->{conserver} && exists($iphash{ $_->{conserver} }) || !$isSN) {
if ( $_->{cons} ne 'openbmc' && ! -x $::XCATROOT . "/share/xcat/cons/".$_->{cons}) {
$rsp->{data}->[0] = $_->{node} .": ignore, ". $::XCATROOT . "/share/xcat/cons/".$_->{cons}." is not excutable. Please check mgt or cons attribute.";
xCAT::MsgUtils->message("I", $rsp, $::callback);
next;
}
$cons_map{ $_->{node} } = $_; # also put the ref to the entry in a hash for quick look up
} else {
$rsp->{data}->[0] = $_->{node} .": ignore, the host for conserver could not be determined.";

5
xCAT-server/lib/xcat/plugins/conserver.pm
View File

@ -201,6 +201,7 @@ sub preprocess_request {
sub process_request {
my $req = shift;
my $cb = shift;
$::callback = $cb;
if ($req->{command}->[0] eq "makeconservercf") {
if (-x "/usr/bin/goconserver") {
require xCAT::Goconserver;
@ -603,6 +604,10 @@ sub donodeent {
# either there is no console method (shouldnt happen) or not one of the supported terminal servers
return $node;
}
if (!grep(/^$cmeth$/, @cservers) && ! -x $::XCATROOT . "/share/xcat/cons/" . $cmeth) {
xCAT::SvrUtils::sendmsg([ 0, "ignore, ". $::XCATROOT . "/share/xcat/cons/$cmeth is not excutable. Please check mgt or cons attribute." ], $::callback, $node);
next;
}
push @$content, "#xCAT BEGIN $node CONS\n";
push @$content, "console $node {\n";
if (grep(/^$cmeth$/, @cservers)) {