Author: lslezak Date: Wed Apr 1 11:34:46 2009 New Revision: 56521 URL: http://svn.opensuse.org/viewcvs/yast?rev=56521&view=rev Log: - do not log password in URL into y2log (bnc#441944) - 2.13.180 Modified: branches/SuSE-SLE-10-SP3-Branch/packager/VERSION branches/SuSE-SLE-10-SP3-Branch/packager/package/yast2-packager.changes branches/SuSE-SLE-10-SP3-Branch/packager/src/modules/InstURL.ycp branches/SuSE-SLE-10-SP3-Branch/packager/src/modules/SourceDialogs.ycp Modified: branches/SuSE-SLE-10-SP3-Branch/packager/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/packager/VERSION?rev=56521&r1=56520&r2=56521&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/packager/VERSION (original) +++ branches/SuSE-SLE-10-SP3-Branch/packager/VERSION Wed Apr 1 11:34:46 2009 @@ -1 +1 @@ -2.13.179 +2.13.180 Modified: branches/SuSE-SLE-10-SP3-Branch/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/packager/package/yast2-packager.changes?rev=56521&r1=56520&r2=56521&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/packager/package/yast2-packager.changes (original) +++ branches/SuSE-SLE-10-SP3-Branch/packager/package/yast2-packager.changes Wed Apr 1 11:34:46 2009 @@ -3,6 +3,8 @@ - fixed ZMD repository sychronization - properly synchronize repositories with password in the URL (bnc#410417) +- do not log password in URL into y2log (bnc#441944) +- 2.13.180 ------------------------------------------------------------------- Wed Jun 11 09:59:53 CEST 2008 - lslezak@suse.cz Modified: branches/SuSE-SLE-10-SP3-Branch/packager/src/modules/InstURL.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/packager/src/modules/InstURL.ycp?rev=56521&r1=56520&r2=56521&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/packager/src/modules/InstURL.ycp (original) +++ branches/SuSE-SLE-10-SP3-Branch/packager/src/modules/InstURL.ycp Wed Apr 1 11:34:46 2009 @@ -29,7 +29,7 @@ global string HidePassword(string url) { // Url::Build(Url::Parse) transforms the URL too much, see #247249#c41 // replace ://user:password@ by ://user:PASSWORD@ - string subd = regexpsub (url, "(://[^/:]*):[^/@]*@,", "://\\1:PASSWORD@"); + string subd = regexpsub (url, "(.*)(://[^/:]*):[^/@]*@(.*)", "\\1\\2:PASSWORD@\\3"); return subd == nil? url: subd; } Modified: branches/SuSE-SLE-10-SP3-Branch/packager/src/modules/SourceDialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/packager/src/modules/SourceDialogs.ycp?rev=56521&r1=56520&r2=56521&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/packager/src/modules/SourceDialogs.ycp (original) +++ branches/SuSE-SLE-10-SP3-Branch/packager/src/modules/SourceDialogs.ycp Wed Apr 1 11:34:46 2009 @@ -710,9 +710,16 @@ directory = directory + ";workgroup=" + workgroup; } parsed["path"] = directory; - y2milestone("Entered URL: %1", parsed); + + map log_parsed = parsed; + if (haskey(log_parsed, "pass") && size(log_parsed["pass"]:"") > 0) + { + log_parsed["pass"] = "PASSWORD"; + } + y2milestone("Entered URL: %1", log_parsed); + _url = URL::Build (parsed); - y2milestone("URL::Build: %1", _url); + y2milestone("URL::Build: %1", InstURL::HidePassword(_url)); if (UI::WidgetExists (`id (`ch_iso))) { boolean iso = (boolean)UI::QueryWidget (`id (`ch_iso), `Value); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org