Hello community,
here is the log from the commit of package yast2-network for openSUSE:Factory checked in at 2012-02-29 14:12:51
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-network (Old)
and /work/SRC/openSUSE:Factory/.yast2-network.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-network", Maintainer is "mvidner@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-network/yast2-network.changes 2012-01-25 11:09:44.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.yast2-network.new/yast2-network.changes 2012-02-29 14:12:53.000000000 +0100
@@ -1,0 +2,18 @@
+Mon Feb 27 09:38:49 UTC 2012 - mfilka@suse.com
+
+- installer's proxy config stored on installed system - bnc#693640
+- 2.22.4
+
+-------------------------------------------------------------------
+Thu Feb 23 08:52:06 UTC 2012 - mfilka@suse.com
+
+- added popup with security question when proxy url contains password (http://usr:pass@proxy) - bnc 694582
+- fixed testsuite
+- 2.22.3
+
+-------------------------------------------------------------------
+Tue Jan 31 17:36:27 CET 2012 - mvidner@suse.cz
+
+- Simplified NetworkStorage::isDiskOnNetwork, thx locilka (bnc#726057#c12)
+
+-------------------------------------------------------------------
Old:
----
yast2-network-2.22.2.tar.bz2
New:
----
yast2-network-2.22.4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-network.spec ++++++
--- /var/tmp/diff_new_pack.01MTPY/_old 2012-02-29 14:12:55.000000000 +0100
+++ /var/tmp/diff_new_pack.01MTPY/_new 2012-02-29 14:12:55.000000000 +0100
@@ -16,22 +16,22 @@
#
+
Name: yast2-network
-Version: 2.22.2
+Version: 2.22.4
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: yast2-network-%{version}.tar.bz2
+Group: System/YaST
+License: GPL-2.0+
# should be required by devtools
-BuildRequires: perl-XML-Writer
-BuildRequires: pkgconfig
-BuildRequires: rpm
+BuildRequires: perl-XML-Writer pkgconfig rpm
BuildRequires: update-desktop-files
+BuildRequires: yast2-devtools yast2-testsuite
BuildRequires: yast2-country
-BuildRequires: yast2-devtools
BuildRequires: yast2-installation >= 2.15.27
-BuildRequires: yast2-testsuite
# NetworkInterfaces::Write should write ifcfgs only once
# Wizard::SetDesktopTitleAndIcon
@@ -62,12 +62,10 @@
Conflicts: yast2-core < 2.10.6
Summary: YaST2 - Network Configuration
-License: GPL-2.0+
-Group: System/YaST
%package devel-doc
-Summary: YaST2 - Developer documentation for yast2-network
Group: System/YaST
+Summary: YaST2 - Developer documentation for yast2-network
%description
This package contains the YaST2 component for network configuration.
++++++ yast2-network-2.22.2.tar.bz2 -> yast2-network-2.22.4.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-2.22.2/VERSION new/yast2-network-2.22.4/VERSION
--- old/yast2-network-2.22.2/VERSION 2012-01-24 16:51:48.000000000 +0100
+++ new/yast2-network-2.22.4/VERSION 2012-02-27 10:38:41.000000000 +0100
@@ -1 +1 @@
-2.22.2
+2.22.4
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-2.22.2/configure.in new/yast2-network-2.22.4/configure.in
--- old/yast2-network-2.22.2/configure.in 2012-01-24 16:51:49.000000000 +0100
+++ new/yast2-network-2.22.4/configure.in 2012-02-23 08:52:13.000000000 +0100
@@ -1,6 +1,6 @@
dnl configure.in for yast2-network
dnl
-dnl -- This file is generated by y2autoconf 2.21.7 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.21.6 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
AC_INIT(yast2-network, 2.22.2, http://bugs.opensuse.org/, yast2-network)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-2.22.2/src/clients/proxy.ycp new/yast2-network-2.22.4/src/clients/proxy.ycp
--- old/yast2-network-2.22.2/src/clients/proxy.ycp 2012-01-24 16:51:47.000000000 +0100
+++ new/yast2-network-2.22.4/src/clients/proxy.ycp 2012-02-23 11:37:14.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Proxy client
* Authors: Michal Svec
*
- * $Id: proxy.ycp 65909 2011-09-22 09:25:27Z visnov $
+ * $Id: proxy.ycp 67533 2012-02-23 10:37:07Z mfilka $
*
* Main file for proxy configuration.
* Uses all other files.
@@ -44,10 +44,10 @@
/* main ui function */
any ret = ProxyMainDialog(true);
y2debug("ret == %1", ret);
-
+
if (ret == `next && Modified ())
Proxy::Write();
-
+
UI::CloseDialog();
return ret;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-2.22.2/src/clients/save_network.ycp new/yast2-network-2.22.4/src/clients/save_network.ycp
--- old/yast2-network-2.22.2/src/clients/save_network.ycp 2012-01-24 16:51:47.000000000 +0100
+++ new/yast2-network-2.22.4/src/clients/save_network.ycp 2012-02-27 08:56:37.000000000 +0100
@@ -45,14 +45,14 @@
* @return true on success
*/
define boolean ReadInstallInfItem(path install_inf, string item, string var) {
- if(item == nil || item == "" || var == nil || var == "")
+ if(item == nil || item == "" || var == nil || var == "")
return false;
string val = (string) SCR::Read(add(install_inf, var));
- if(val == nil)
+ if(val == nil)
return false;
- if(val != "")
+ if(val != "")
InstallInf[item] = val;
return true;
@@ -130,7 +130,8 @@
ReadInstallInfItem(install_inf, "nisdomain", "NISDomain");
ReadInstallInfItem(install_inf, "hostname", "Hostname");
ReadInstallInfItem(install_inf, "module", "Alias");
- ReadInstallInfItem(install_inf, "proxy", "Proxy");
+ ReadInstallInfItem(install_inf, "proxyUrl", "ProxyUrl");
+ ReadInstallInfItem(install_inf, "proxyProto", "ProxyProto");
// ReadInstallInfItem(install_inf, "options", "Options");
// OSAHwAddr parameter s390
ReadInstallInfItem(install_inf, "hwaddr", "HWAddr");
@@ -439,12 +440,22 @@
}
// create proxy sysconfig file
- if (size(InstallInf["proxy"]:"")>0) {
- y2milestone("Writing proxy settings: %1", InstallInf["proxy"]:"");
- map ex = Proxy::Export();
+ if( (size(InstallInf["proxyProto"]:"")>0) &&
+ (size( InstallInf["proxyUrl"]:"") >0) ) {
+ y2milestone("Writing proxy settings: %1", InstallInf["proxyUrl"]:"");
+
Proxy::Read();
+ map ex = Proxy::Export();
+
+ // bnc#693640 - update Proxy module's configuration
+ // username and password is stored in url because it is handled by linuxrc this way and it is impossible
+ // to distinguish how the user inserted it (separate or as a part of url?)
+ ex[ InstallInf[ "proxyProto"]:"" + "_proxy"] = InstallInf[ "proxyUrl"]:"";
+
Proxy::Import( ex );
Proxy::Write();
+
+ y2debug( "Written proxy settings: %1", ex);
}
// create defaultdomain
if (size(InstallInf["nisdomain"]:"")>0 && FileUtils::Exists("/etc/defaultdomain")){
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-2.22.2/src/modules/NetworkStorage.ycp new/yast2-network-2.22.4/src/modules/NetworkStorage.ycp
--- old/yast2-network-2.22.2/src/modules/NetworkStorage.ycp 2012-01-24 16:51:48.000000000 +0100
+++ new/yast2-network-2.22.4/src/modules/NetworkStorage.ycp 2012-02-06 08:03:51.000000000 +0100
@@ -36,26 +36,7 @@
* @return root dev over network: `no `iscsi `nfs `fcoe
*/
global symbol isDiskOnNetwork(string device) {
- y2milestone("begin isDiskOnNetwork(%1) function", device);
- if (device=="nfs") {
- return `nfs;
- }
- if (size(device)==0) {
- y2error("Empty parameter for isDiskOnNetwork() function");
- return `no;
- }
-
- symbol network_based = Storage::IsDeviceOnNetwork(device);
-
- // test for nfs (bnc#384420)
- if (network_based == `no) {
- string space="[[:space:]]";
- if (SCR::Execute(.target.bash, sformat("grep '%1%2%3*nfs%4' /proc/mounts ", space, device, space, space))==0){
- y2milestone("device %1 is network based : %2", device, network_based);
- network_based = `nfs;
- }
- }
- return network_based;
+ return Storage::IsDeviceOnNetwork(device);
}
global list<string> getiBFTDevices() {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-2.22.2/src/services/proxy.ycp new/yast2-network-2.22.4/src/services/proxy.ycp
--- old/yast2-network-2.22.2/src/services/proxy.ycp 2012-01-24 16:51:47.000000000 +0100
+++ new/yast2-network-2.22.4/src/services/proxy.ycp 2012-02-23 11:37:14.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Proxy configuration
* Authors: Michal Svec
*
- * $Id: proxy.ycp 61682 2010-04-13 10:42:28Z mzugec $
+ * $Id: proxy.ycp 67533 2012-02-23 10:37:07Z mfilka $
*/
{
@@ -336,6 +336,13 @@
return validate;
}
+
+boolean UrlContainPassword( string url)
+{
+ map ret = URL::Parse( url);
+
+ return size( ret[ "pass"]:"") > 0 ;
+}
/**
* Proxy dialog
* @param standalone true if not run from another ycp client
@@ -481,8 +488,8 @@
UI::ChangeWidget(`id(`user), `ValidChars, ValidCharsUsername);
UI::ChangeWidget(`id(`frame1), `Enabled, enabled);
UI::ChangeWidget(`id(`frame2), `Enabled, enabled);
- if ( !Mode::installation() )
- UI::ChangeWidget(`id("test_proxy"), `Enabled, enabled) ;
+ if ( !Mode::installation() )
+ UI::ChangeWidget(`id("test_proxy"), `Enabled, enabled) ;
InitSameProxy();
if(enabled == true) UI::SetFocus(`id(`http));
@@ -520,16 +527,30 @@
if(https == prefill) https = "";
if(ftp == prefill) ftp = "";
- if(enabled == false)
- break;
- else {
- if((http == "") && (https == "") && (ftp == "") ){
- /* Popup error text - http, https and ftp proxy URLs are blank */
- if(!Popup::ContinueCancel(_("Proxy is enabled, but no proxy URL has been specified.
+ if(enabled == false)
+ break;
+ if((http == "") && (https == "") && (ftp == "") ){
+ /* Popup error text - http, https and ftp proxy URLs are blank */
+ if(!Popup::ContinueCancel(_("Proxy is enabled, but no proxy URL has been specified.
Really use these settings?")))
- continue;
- }
- }
+ continue;
+ }
+ // bnc#694582 - username and password in URL
+ else
+ {
+ boolean password_inside = UrlContainPassword( http) ||
+ UrlContainPassword( https) ||
+ UrlContainPassword( ftp);
+
+ if( (password_inside) && ( ret != "test_proxy"))
+ {
+ if(!Popup::ContinueCancel(_("Security warning:
+Username and password will be stored unencrypted
+in a worldwide readable plaintext file.
+Really use these settings?")))
+ continue;
+ }
+ }
/* check_* */
if(user == "" && pass != "") {
/* Popup::Error text */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-2.22.2/testsuite/tests/runtime.ycp new/yast2-network-2.22.4/testsuite/tests/runtime.ycp
--- old/yast2-network-2.22.2/testsuite/tests/runtime.ycp 2012-01-24 16:51:48.000000000 +0100
+++ new/yast2-network-2.22.4/testsuite/tests/runtime.ycp 2012-02-23 10:14:39.000000000 +0100
@@ -32,6 +32,7 @@
],
"target" : $[
"size" : 1,
+ "stat" : $[ "dummy": true ]
],
];
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org