Merge pull request #448 from yast/safer_logging

Safer logging
yast · Oct 20, 2016 · 5b140ae · 5b140ae
2 parents 242bd8b + 8ed9784
commit 5b140ae
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/package/yast2-installation.changes b/package/yast2-installation.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Oct 20 09:52:00 UTC 2016 - jreidinger@suse.com
+
+- more robust password filtering in y2start.log
+  (bsc#798966)
+- 3.2.5
+
 -------------------------------------------------------------------
 Thu Oct 13 14:15:23 UTC 2016 - igonzalezsosa@suse.com
 

diff --git a/package/yast2-installation.spec b/package/yast2-installation.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-installation
-Version:        3.2.4
+Version:        3.2.5
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

diff --git a/startup/common/misc.sh b/startup/common/misc.sh
@@ -263,9 +263,7 @@ function log_export()
     IFS="
 "
     for i in `export` ; do
-	i=${i//Password=*/Password=\"<Password> (sensitive information)\"}
-	i=${i//RepoURL=*/RepoURL=\"<RepoURL (may contain sensitive information)>\"}
-	i=${i//ZyppRepoURL=*/ZyppRepoURL=\"<ZyppRepoURL (may contain sensitive information)>\"}
+        i=$(sed 's/\([^[:space:]]*\(repourl\|password\)\)=.*/\1="<\1 may contain sensitive information>"/i' <<< $i)
 	log "\t$i"
     done
     IFS=$IFS_SAVE