xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2026-01-08 09:22:33 +00:00
Code Issues Releases Wiki Activity

Redact commands.log responses

Browse Source
This commit is contained in:
Jarrod Johnson
2018-04-19 13:12:31 -04:00
parent 3c927fba0f
commit 7a06672320
1 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
xCAT-server/sbin/xcatd
View File

@@ -2752,21 +2752,21 @@ sub service_connection {
$cmdlog_alllog .= "$tmpstr ";
}
if (exists($req->{arg})) {
foreach my $arg (@{ $req->{arg} }) {
if ($arg =~ /password/i) {
$cmdlog_alllog .= "'*REDACTED*' ";
last;
}
if ($arg =~ /[^A-Za-z0-9.-]/) {
my $tmparg = $arg;
$tmparg =~ s/'/'\\''/g;
$cmdlog_alllog .= "'" . $tmparg . "' ";
} else {
$cmdlog_alllog .= $arg . " ";
}
}
}
if (exists($req->{arg})) {
foreach my $arg (@{ $req->{arg} }) {
if ($arg =~ /password/i or $arg =~ /passwd/i) {
$cmdlog_alllog .= "'*REDACTED*' ";
last;
}
if ($arg =~ /[^A-Za-z0-9.-]/) {
my $tmparg = $arg;
$tmparg =~ s/'/'\\''/g;
$cmdlog_alllog .= "'" . $tmparg . "' ";
} else {
$cmdlog_alllog .= $arg . " ";
}
}
}
$cmdlog_alllog .= "\n[Response]\n";
# ----used for command log end----------
@@ -3280,6 +3280,7 @@ sub cmdlog_collectlog() {
my $rsp_log = "";
if ((exists($rsponse->{xcatresponse}->[0]->{serverdone})) && (!exists($rsponse->{xcatresponse}->[0]->{error}))) { return 0; }
if ($cmdlog_all =~ /redacted/i) { return 0; }
my $rsp;
if (exists($rsponse->{xcatresponse})) {
$rsp = $rsponse->{xcatresponse};
@@ -3485,6 +3486,9 @@ sub cmdlog_collectlog() {
}
}
}
if ($rsp_log =~ /password/i or $rsp_log =~ /passwd/i) {
$rsp_log = '*REDACTED*';
}
$cmdlog_alllog .= $rsp_log;
return 0;
}