diff options
| author | Christian Poessinger <christian@poessinger.com> | 2017-10-29 15:36:45 +0100 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2017-10-29 16:28:19 +0100 |
| commit | 699a9c48a9ac866ada70206dd1f3b1e1dd23a69c (patch) | |
| tree | 39c9f9f3026dbeca412705dd58b73849cb7bf96a /templates/show/tech-support/brief | |
| parent | 447bc26b83b2d4a540d1340f846c6f15fd118710 (diff) | |
| download | vyatta-op-699a9c48a9ac866ada70206dd1f3b1e1dd23a69c.tar.gz vyatta-op-699a9c48a9ac866ada70206dd1f3b1e1dd23a69c.zip | |
Change 'show tech-support' behavior to always strip-private
Using "show tech-support" cmd will produce the tech-support output
without any private information.
Using "show tech-support private" cmd will produce the tech-support
output with private information included.
Note:
=====
The Perl script (vyos-strip-config.pl) used to remove any sensible information
will in addition remove version numbers if they match the regexp below:
# Strip IPv4 addresses
$input =~ s/\d+\.\d+\.(\d+)\.(\d+)/xxx.xxx.$1.$2/g if $stripIP;
Example:
========
i apt xxx.xxx.9.8.4 amd64 commandline package manager
ii apt-transport-https xxx.xxx.9.8.4 amd64 https download transport for APT
i apt 1.0.9.8.4 amd64 commandline package manager
ii apt-transport-https 1.0.9.8.4 amd64 https download transport for APT
This behavior is present in the current implementation and should be
addressed during the move to the new Python scripts.
Diffstat (limited to 'templates/show/tech-support/brief')
5 files changed, 10 insertions, 10 deletions
diff --git a/templates/show/tech-support/brief/node.def b/templates/show/tech-support/brief/node.def index 23f588e..9a4a624 100644 --- a/templates/show/tech-support/brief/node.def +++ b/templates/show/tech-support/brief/node.def @@ -1,7 +1,7 @@ -help: Show brief tech-support report +help: Show brief tech-support report (private information removed) run: if [ "$VYATTA_USER_LEVEL_DIR" == "/opt/vyatta/etc/shell/level/admin" ]; then - source ${vyatta_datadir}/vyatta-op/functions/tech-support-brief + source ${vyatta_datadir}/vyatta-op/functions/tech-support-brief | strip-private else echo Must be an admin user to run this command fi diff --git a/templates/show/tech-support/brief/save-uncompressed/node.def b/templates/show/tech-support/brief/save-uncompressed/node.def index 7d36614..84b4ed0 100644 --- a/templates/show/tech-support/brief/save-uncompressed/node.def +++ b/templates/show/tech-support/brief/save-uncompressed/node.def @@ -1,7 +1,7 @@ -help: Save uncompressed brief tech-support report +help: Save uncompressed brief tech-support report (private information removed) run: if [ "$VYATTA_USER_LEVEL_DIR" == "/opt/vyatta/etc/shell/level/admin" ]; then - source ${vyatta_datadir}/vyatta-op/functions/tech-support-brief save-uncompressed + source ${vyatta_datadir}/vyatta-op/functions/tech-support-brief save-uncompressed | strip-private else echo Must be an admin user to run this command fi diff --git a/templates/show/tech-support/brief/save-uncompressed/node.tag/node.def b/templates/show/tech-support/brief/save-uncompressed/node.tag/node.def index f1a94c3..dad3949 100644 --- a/templates/show/tech-support/brief/save-uncompressed/node.tag/node.def +++ b/templates/show/tech-support/brief/save-uncompressed/node.tag/node.def @@ -1,8 +1,8 @@ -help: Save uncompressed brief tech-support report to specified path/file +help: Save uncompressed brief tech-support report to specified path/file (private information removed) allowed: echo -n '<file> <scp://<user>:<passwd>@<host>/<file>> <ftp://<user>:<passwd>@<host>/<file>>' run: if [ "$VYATTA_USER_LEVEL_DIR" == "/opt/vyatta/etc/shell/level/admin" ]; then - source ${vyatta_datadir}/vyatta-op/functions/tech-support-brief save-uncompressed $5 + source ${vyatta_datadir}/vyatta-op/functions/tech-support-brief save-uncompressed $5 | strip-private else echo Must be an admin user to run this command fi diff --git a/templates/show/tech-support/brief/save/node.def b/templates/show/tech-support/brief/save/node.def index 966a984..2f8a561 100644 --- a/templates/show/tech-support/brief/save/node.def +++ b/templates/show/tech-support/brief/save/node.def @@ -1,7 +1,7 @@ -help: Save brief tech-support report +help: Save brief tech-support report (private information removed) run: if [ "$VYATTA_USER_LEVEL_DIR" == "/opt/vyatta/etc/shell/level/admin" ]; then - source ${vyatta_datadir}/vyatta-op/functions/tech-support-brief save + source ${vyatta_datadir}/vyatta-op/functions/tech-support-brief save | strip-private else echo Must be an admin user to run this command fi diff --git a/templates/show/tech-support/brief/save/node.tag/node.def b/templates/show/tech-support/brief/save/node.tag/node.def index bf6d45f..f0cfe4a 100644 --- a/templates/show/tech-support/brief/save/node.tag/node.def +++ b/templates/show/tech-support/brief/save/node.tag/node.def @@ -1,8 +1,8 @@ -help: Save compressed brief tech-support report to specified path/file +help: Save compressed brief tech-support report to specified path/file (private information removed) allowed: echo -n '<file> <scp://<user>:<passwd>@<host>/<file>> <ftp://<user>:<passwd>@<host>/<file>>' run: if [ "$VYATTA_USER_LEVEL_DIR" == "/opt/vyatta/etc/shell/level/admin" ]; then - source ${vyatta_datadir}/vyatta-op/functions/tech-support-brief save $5 + source ${vyatta_datadir}/vyatta-op/functions/tech-support-brief save $5 | strip-private else echo Must be an admin user to run this command fi |