[wicd/el6] Fix CVS-2012-0813 (#785147)

[David Cantrell]

commit 6f75fd9bb1bca244e95e1a29c1edf3e48c106d95
Author: David Cantrell <david.l.cantrell at gmail.com>
Date:   Fri Jan 27 15:14:05 2012 -0500

    Fix CVS-2012-0813 (#785147)

 wicd-1.7.0-CVE-2012-0813.patch |   19 +++++++++++++++++++
 wicd.spec                      |   11 ++++++++++-
 2 files changed, 29 insertions(+), 1 deletions(-)
---
diff --git a/wicd-1.7.0-CVE-2012-0813.patch b/wicd-1.7.0-CVE-2012-0813.patch
new file mode 100644
index 0000000..2c84e0e
--- /dev/null
+++ b/wicd-1.7.0-CVE-2012-0813.patch
@@ -0,0 +1,19 @@
+diff -up wicd-1.7.0/wicd/configmanager.py.CVE-2012-0813 wicd-1.7.0/wicd/configmanager.py
+--- wicd-1.7.0/wicd/configmanager.py.CVE-2012-0813	2012-01-27 14:34:12.779219466 -0500
++++ wicd-1.7.0/wicd/configmanager.py	2012-01-27 14:34:33.534091679 -0500
+@@ -97,8 +97,13 @@ class ConfigManager(RawConfigParser):
+                 ret = ret[3:-3]
+             if default:
+                 if self.debug:
+-                    print ''.join(['found ', option, ' in configuration ', 
+-                                   str(ret)])
++                    # mask out sensitive information
++                    if option in ['apsk', 'password', 'identity', 'private_key', \
++                                  'private_key_passwd', 'key', 'passphrase']:
++                        print ''.join(['found ', option, ' in configuration *****'])
++                    else:
++                        print ''.join(['found ', option, ' in configuration ', 
++                                       str(ret)])
+         else:
+             if default != "__None__":
+                 print 'did not find %s in configuration, setting default %s' % (option, str(default))
diff --git a/wicd.spec b/wicd.spec
index 38365d7..1316c9f 100644
--- a/wicd.spec
+++ b/wicd.spec
@@ -7,7 +7,7 @@
 
 Name:             wicd
 Version:          1.7.0
-Release:          1%{?dist}
+Release:          2%{?dist}
 Summary:          Wireless and wired network connection manager
 
 Group:            System Environment/Base
@@ -17,6 +17,7 @@ Source0:          http://downloads.sourceforge.net/%{name}/%{name}-%{version}.ta
 Source1:          wicd.logrotate
 Patch0:           wicd-1.7.0-remove-WHEREAREMYFILES.patch
 Patch1:           wicd-1.7.0-initscript.patch
+Patch2:           wicd-1.7.0-CVE-2012-0813.patch
 
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
 BuildRequires:    python2-devel
@@ -88,6 +89,11 @@ Client program for wicd that uses a GTK+ interface.
 # Reported upstream:  https://bugs.launchpad.net/wicd/+bug/587690
 %patch1 -p1
 
+# Fix CVE-2012-0813
+# Patch based on upstream:
+# http://bazaar.launchpad.net/~wicd-devel/wicd/experimental/revision/682
+%patch2 -p1
+
 %build
 # NOTE: --etc is where dhclient.conf.template goes
 %{__python} setup.py configure \
@@ -253,5 +259,8 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_datadir}/icons/hicolor/scalable/apps/wicd-gtk.svg
 
 %changelog
+* Fri Jan 27 2012 David Cantrell <dcantrell at redhat.com> - 1.7.0-2
+- Fix CVS-2012-0813 (#785147)
+
 * Mon Jun 21 2010 David Cantrell <dcantrell at redhat.com> - 1.7.0-1
 - Initial package