Author: lslezak Date: Fri Nov 7 13:24:43 2008 New Revision: 53060 URL: http://svn.opensuse.org/viewcvs/yast?rev=53060&view=rev Log: - fixed URL logging (bnc#441944) Modified: trunk/packager/package/yast2-packager.changes trunk/packager/src/include/repositories_include.ycp trunk/packager/src/modules/InstURL.ycp trunk/packager/src/modules/SourceDialogs.ycp trunk/packager/yast2-packager.spec.in Modified: trunk/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.changes?rev=53060&r1=53059&r2=53060&view=diff ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Fri Nov 7 13:24:43 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri Nov 7 13:26:09 CET 2008 - lslezak@suse.cz + +- fixed URL logging (bnc#441944) + +------------------------------------------------------------------- Wed Nov 5 17:15:50 CET 2008 - locilka@suse.cz - Fixed copying files from inst-sys to the system, some might be Modified: trunk/packager/src/include/repositories_include.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/include/repositories_include.ycp?rev=53060&r1=53059&r2=53060&view=diff ============================================================================== --- trunk/packager/src/include/repositories_include.ycp (original) +++ trunk/packager/src/include/repositories_include.ycp Fri Nov 7 13:24:43 2008 @@ -43,7 +43,7 @@ } define symbol createSource( string url, boolean plaindir, boolean download, string preffered_name ) ``{ - y2milestone("createSource: %1, plaindir: %2, download: %3, name: %4", url, plaindir, download, preffered_name); + y2milestone("createSource: %1, plaindir: %2, download: %3, name: %4", URL::HidePassword(url), plaindir, download, preffered_name); if ( url != "" ) { @@ -175,7 +175,7 @@ // probe repository type (do not probe plaindir repo) string repo_type = (plaindir) ? plaindir_type : Pkg::RepositoryProbe(url, prod_dir); - y2milestone("Repository type (%1,%2): %3", url, prod_dir, repo_type); + y2milestone("Repository type (%1,%2): %3", URL::HidePassword(url), prod_dir, repo_type); // the probing has failed if (repo_type == nil || repo_type == "NONE") @@ -269,7 +269,7 @@ { // popup message part 1 string _msg1 = sformat( _("Unable to create repository -from URL '%1'."), url ); +from URL '%1'."), URL::HidePassword(url) ); // popup message part 2 string _msg2 = _("Try again?"); Modified: trunk/packager/src/modules/InstURL.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/InstURL.ycp?rev=53060&r1=53059&r2=53060&view=diff ============================================================================== --- trunk/packager/src/modules/InstURL.ycp (original) +++ trunk/packager/src/modules/InstURL.ycp Fri Nov 7 13:24:43 2008 @@ -27,10 +27,8 @@ * @return string new URL with hidden password */ 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@"); - return subd == nil? url: subd; + y2warning("InstURL::HidePassword() is obsoleted, use URL::HidePassword() instead"); + return URL::HidePassword(url); } /** Modified: trunk/packager/src/modules/SourceDialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/SourceDialogs.ycp?rev=53060&r1=53059&r2=53060&view=diff ============================================================================== --- trunk/packager/src/modules/SourceDialogs.ycp (original) +++ trunk/packager/src/modules/SourceDialogs.ycp Fri Nov 7 13:24:43 2008 @@ -1258,9 +1258,11 @@ parsed["port"] = (string)UI::QueryWidget(`id(`port), `Value); } - y2milestone("Entered URL: %1", parsed); + // do not log the entered password + y2milestone("Entered URL: %1", URL::HidePasswordToken(parsed)); _url = URL::Build (parsed); - y2milestone("URL::Build: %1", _url); + y2milestone("URL::Build: %1", URL::HidePassword(_url)); + if (UI::WidgetExists (`id (`ch_iso))) { boolean iso = (boolean)UI::QueryWidget (`id (`ch_iso), `Value); Modified: trunk/packager/yast2-packager.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/yast2-packager.spec.in?rev=53060&r1=53059&r2=53060&view=diff ============================================================================== --- trunk/packager/yast2-packager.spec.in (original) +++ trunk/packager/yast2-packager.spec.in Fri Nov 7 13:24:43 2008 @@ -7,8 +7,8 @@ # HTTP.ycp BuildRequires: yast2-transfer -# PackagesUI.ycp -BuildRequires: yast2 >= 2.17.40 +# URL::HidePassword() +BuildRequires: yast2 >= 2.17.47 # "order" flag for pattern resolvables BuildRequires: yast2-pkg-bindings >= 2.17.13 @@ -19,8 +19,8 @@ # "order" flag for pattern resolvables Requires: yast2-pkg-bindings >= 2.17.13 -# PackagesUI.ycp -Requires: yast2 >= 2.17.40 +# URL::HidePassword() +Requires: yast2 >= 2.17.47 # unzipping license file Requires: unzip -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org