Author: mzugec Date: Fri Aug 6 13:54:52 2010 New Revision: 62363 URL: http://svn.opensuse.org/viewcvs/yast?rev=62363&view=rev Log: Proxy: correctly enclose user:password into quotes (bnc#616695) 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=62363&r1=62362&r2=62363&view=diff ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Fri Aug 6 13:54:52 2010 @@ -1 +1 @@ -2.19.35 +2.19.36 Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.changes?rev=62363&r1=62362&r2=62363&view=diff ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Fri Aug 6 13:54:52 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Aug 6 13:47:17 CEST 2010 - mzugec@suse.cz + +- Proxy: correctly enclose user:password into quotes (bnc#616695) +- 2.19.36 + +------------------------------------------------------------------- Fri Jul 30 13:37:32 CEST 2010 - mzugec@suse.cz - ISDN: removed deprecated documentation URL (bnc#590742) Modified: trunk/network/src/modules/Proxy.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/Proxy.ycp?rev=62363&r1=62362&r2=62363&view=diff ============================================================================== --- trunk/network/src/modules/Proxy.ycp (original) +++ trunk/network/src/modules/Proxy.ycp Fri Aug 6 13:54:52 2010 @@ -253,19 +253,19 @@ proxy_user = mergestring (splitstring(proxy_user, "\\"), "\\\\"); proxy_password = mergestring (splitstring(proxy_password, "\""), "\\\""); + // enclose user:password into quotes, it may contain special characters (#338264) string user_pass = (proxy_user != "" ? - " --proxy-user " + proxy_user + (proxy_password != "" ? + " --proxy-user '" + proxy_user + (proxy_password != "" ? ":" + proxy_password : - "") + "") + "'" : ""); // timeout for the connection integer timeout_sec = 90; // %1 = http or ftp proxy, %2 = user:password if any, %3 = URL - // enclose user:password into quotes, it may contain special characters (#338264) - 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