Merge lp:~dobey/ubuntu-sso-client/ssl-force-load into lp:ubuntu-sso-client

[dobey]

Force loading of the system certificates in Qt, to avoid breaking certificate
checks on non-Ubuntu URLs.

[Mike McCracken (mikemc)]

Works for me on ubuntu saucy and still works for me on OS X.

review: Approve

[Alejandro J. Cura (alecu)]

Tested irl on my saucy box, and the captcha issue is fixed.

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~dobey/ubuntu-sso-client/ssl-force-load into lp:ubuntu-sso-client failed. Below is the output from the failed tests.

*** Running QT test suite for ubuntu_sso ***
running build
Compiled data/qt/setup_account.ui into ubuntu_sso/qt/ui/setup_account_ui.py
Compiled data/qt/forgotten_password.ui into ubuntu_sso/qt/ui/forgotten_password_ui.py
Compiled data/qt/success_message.ui into ubuntu_sso/qt/ui/success_message_ui.py
Compiled data/qt/error_message.ui into ubuntu_sso/qt/ui/error_message_ui.py
Compiled data/qt/current_user_sign_in.ui into ubuntu_sso/qt/ui/current_user_sign_in_ui.py
Compiled data/qt/proxy_credentials_dialog.ui into ubuntu_sso/qt/ui/proxy_credentials_dialog_ui.py
Compiled data/qt/network_detection.ui into ubuntu_sso/qt/ui/network_detection_ui.py
Compiled data/qt/ssl_dialog.ui into ubuntu_sso/qt/ui/ssl_dialog_ui.py
compiled data/qt/resources.qrc into ubuntu_sso/qt/ui/resources_rc.py
Compiled data/qt/loadingoverlay.ui into ubuntu_sso/qt/ui/loadingoverlay_ui.py
Compiled data/qt/email_verification.ui into ubuntu_sso/qt/ui/email_verification_ui.py
Compiled data/qt/reset_password.ui into ubuntu_sso/qt/ui/reset_password_ui.py
running build_py
creating build
creating build/lib.linux-x86_64-2.7
creating build/lib.linux-x86_64-2.7/ubuntu_sso
copying ubuntu_sso/constants.py -> build/lib.linux-x86_64-2.7/ubuntu_sso
copying ubuntu_sso/logger.py -> build/lib.linux-x86_64-2.7/ubuntu_sso
copying ubuntu_sso/__init__.py -> build/lib.linux-x86_64-2.7/ubuntu_sso
copying ubuntu_sso/account.py -> build/lib.linux-x86_64-2.7/ubuntu_sso
copying ubuntu_sso/credentials.py -> build/lib.linux-x86_64-2.7/ubuntu_sso
creating build/lib.linux-x86_64-2.7/ubuntu_sso/tests
copying ubuntu_sso/tests/linux.py -> build/lib.linux-x86_64-2.7/ubuntu_sso/tests
copying ubuntu_sso/tests/test_credentials.py -> build/lib.linux-x86_64-2.7/ubuntu_sso/tests
copying ubuntu_sso/tests/test_account.py -> build/lib.linux-x86_64-2.7/ubuntu_sso/tests
copying ubuntu_sso/tests/__init__.py -> build/lib.linux-x86_64-2.7/ubuntu_sso/tests
creating build/lib.linux-x86_64-2.7/ubuntu_sso/keyring
copying ubuntu_sso/keyring/linux.py -> build/lib.linux-x86_64-2.7/ubuntu_sso/keyring
copying ubuntu_sso/keyring/pykeyring.py -> build/lib.linux-x86_64-2.7/ubuntu_sso/keyring
copying ubuntu_sso/keyring/__init__.py -> build/lib.linux-x86_64-2.7/ubuntu_sso/keyring
creating build/lib.linux-x86_64-2.7/ubuntu_sso/keyring/tests
copying ubuntu_sso/keyring/tests/test_linux.py -> build/lib.linux-x86_64-2.7/ubuntu_sso/keyring/tests
copying ubuntu_sso/keyring/tests/test_pykeyring.py -> build/lib.linux-x86_64-2.7/ubuntu_sso/keyring/tests
copying ubuntu_sso/keyring/tests/test_common.py -> build/lib.linux-x86_64-2.7/ubuntu_sso/keyring/tests
copying ubuntu_sso/keyring/tests/__init__.py -> build/lib.linux-x86_64-2.7/ubuntu_sso/keyring/tests
creating build/lib.linux-x86_64-2.7/ubuntu_sso/main
copying ubuntu_sso/main/linux.py -> build/lib.linux-x86_64-2.7/ubuntu_sso/main
copying ubuntu_sso/main/windows.py -> build/lib.linux-x86_64-2.7/ubuntu_sso/main
copying ubuntu_sso/main/qt.py -> build/lib.linux-x86_64-2.7/ubuntu_sso/main
copying ubuntu_sso/main/glib.py -> build/lib.linux-x86_64-2.7/ubuntu_sso/main...

=== modified file 'ubuntu_sso/utils/webclient/qtnetwork.py'
--- ubuntu_sso/utils/webclient/qtnetwork.py	2013-05-08 18:38:36 +0000
+++ ubuntu_sso/utils/webclient/qtnetwork.py	2013-10-23 21:42:57 +0000
@@ -50,6 +50,7 @@
     QNetworkRequest,
     QSslCertificate,
     QSslConfiguration,
+    QSslSocket,
 )
 from twisted.internet import defer
 
@@ -106,6 +107,8 @@
         self.proxy_retry = False
         self.setup_proxy()
 
+        # Force Qt to load the system certificates
+        QSslSocket.setDefaultCaCertificates(QSslSocket.systemCaCertificates())
         # Apply our local certificates as the SSL configuration to be used
         # for all QNetworkRequest calls.
         self.ssl_config = QSslConfiguration.defaultConfiguration()
 
=== modified file 'ubuntu_sso/utils/webclient/tests/test_qtnetwork.py'
--- ubuntu_sso/utils/webclient/tests/test_qtnetwork.py	2013-05-08 18:38:36 +0000
+++ ubuntu_sso/utils/webclient/tests/test_qtnetwork.py	2013-10-23 21:42:57 +0000
@@ -28,7 +28,10 @@
 # files in the program, then also delete it here.
 """Specific tests for the qt implementation."""
 
-from PyQt4.QtNetwork import QSslError
+from PyQt4.QtNetwork import (
+    QSslConfiguration,
+    QSslError,
+)
 from twisted.internet import defer
 from ubuntuone.devtools.testcases import TestCase
 
@@ -139,3 +142,10 @@
         errors = [QSslError()]
         client._handle_ssl_errors(reply, errors)
         self.assertTrue(type(result[0]), unicode)
+
+    def test_nonempty_cert_list(self):
+        """Test the Qt CA list has more than our included certs."""
+        qtnetwork.WebClient()
+        ssl_config = QSslConfiguration.defaultConfiguration()
+        ca_certs = ssl_config.caCertificates()
+        self.assertTrue(len(ca_certs) > 3)