Merge lp:~dobey/ubuntu-sso-client/update-3-0 into lp:ubuntu-sso-client/stable-3-0

[dobey]

[Rodney Dawes]

    Ensure we are using strict ssl with the system ca-certificates.crt file
    Trap DBusException when getting the SessionBus, and add a test case for it

[Roberto Alsina]

    Remove back buttons in signin/signup pages (Fixes LP:1009107).

[Brian Curtin (brian.curtin)]

review: Approve

[Roberto Alsina (ralsina)]

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~dobey/ubuntu-sso-client/update-3-0 into lp:ubuntu-sso-client/stable-3-0 failed. Below is the output from the failed tests.

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~dobey/ubuntu-sso-client/update-3-0 into lp:ubuntu-sso-client/stable-3-0 failed. Below is the output from the failed tests.

*** Running GTK test suite for ubuntu_sso ***
ubuntu_sso.utils.tests.test_parse_args
  ParseArgsTestCase
    test_parse_args_app_name_is_required ... [OK]
    test_parse_args_defaults ... [OK]
    test_parse_args_help_text ... [OK]
    test_parse_args_login_only ... [OK]
    test_parse_args_ping_url ... [OK]
    test_parse_args_policy_url ... [OK]
    test_parse_args_tc_url ... [OK]
    test_parse_args_window_id ... [OK]
twisted.trial.unittest
  TestCase
    runTest ... [OK]
ubuntu_sso.utils.tests.test_tcpactivation
  ActivationClientTestCase
    test_do_get_active_port_not_running ... [OK]
    test_do_get_active_port_running ... [OK]
    test_get_active_port_waits_classwide ... [OK]
    test_initialization ... [OK]
    test_spawn_server ... [OK]
    test_wait_server_active ... [OK]
    test_wait_server_timeouts ... [OK]
  ActivationConfigTestCase
    test_initialization ... [OK]
  ActivationDetectorTestCase
    test_initialization ... [OK]
    test_is_already_running ... [OK]
    test_is_not_already_running ... [OK]
  ActivationInstanceTestCase
    test_get_port ... [OK]
    test_get_port_fails_if_service_already_started ... [OK]
    test_initialization ... [OK]
  AsyncSleepTestCase
    test_async_sleep_fired_at_the_right_time ... [OK]
    test_async_sleep_not_fired_immediately ... [OK]
    test_async_sleep_not_fired_in_a_bit ... [OK]
  NullProtocolTestCase
    test_drops_connection ... [OK]
  PortDetectFactoryTestCase
    test_connection_failed ... [OK]
    test_connection_failed_then_lost ... [OK]
    test_connection_lost ... [OK]
    test_connection_works_then_lost ... [OK]
    test_is_listening ... [OK]
twisted.trial.unittest
  TestCase
    runTest ... [OK]
ubuntu_sso.u...

=== modified file 'ubuntu_sso/gtk/gui.py'
--- ubuntu_sso/gtk/gui.py	2012-04-11 16:49:02 +0000
+++ ubuntu_sso/gtk/gui.py	2012-06-13 21:37:18 +0000
@@ -109,6 +109,12 @@
 LARGE_MARKUP = u'<span size="x-large">%s</span>'
 
 
+# SSL properties and certs location
+STRICT_SSL_PROP = 'ssl-strict'
+CERTS_FILE_PROP = 'ssl-ca-file'
+CA_CERT_FILE = '/etc/ssl/certs/ca-certificates.crt'
+
+
 def log_call(f):
     """Decorator to log call funtions."""
 
@@ -953,11 +959,23 @@
 
         self._set_current_page(self.processing_vbox)
 
+    def _webkit_init_ssl(self):
+        """Set the WebKit ssl strictness."""
+        # delay the import of webkit to be able to build without it
+        from gi.repository import WebKit  # pylint: disable=E0611
+
+        # Set the Soup session to be strict and use system CA certs
+        session = WebKit.get_default_session()
+        session.set_property(STRICT_SSL_PROP, True)
+        session.set_property(CERTS_FILE_PROP, CA_CERT_FILE)
+
     def _add_webkit_browser(self):
         """Add the webkit browser for the t&c."""
         # delay the import of webkit to be able to build without it
         from gi.repository import WebKit  # pylint: disable=E0611
 
