Merge lp:~mandel/ubuntu-sso-client/use-qt4-webclient-backend into lp:ubuntu-sso-client

[Manuel de la Peña]

- Stopped listening to the proxyAuthenticationRequired to avoid the dialog showing more than once (LP: #957170)
- Made changes in the way the webclient is selected to ensure that qt is used when possible (LP: #957169)

- Stopped listening to the proxyAuthenticationRequired to avoid the dialog showing more than once (LP: #957170)
- Made changes in the way the webclient is selected to ensure that qt is used when possible (LP: #957169)

Some tests have been skipped because Qt sucks in some areas which has been filled as bug #957313

[lp:~mandel/ubuntu-sso-client/use-qt4-webclient-backend]

920. By Manuel de la Peña on 2012-03-16

Do not skip tests that do work

[Alejandro J. Cura (alecu)]

Tested IRL, seems to work both with authenticated proxies, with non-authenticated proxies and with no proxies.

review: Approve

[lp:~mandel/ubuntu-sso-client/use-qt4-webclient-backend]

921. By Manuel de la Peña on 2012-03-19

Merged with changes in trunk.

[Roberto Alsina (ralsina)]

Two little problems:

* Typo "cres" => "creds"
* There is no need to check QCoreApplication.instance() and QApplication.instance(), QCoreApplication is enough.

[lp:~mandel/ubuntu-sso-client/use-qt4-webclient-backend]

922. By Manuel de la Peña on 2012-03-19

Fixed according to reviews.

923. By Manuel de la Peña on 2012-03-19

Merged with trunk.

[Roberto Alsina (ralsina)]

+1

review: Approve

=== modified file 'ubuntu_sso/utils/webclient/__init__.py'
--- ubuntu_sso/utils/webclient/__init__.py	2012-03-08 12:35:25 +0000
+++ ubuntu_sso/utils/webclient/__init__.py	2012-03-19 15:27:18 +0000
@@ -27,8 +27,21 @@
 
 def is_qt4reactor_installed():
     """Check if the qt4reactor is installed."""
-    reactor = sys.modules.get("twisted.internet.reactor")
-    return reactor and getattr(reactor, "qApp", None)
+    result = False
+
+    if not 'PyQt4' in sys.modules:
+        return result
+
+    try:
+        from PyQt4.QtCore import QCoreApplication
+
+        # we could be running a process with or without ui, and those are diff
+        # apps.
+        result = QCoreApplication.instance() is not None
+    except ImportError:
+        pass
+
+    return result
 
 
 def webclient_module():
 
=== modified file 'ubuntu_sso/utils/webclient/common.py'
--- ubuntu_sso/utils/webclient/common.py	2012-03-09 12:04:31 +0000
+++ ubuntu_sso/utils/webclient/common.py	2012-03-19 15:27:18 +0000
@@ -187,6 +187,7 @@
             self.proxy_username = creds['username']
             self.proxy_password = creds['password']
             defer.returnValue(True)
+        logger.debug('Proxy creds not in keyring.')
         defer.returnValue(False)
 
     def _launch_proxy_creds_dialog(self, domain, retry):
 
=== modified file 'ubuntu_sso/utils/webclient/qtnetwork.py'
--- ubuntu_sso/utils/webclient/qtnetwork.py	2012-03-16 21:03:30 +0000
+++ ubuntu_sso/utils/webclient/qtnetwork.py	2012-03-19 15:27:18 +0000
@@ -118,6 +118,12 @@
                 schemes.append(scheme)
         return schemes
 
+    def find_proxy_for_scheme(self, scheme):
+        """Return the proxy used for the scheme or default otherwise."""
+        if scheme in self._proxies:
+            return self._proxies[scheme]
+        return self._proxies['default']
+
 
 class WebClient(BaseWebClient):
     """A webclient with a qtnetwork backend."""
@@ -128,8 +134,6 @@
         self.nam = QNetworkAccessManager(QCoreApplication.instance())
         self.nam.finished.connect(self._handle_finished)
         self.nam.authenticationRequired.connect(self._handle_authentication)
-        self.nam.proxyAuthenticationRequired.connect(
-                                      self._handle_bad_proxy_authentication)
         self.nam.sslErrors.connect(self._handle_ssl_errors)
         self.replies = {}
         self.proxy_factory = None
@@ -155,7 +159,8 @@
             reply = self.nam.sendCustomRequest(request, method, post_buffer)
         # deal with auth errors in case we get
         # ProxyAuthenticationRequiredError
-        d.addErrback(self._handle_proxy_authentication, method, reply,
+        scheme = str(request.url().scheme())
+        d.addErrback(self._handle_proxy_authentication, scheme, method, reply,
                      post_buffer)
         self.replies[reply] = d
         return d
@@ -194,31 +199,11 @@
             authenticator.setPassword(self.password)
 
     @defer.inlineCallbacks
-    def _handle_bad_proxy_authentication(self, proxy, authenticator):
-        """Handle when we have a bad proxy."""
-        host = unicode(proxy.hostName()).encode('utf8')
-        port = proxy.port()
-        settings = dict(host=host, port=port)
-        # HACK: work around for reported bugs: QTBUG-16728 and #QTBUG-14850
-        got_creds = yield self.request_proxy_auth_credentials(host, True)
-        if got_creds:
-            logger.debug('Got proxy credentials from user.')
-            settings.update({'username': self.proxy_username,
-                             'password': self.proxy_password})
-        if (settings and 'username' in settings
-               and 'password' in settings):
-            authenticator.setUser(self.proxy_username)
-            authenticator.setPassword(self.proxy_password)
-            schemes = self.proxy_factory.find_proxy_schemes(proxy)
-            for scheme in schemes:
-                self.proxy_factory.update_proxy(scheme, settings)
-
-    @defer.inlineCallbacks
-    def _handle_proxy_authentication(self, failure, method, reply,
+    def _handle_proxy_authentication(self, failure, scheme, method, reply,
             post_buffer=None, retry=False):
         """The reply needs authentication."""
         failure.trap(ProxyUnauthorizedError)
-        current_proxy = self.nam.proxy()
+        current_proxy = self.proxy_factory.find_proxy_for_scheme(scheme)
         host = unicode(current_proxy.hostName()).encode('utf8')
         port = current_proxy.port()
         settings = dict(host=host, port=port)
 
=== modified file 'ubuntu_sso/utils/webclient/tests/test_webclient.py'
--- ubuntu_sso/utils/webclient/tests/test_webclient.py	2012-03-16 21:03:30 +0000
+++ ubuntu_sso/utils/webclient/tests/test_webclient.py	2012-03-19 15:27:18 +0000
@@ -199,9 +199,13 @@
         return root
 
 
-class FakeReactor(object):
-    """A fake reactor object."""
-    qApp = "Sample qapp"
+class FakeQApplication(object):
+    """A fake Qt module."""
+
+    @classmethod
+    def instance(cls):
+        """Return the instance."""
+        return cls
 
 
 class ModuleSelectionTestCase(TestCase):
@@ -212,10 +216,11 @@
         self.patch(sys, "modules", {})
         self.assertFalse(webclient.is_qt4reactor_installed())
 
-    def test_is_qt4reactor_installed_installed(self):
+    def test_is_qt4reactor_installed_installed_core(self):
         """When the qt4reactor is installed, it returns true."""
-        fake_sysmodules = {"twisted.internet.reactor": FakeReactor()}
-        self.patch(sys, "modules", fake_sysmodules)
+        from PyQt4 import QtCore
+
+        self.patch(QtCore, 'QCoreApplication', FakeQApplication)
         self.assertTrue(webclient.is_qt4reactor_installed())
 
     def assert_module_name(self, module, expected_name):
@@ -583,7 +588,15 @@
     if WEBCLIENT_MODULE_NAME.endswith(".txweb"):
         reason = "txweb does not support proxies."
         test_anonymous_proxy_is_used.skip = reason
-        test_authenticated_proxy_is_used.skip = reason
+        test_authenticated_proxy_is_used.kip = reason
+        test_auth_proxy_is_used_creds_requested.skip = reason
+        test_auth_proxy_is_requested_creds_bad_details.skip = reason
+        test_auth_proxy_is_requested_creds_bad_details_user.skip = reason
+        test_auth_proxy_is_requested_creds_bad_details_everywhere.skip = reason
+        test_auth_proxy_is_requested_user_cancels.skip = reason
+
+    if WEBCLIENT_MODULE_NAME.endswith(".qtnetwork"):
+        reason = 'QNetworkAccessManager is buggy.'
         test_auth_proxy_is_used_creds_requested.skip = reason
         test_auth_proxy_is_requested_creds_bad_details.skip = reason
         test_auth_proxy_is_requested_creds_bad_details_user.skip = reason