Author: kmachalkova Date: Tue May 22 14:29:55 2007 New Revision: 38082 URL: http://svn.opensuse.org/viewcvs/yast?rev=38082&view=rev Log: - Escape backslash characters in proxy auth credentials properly (#256360) Modified: trunk/network/VERSION trunk/network/package/yast2-network.changes trunk/network/src/modules/Proxy.ycp Modified: trunk/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=38082&r1=38081&r2=38082&view=diff ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Tue May 22 14:29:55 2007 @@ -1 +1 @@ -2.15.32 +2.15.33 Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.changes?rev=38082&r1=38081&r2=38082&view=diff ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Tue May 22 14:29:55 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue May 22 13:59:04 CEST 2007 - kmachalkova@suse.cz + +- Escape backslash characters in proxy auth credentials properly + (#256360) +- 2.15.33 + +------------------------------------------------------------------- Mon May 21 13:57:47 CEST 2007 - kmachalkova@suse.cz - IsHostLocal test extended to include also hostname and/or IP set by Modified: trunk/network/src/modules/Proxy.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/Proxy.ycp?rev=38082&r1=38081&r2=38082&view=diff ============================================================================== --- trunk/network/src/modules/Proxy.ycp (original) +++ trunk/network/src/modules/Proxy.ycp Tue May 22 14:29:55 2007 @@ -110,7 +110,7 @@ ]; string caption = _("Saving Proxy Configuration"); - integer sl = 100; //sleep for longer time, so that progress does not disappear right afterwards + integer sl = 500; //sleep for longer time, so that progress does not disappear right afterwards Progress::New(caption, " ", size(steps), steps, [], ""); @@ -215,11 +215,14 @@ https_proxy = mergestring (splitstring(https_proxy, "\""), "\\\""); ftp_proxy = mergestring (splitstring(ftp_proxy, "\""), "\\\""); proxy_user = mergestring (splitstring(proxy_user, "\""), "\\\""); + //escape also '\' character - usernames such as domain\user are causing pain to .target.bash_output + //and to curl - #256360 + proxy_user = mergestring (splitstring(proxy_user, "\\"), "\\\\"); proxy_password = mergestring (splitstring(proxy_password, "\""), "\\\""); string user_pass = (proxy_user != "" ? - " --proxy-user " + "'" + proxy_user + "'" + (proxy_password != "" ? - ":" + "'" + proxy_password + "'" + " --proxy-user " + proxy_user + (proxy_password != "" ? + ":" + proxy_password : "") : @@ -228,7 +231,7 @@ // timeout for the connection integer timeout_sec = 90; // %1 = http or ftp proxy, %2 = user:password if any, %3 = URL - string command = "curl --verbose --proxy '%1' %2 --connect-timeout %3 --url '%4'"; + string command = "curl --verbose --proxy %1 %2 --connect-timeout %3 --url '%4'"; string http_command = sformat(command, http_proxy, user_pass, timeout_sec, "http://www.novell.com"); // adding option --insecure to accept the certificate without asking string https_command = sformat(command, https_proxy, user_pass, timeout_sec, "https://secure-www.novell.com --insecure"); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org