+        self._webkit_init_ssl()
+
         browser = WebKit.WebView()
 
         browser.connect('notify::load-status',
 
=== modified file 'ubuntu_sso/gtk/tests/test_gui.py'
--- ubuntu_sso/gtk/tests/test_gui.py	2012-04-11 16:49:02 +0000
+++ ubuntu_sso/gtk/tests/test_gui.py	2012-06-13 21:37:18 +0000
@@ -911,6 +911,7 @@
     def setUp(self):
         yield super(TermsAndConditionsBrowserTestCase, self).setUp()
         self.patch(WebKit, 'WebView', FakedEmbeddedBrowser)
+        self.patch(self.ui, '_webkit_init_ssl', self._set_called)
 
         self.ui.tc_button.clicked()
         self.addCleanup(self.ui.tc_browser_vbox.hide)
@@ -919,6 +920,12 @@
         assert len(children) == 1
         self.browser = children[0]
 
+    def test_ssl_validation(self):
+        """The browser is set to validate SSL."""
+        self.assertEqual(self._called, ((), {}),
+                         '_webkit_init_ssl should be called when creating a '
+                         'webkit browser.')
+
     def test_tc_browser_is_created_when_tc_page_is_shown(self):
         """The browser is created when the TC button is clicked."""
         self.ui.on_tc_browser_notify_load_status(self.browser)
 
=== modified file 'ubuntu_sso/main/linux.py'
--- ubuntu_sso/main/linux.py	2012-04-10 17:57:42 +0000
+++ ubuntu_sso/main/linux.py	2012-06-13 21:37:18 +0000
@@ -342,10 +342,15 @@
 
     def __init__(self, root):
         self.root = root
-        self.bus = dbus.SessionBus()
         self.sso_login = None
         self.cred_manager = None
 
+        try:
+            self.bus = dbus.SessionBus()
+        except dbus.service.DBusException as e:
+            logger.exception(e)
+            shutdown_func()
+
     def start(self):
         """Start listening, nothing async to be done in this platform."""
         # Register DBus service for making sure we run only one instance
 
=== added file 'ubuntu_sso/main/tests/test_linux.py'
--- ubuntu_sso/main/tests/test_linux.py	1970-01-01 00:00:00 +0000
+++ ubuntu_sso/main/tests/test_linux.py	2012-06-13 21:37:18 +0000
@@ -0,0 +1,59 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright 2012 Canonical Ltd.
+#
+# 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
+# PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# In addition, as a special exception, the copyright holders give
+# permission to link the code of portions of this program with the
+# OpenSSL library under certain conditions as described in each
+# individual source file, and distribute linked combinations
+# including the two.
+# You must obey the GNU General Public License in all respects
+# for all of the code used other than OpenSSL.  If you modify
+# file(s) with this exception, you may extend this exception to your
+# version of the file(s), but you are not obligated to do so.  If you
+# do not wish to do so, delete this exception statement from your
+# version.  If you delete this exception statement from all source
+# files in the program, then also delete it here.
+"""Tests for the main SSO Linux client code."""
+
+# pylint: disable=C0103
+do_tests = False
+try:
+    import dbus
+    import dbus.service
+    from ubuntu_sso.main import linux as main
+    do_tests = True
+except ImportError:
+    do_tests = False
+# pylint enable=C0103
+
+from ubuntuone.devtools.testcases import BaseTestCase, skipIf
+
+
+@skipIf(do_tests != True, 'Tests only work with DBus and linux imports.')
+class LinuxProxyTestCase(BaseTestCase):
+    """Test some Linux specific cases."""
+
+    def test_dbus_missing_exists_clean(self):
+        """Test that dbus-daemon not being available gives us a clean exit."""
+        def patched(*args, **kwargs):
+            """Method to patch in for testing."""
+            raise dbus.service.DBusException(
+                'org.freedesktop.DBus.Error.NoServer')
+
+        self.patch(dbus, "SessionBus", patched)
+        self.patch(main, "shutdown_func", patched)
+        self.assertRaises(dbus.service.DBusException,
+                          main.UbuntuSSOProxy, None)
 
=== modified file 'ubuntu_sso/qt/current_user_sign_in_page.py'
--- ubuntu_sso/qt/current_user_sign_in_page.py	2012-04-09 17:38:24 +0000
+++ ubuntu_sso/qt/current_user_sign_in_page.py	2012-06-13 21:37:18 +0000
@@ -97,9 +97,7 @@
         self.setButtonText(QtGui.QWizard.CancelButton, CANCEL_BUTTON)
         # Layout without custom button 1,
         # without finish button
-        self.wizard().setButtonLayout([
-            QtGui.QWizard.BackButton,
-            QtGui.QWizard.Stretch])
+        self.wizard().setButtonLayout([])
 
         # Set sign_in_button as default when the page is shown.
         self.ui.sign_in_button.setDefault(True)
 
=== modified file 'ubuntu_sso/qt/setup_account_page.py'
--- ubuntu_sso/qt/setup_account_page.py	2012-04-09 17:38:24 +0000
+++ ubuntu_sso/qt/setup_account_page.py	2012-06-13 21:37:18 +0000
@@ -154,7 +154,6 @@
 
         # Button setup
         self.wizard().setButtonLayout([
-            QtGui.QWizard.BackButton,
             QtGui.QWizard.Stretch,
             QtGui.QWizard.CustomButton3])
 
 
=== modified file 'ubuntu_sso/qt/tests/test_current_user_sign_in_page.py'
--- ubuntu_sso/qt/tests/test_current_user_sign_in_page.py	2012-04-09 17:38:24 +0000
+++ ubuntu_sso/qt/tests/test_current_user_sign_in_page.py	2012-06-13 21:37:18 +0000
@@ -59,7 +59,7 @@
         self.assertEqual(wizard.buttons_text[QtGui.QWizard.CancelButton],
             "Cancel")
         self.assertIn(('setButtonLayout',
-            (([QtGui.QWizard.BackButton, QtGui.QWizard.Stretch],), {})),
+            (([],), {})),
             wizard.called)
         self.assertTrue(button.properties['default'])
         self.assertFalse(button.isEnabled())
 
=== modified file 'ubuntu_sso/qt/tests/test_setup_account.py'
--- ubuntu_sso/qt/tests/test_setup_account.py	2012-04-09 17:38:24 +0000
+++ ubuntu_sso/qt/tests/test_setup_account.py	2012-06-13 21:37:18 +0000
@@ -207,8 +207,7 @@
         self.ui.initializePage()
 
         # set up account button
-        expected = [QtGui.QWizard.BackButton, QtGui.QWizard.Stretch,
-                    QtGui.QWizard.CustomButton3]
+        expected = [QtGui.QWizard.Stretch, QtGui.QWizard.CustomButton3]
         self.assertIn(('setButtonLayout', ((expected,), {})),
                        self.ui.wizard().called)
         self.assertEqual(gui.SET_UP_ACCOUNT_BUTTON,