Merge lp:~ph7/weather-indicator/http-proxy-fix into lp:weather-indicator

[Panagiotis Skintzos]

Let's stick to gconf for proxy detection, until dconf settings are really in use by gnome-network-properties.

[Vadim Rutkovsky (roignac)]

Thanks, approved

review: Approve

=== modified file 'indicator_weather/helpers.py'
--- indicator_weather/helpers.py	2011-04-22 19:09:19 +0000
+++ indicator_weather/helpers.py	2011-05-02 20:13:28 +0000
@@ -2,16 +2,16 @@
 ### BEGIN LICENSE
 # Copyright (C) 2010 Sebastian MacDonald [e-mail]
 # Copyright (C) 2010 Mehdi Rejraji [e-mail]
-# This program is free software: you can redistribute it and/or modify it 
-# under the terms of the GNU General Public License version 3, as published 
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 3, as published
 # by the Free Software Foundation.
-# 
-# This program is distributed in the hope that it will be useful, but 
-# WITHOUT ANY WARRANTY; without even the implied warranties of 
-# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR 
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
 # PURPOSE.  See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along 
+#
+# You should have received a copy of the GNU General Public License along
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
 ### END LICENSE
 
@@ -29,8 +29,10 @@
     # this has to be called only once, otherwise we get segfaults
     DCONF_SCHEMAS = Gio.Settings.list_schemas()
 except ImportError:
-    pass
+    DCONF_SCHEMAS = []
 
+import gconf
+import traceback
 import os
 import gtk
 import urllib2
@@ -45,9 +47,9 @@
 gettext.textdomain('indicator-weather')
 
 def get_builder(builder_file_name):
-    """Return a fully-instantiated gtk.Builder instance from specified ui 
+    """Return a fully-instantiated gtk.Builder instance from specified ui
     file
