Merge lp:~mandel/ubuntu-sso-client/ssl-checkbox into lp:ubuntu-sso-client

[Manuel de la Peña]

- Added the required changes in the ssl dialog and in the common webclient code to only store pinned certificates when the user has checked the box in the ui (LP: #955831).

- Added the required changes in the ssl dialog and in the common webclient code to only store pinned certificates when the user has checked the box in the ui (LP: #955831).

[lp:~mandel/ubuntu-sso-client/ssl-checkbox]

953. By Manuel de la Peña on 2012-03-15

Merged pinned-certs into ssl-checkbox.

[Roberto Alsina (ralsina)]

Looks good!

review: Approve

[dobey (dobey)]

This generally looks good to me. However, I would prefer if REMEMBER_SETTINGS were renamed to STORE_SSL_CERT or something more apropos to what it's actually doing.

review: Needs Fixing

[Manuel de la Peña (mandel)]

We will not use this code atm.

review: Disapprove

Unmerged revisions

953. By Manuel de la Peña on 2012-03-15

Merged pinned-certs into ssl-checkbox.

952. By Manuel de la Peña on 2012-03-15

Ensured that the fact that the user checked the box to remember the ssl certificate is taken into account.

951. By Manuel de la Peña on 2012-03-15

Merged libsoup-ssl-dialog into pinned-certs.

950. By Manuel de la Peña on 2012-03-14

Merged libsoup-ssl-dialog into pinned-certs.

949. By Manuel de la Peña on 2012-03-14

Added the required code to store the pinned certificates in order to not promp the ssl dialog constantly.

948. By Manuel de la Peña on 2012-03-13

Pass the cert pem from the child WebClient implementations to the base class.

947. By Manuel de la Peña on 2012-03-12

Reduced diff size.

946. By Manuel de la Peña on 2012-03-12

Reduced diff size.

945. By Manuel de la Peña on 2012-03-12

Merged with trunk.

944. By Manuel de la Peña on 2012-03-12

Added the required code to let the libsoup webclient implementation deal with ssl cert errors.

=== modified file 'ubuntu_sso/__init__.py'
--- ubuntu_sso/__init__.py	2012-03-08 12:35:25 +0000
+++ ubuntu_sso/__init__.py	2012-03-15 11:43:20 +0000
@@ -30,6 +30,7 @@
 USER_SUCCESS = 0
 USER_CANCELLATION = 10
 EXCEPTION_RAISED = 11
+REMEMBER_SETTINGS = 12
 
 # available UIs
 UI_EXECUTABLE_GTK = 'ubuntu-sso-login-gtk'

=== modified file 'ubuntu_sso/qt/ssl_dialog.py'
--- ubuntu_sso/qt/ssl_dialog.py	2012-03-15 11:43:20 +0000
+++ ubuntu_sso/qt/ssl_dialog.py	2012-03-15 11:43:20 +0000
@@ -18,6 +18,7 @@
 import argparse
 import sys
 
+from PyQt4.QtCore import Qt
 from PyQt4.QtGui import (
     QApplication,
     QDialog,
@@ -26,7 +27,7 @@
     QTextEdit,
 )
 
-from ubuntu_sso import USER_CANCELLATION, USER_SUCCESS
+from ubuntu_sso import REMEMBER_SETTINGS, USER_CANCELLATION, USER_SUCCESS
 from ubuntu_sso.logger import setup_gui_logging
 # Unused import resources_rc, pylint: disable=W0611
 from ubuntu_sso.qt.ui import resources_rc
@@ -108,7 +109,10 @@
     def _on_connect_clicked(self):
         """Connect was clicked."""
         logger.debug('User accepted the ssl certificate.')
-        self.done(USER_SUCCESS)
+        result = USER_SUCCESS
+        if self.ui.remember_checkbox.checkState() == Qt.Checked:
+            result = REMEMBER_SETTINGS
+        self.done(result)
 
     def _set_buttons(self):
         """Set the labels of the buttons."""

=== modified file 'ubuntu_sso/qt/tests/test_ssl_dialog.py'
--- ubuntu_sso/qt/tests/test_ssl_dialog.py	2012-03-12 19:47:07 +0000
+++ ubuntu_sso/qt/tests/test_ssl_dialog.py	2012-03-15 11:43:20 +0000
@@ -16,11 +16,12 @@
 
 """Test the ssl dialog."""
 
+from PyQt4.QtCore import Qt
 from PyQt4.QtGui import QStyle
 from twisted.internet import defer
 from twisted.trial.unittest import TestCase
 
-from ubuntu_sso import USER_CANCELLATION, USER_SUCCESS
+from ubuntu_sso import REMEMBER_SETTINGS, USER_CANCELLATION, USER_SUCCESS
 from ubuntu_sso.qt import ssl_dialog
 from ubuntu_sso.utils.ui import (
     CANCEL_BUTTON,
@@ -103,6 +104,14 @@
         """Test the connect action."""
         self.dialog._on_connect_clicked()
         self.assertEqual(USER_SUCCESS, self.return_code)
+        self.assertEqual(Qt.Unchecked,
+                         self.dialog.ui.remember_checkbox.checkState())
+
+    def test_on_connect_clicked_remember(self):
+        """Test the connect action."""
+        self.dialog.ui.remember_checkbox.setCheckState(Qt.Checked)
+        self.dialog._on_connect_clicked()
+        self.assertEqual(REMEMBER_SETTINGS, self.return_code)
 
     def test_set_buttons(self):
         """Test that the buttons are correctly set up."""

=== modified file 'ubuntu_sso/utils/webclient/common.py'
--- ubuntu_sso/utils/webclient/common.py	2012-03-15 11:43:20 +0000
+++ ubuntu_sso/utils/webclient/common.py	2012-03-15 11:43:20 +0000
@@ -25,7 +25,7 @@
 from twisted.internet import defer
 from urlparse import urlparse
 
-from ubuntu_sso import USER_SUCCESS, UI_PROXY_CREDS_DIALOG
+from ubuntu_sso import REMEMBER_SETTINGS, USER_SUCCESS, UI_PROXY_CREDS_DIALOG
 from ubuntu_sso.logger import setup_logging
 from ubuntu_sso.utils.runner import spawn_program
 from ubuntu_sso.utils.ui import SSL_DETAILS_TEMPLATE
@@ -275,6 +275,8 @@
         return_code = yield self._launch_ssl_dialog(
                                                subject_details['common_name'],
                                                details)
-        if return_code == USER_SUCCESS:
+        if return_code == REMEMBER_SETTINGS:
             self.ssl_vault.store_certificate(cert)
-        defer.returnValue(return_code == USER_SUCCESS)
+        result = (return_code == USER_SUCCESS
+                  or return_code == REMEMBER_SETTINGS)
+        defer.returnValue(result)

=== modified file 'ubuntu_sso/utils/webclient/tests/test_webclient.py'
--- ubuntu_sso/utils/webclient/tests/test_webclient.py	2012-03-15 11:43:20 +0000
+++ ubuntu_sso/utils/webclient/tests/test_webclient.py	2012-03-15 11:43:20 +0000
@@ -33,6 +33,7 @@
 from ubuntu_sso import (
     keyring,
     EXCEPTION_RAISED,
+    REMEMBER_SETTINGS,
     USER_SUCCESS,
     USER_CANCELLATION,
 )
@@ -1012,7 +1013,7 @@
         details = SSL_DETAILS_TEMPLATE % self.cert_details
         self.assertIn(('_launch_ssl_dialog', gethostname(), details),
                       self.called)
-        self.assertTrue(self.wc.ssl_vault.is_certificate_pinned(
+        self.assertFalse(self.wc.ssl_vault.is_certificate_pinned(
             self.ssl_settings['cert_info']))
 
     def test_ssl_fail_dialog_user_accepts(self):
@@ -1033,6 +1034,28 @@
             self.ssl_settings['cert_info']))
 
     @defer.inlineCallbacks
+    def _assert_ssl_fail_user_remembers(self, proxy_settings=None):
+        """Assert the dialog is shown in an ssl fail and remember the cert."""
+        self.return_code = REMEMBER_SETTINGS
+        if proxy_settings:
+            self.wc.force_use_proxy(proxy_settings)
+        yield self.wc.request(self.base_ssl_iri + SIMPLERESOURCE)
+        details = SSL_DETAILS_TEMPLATE % self.cert_details
+        self.assertIn(('_launch_ssl_dialog', gethostname(), details),
+                      self.called)
+        self.assertTrue(self.wc.ssl_vault.is_certificate_pinned(
+            self.ssl_settings['cert_info']))
+
+    def test_ssl_fail_dialog_user_remembers(self):
+        """Test showing the dialog, accepting and remember the settings."""
+        return self._assert_ssl_fail_user_remembers()
+
+    def test_ssl_fail_dialog_user_remembers_via_proxy(self):
+        """Test showing the dialog, accepting and remember the settings."""
+        return self._assert_ssl_fail_user_remembers(
+                                            self.get_nonauth_proxy_settings())
+
+    @defer.inlineCallbacks
     def test_ssl_fail_pinned_cert(self):
         """Test when the cert is pinned."""
         self.patch(self.wc.ssl_vault, 'is_certificate_pinned', lambda _: True)