-    
+
     :param builder_file_name: The name of the builder file, without extension.
         Assumed to be in the 'ui' directory under the data path.
     """
@@ -85,94 +87,121 @@
 
 class ProxyMonitor:
     """ Class to monitor proxy settings """
-        
+
     @staticmethod
     def monitor_proxy(log):
         ProxyMonitor.log = log
-        # try dconf
         try:
-            if "org.gnome.system.proxy.http" in DCONF_SCHEMAS:
+            # disable dconf settings for now
+            # because they do not seem to be in effect
+            if False and "org.gnome.system.proxy.http" in DCONF_SCHEMAS:
+                # load dconf settings
                 proxy_settings = Gio.Settings.new("org.gnome.system.proxy.http")
                 ProxyMonitor.dconf_proxy_changed(proxy_settings)
                 proxy_settings.connect("changed", ProxyMonitor.dconf_proxy_changed)
             else:
-                # make except block work
-                raise Exception;
-        except:
-            # try gconf
-            import gconf
-            client = gconf.client_get_default()
-            client.add_dir("/system/http_proxy", gconf.CLIENT_PRELOAD_ONELEVEL)
-            ProxyMonitor.gconf_proxy_changed(client)
-            client.notify_add("/system/http_proxy", ProxyMonitor.gconf_proxy_changed)
+                # load gconf settings
+                client = gconf.client_get_default()
+                client.add_dir("/system/http_proxy", gconf.CLIENT_PRELOAD_ONELEVEL)
+                ProxyMonitor.gconf_proxy_changed(client)
+                client.notify_add("/system/http_proxy", ProxyMonitor.gconf_proxy_changed)
+
+        except Exception, e:
+            log.error("ProxyMonitor: %s" % e)
+            log.debug(traceback.format_exc(e))
 
     @staticmethod
-    def dconf_proxy_changed(settings):
+    def dconf_proxy_changed(settings, changed_key=None):
         """
         Loads dconf hhtp proxy settings
         """
-        ProxyMonitor.log.debug("ProxyMonitor: loading dconf settings")
-        proxy_info = {}
-        # Taken from http://forum.compiz.org/viewtopic.php?t=9480
-        if settings.get_boolean("enabled"):
-            proxy_info['host'] = settings.get_string("host")
-            proxy_info['port'] = settings.get_int("port")
-            if settings.get_boolean("use-authentication"):
-                proxy_info['user'] = settings.get_string("authentication-user")
-                proxy_info['pass'] = settings.get_string("authentication-password")
-
-        ProxyMonitor.install_proxy_handler(proxy_info)
+        try:
+            ProxyMonitor.log.debug("ProxyMonitor: loading dconf settings")
+            proxy_info = {}
+            # Taken from http://forum.compiz.org/viewtopic.php?t=9480
+            if settings.get_boolean("enabled"):
+                proxy_info['host'] = settings.get_string("host")
+                proxy_info['port'] = settings.get_int("port")
+                if settings.get_boolean("use-authentication"):
+                    proxy_info['user'] = settings.get_string("authentication-user")
+                    proxy_info['pass'] = settings.get_string("authentication-password")
+
+            ProxyMonitor.install_proxy_handler(proxy_info)
+
+        except Exception, e:
+            ProxyMonitor.log.error("ProxyMonitor: %s" % e)
+            ProxyMonitor.log.debug(traceback.format_exc(e))
 
     @staticmethod
     def gconf_proxy_changed(client, cnxn_id=None, entry=None, data=None):
         """
         Loads gconf hhtp proxy settings
         """
-        ProxyMonitor.log.debug("ProxyMonitor: loading gconf settings")
-        proxy_info = {}
-        # Taken from http://forum.compiz.org/viewtopic.php?t=9480
-        if client.get_bool("/system/http_proxy/use_http_proxy"):
-            proxy_info['host'] = client.get_string("/system/http_proxy/host")
-            proxy_info['port'] = client.get_int("/system/http_proxy/port")
-            if client.get_bool("/system/http_proxy/use_authentication"):
-                proxy_info['user'] = client.get_string("/system/http_proxy/authentication_user")
-                proxy_info['pass'] = client.get_string("/system/http_proxy/authentication_password")
-
-        ProxyMonitor.install_proxy_handler(proxy_info)
+        try:
+            ProxyMonitor.log.debug("ProxyMonitor: loading gconf settings")
+            proxy_info = {}
+            # Taken from http://forum.compiz.org/viewtopic.php?t=9480
+            if client.get_bool("/system/http_proxy/use_http_proxy"):
+                proxy_info['host'] = client.get_string("/system/http_proxy/host")
+                proxy_info['port'] = client.get_int("/system/http_proxy/port")
+                if client.get_bool("/system/http_proxy/use_authentication"):
+                    proxy_info['user'] = client.get_string("/system/http_proxy/authentication_user")
+                    proxy_info['pass'] = client.get_string("/system/http_proxy/authentication_password")
+
+            ProxyMonitor.install_proxy_handler(proxy_info)
+
+        except Exception, e:
+            ProxyMonitor.log.error("ProxyMonitor: %s" % e)
+            ProxyMonitor.log.debug(traceback.format_exc(e))
 
     @staticmethod
     def install_proxy_handler(proxy_info):
         """
         Installs http proxy support in urllib2
         """
+        # validate data
+        if 'host' in proxy_info:
+            if proxy_info['host'] is not None:
+                proxy_info['host'] = proxy_info['host'].strip()
+            if not proxy_info['host']:
+                ProxyMonitor.log.error("ProxyMonitor: empty proxy host!")
+                proxy_info.pop('host')
+                proxy_info.pop('port')
+            elif not proxy_info['port']:
+                ProxyMonitor.log.error("ProxyMonitor: invalid proxy port!")
+                proxy_info.pop('host')
+                proxy_info.pop('port')
+
+        if 'host' in proxy_info and 'user' in proxy_info:
+            if proxy_info['user'] is not None:
+                proxy_info['user'] = proxy_info['user'].strip()
+            if proxy_info['pass'] is not None:
+                proxy_info['pass'] = proxy_info['pass'].strip()
+            else:
+                proxy_info['pass'] = ""
+            if not proxy_info['user']:
+                ProxyMonitor.log.error("ProxyMonitor: empty proxy user name!")
+                proxy_info.pop('user')
+                proxy_info.pop('pass')
+                proxy_info.pop('host')
+
+        # create proxy handler
         if 'host' not in proxy_info:
             ProxyMonitor.log.debug("ProxyMonitor: using direct connection")
             proxy_support = urllib2.ProxyHandler({})
-            
+
         elif 'user' not in proxy_info:
-            ProxyMonitor.log.debug("ProxyMonitor: using simple proxy")
-            if proxy_info['host'] is None:
-                ProxyMonitor.log.error("ProxyMonitor: invalid proxy host")
-                return
-            if proxy_info['port'] == 0:
-                ProxyMonitor.log.error("ProxyMonitor: invalid proxy port")
-                return
+            ProxyMonitor.log.debug("ProxyMonitor: using simple proxy: " + \
+                "%(host)s:%(port)d" % proxy_info)
             proxy_support = urllib2.ProxyHandler({
                 'http': "http://%(host)s:%(port)d" % proxy_info})
-
         else:
-            ProxyMonitor.log.debug("ProxyMonitor: using proxy with auth")
-            if proxy_info['user'] is None:
-                ProxyMonitor.log.error("ProxyMonitor: invalid proxy user")
-                return
-            if proxy_info['pass'] is None:
-                ProxyMonitor.log.error("ProxyMonitor: invalid proxy pass")
-                return
+            ProxyMonitor.log.debug("ProxyMonitor: using proxy with auth: " + \
+                "%(user)s@%(host)s:%(port)d" % proxy_info)
             proxy_support = urllib2.ProxyHandler({
                 'http': "http://%(user)s:%(pass)s@%(host)s:%(port)d" % proxy_info})
-        
-        #disable this logging as it might log the password
-        #ProxyMonitor.log.debug("Proxy info: %s" % proxy_info)
+
+        # install new urllib2 opener
         opener = urllib2.build_opener(proxy_support, urllib2.HTTPHandler)
         urllib2.install_opener(opener)
 
@@ -197,19 +226,22 @@
     @staticmethod
     def monitor_indicator_datetime(log):
         TimeFormatter.log = log
-        for schema in TimeFormatter.SCHEMAS:
-            try:
+        try:
+            for schema in TimeFormatter.SCHEMAS:
                 if schema in DCONF_SCHEMAS:
                     log.debug("TimeFormatter: loading indicator-datetime settings: %s" % schema)
                     TimeFormatter.settings = Gio.Settings.new(schema)
                     TimeFormatter.calc_format(TimeFormatter.settings)
                     TimeFormatter.settings.connect("changed", TimeFormatter.calc_format)
                     break
-                else:
-                    raise Exception;
-            except:
+            # this else belongs to for loop
+            else:
                 log.debug("TimeFormatter: indicator-datetime settings not found")
 
+        except Exception, e:
+            log.error("TimeFormatter: %s" % e)
+            log.debug(traceback.format_exc(e))
+
     @staticmethod
     def format_time(t):
         """ do the format """