Merge lp:~urbanape/ubuntu-sso-client/initial-darwin-port into lp:ubuntu-sso-client

[Zachery Bir]

Embarrassingly small branch to try and get an initial port of the Ubuntu SSO client to Mac OS X.

Right now, we just assume that networking is there.

We also have a hacky way of getting to the candidate callback executables that SSO client will redirect to. On OS X, this might be better served with LaunchServices and custom URI schemes instead of guessing and computing paths (which might not even work in a py2app environment).

There are a few places where a refactoring has taken place to account for darwin and win32 using the same underlying mechanisms (ubuntu_sso/main/perspective_broker.py), and at least one place where it has not (ubuntu_sso/qt/main/windows.py is used by both darwin and windows).

However, in a buildout environment, we are able to at least get a window up and presented (though it just spins and doesn't give focus):

  http://ubuntuone.com/26XHVaWGMZfL8X1HTpN2Yk

From within the 'parts/ubuntu-sso-client' directory, I run the tests like so:

zbir@Howler ~/dev/ubuntuone-windows-installer/scripts/devsetup/parts/ubuntu-sso-client
$ PYTHONPATH=.:/Users/zbir/dev/ubuntuone-windows-installer/scripts/devsetup/parts/ubuntu-sso-client:/Users/zbir/dev/ubuntuone-windows-installer/scripts/devsetup/eggs/ubuntuone_dev_tools-2.99.2-py2.7.egg:/Users/zbir/dev/ubuntuone-windows-installer/scripts/devsetup/lib/python2.7/site-packages /Users/zbir/dev/ubuntuone-windows-installer/scripts/devsetup/bin/python /Users/zbir/dev/ubuntuone-windows-installer/scripts/devsetup/bin/u1trial --reactor=qt4 -i "test_gui.py, test_linux.py, test_qt.py, test_windows.py, test_glib.py, test_txsecrets.py" -p "ubuntu_sso/gtk" --gui ubuntu_sso

[Zachery Bir (urbanape)]

Should mention, that 'parts/ubuntu-sso-client' directory is the result of making a buildout environment:

  https://docs.google.com/a/canonical.com/document/d/1f7xaDT-hblCKIXrKXZjpKtFRsBRnionDix5NojwdgmE

[Zachery Bir (urbanape)]

> Should mention, that 'parts/ubuntu-sso-client' directory is the result of
> making a buildout environment:
>

https://docs.google.com/a/canonical.com/document/d/1f7xaDT-hblCKIXrKXZjpKtFRsBRnionDix5NojwdgmE/edit

[lp:~urbanape/ubuntu-sso-client/initial-darwin-port]

942. By dobey on 2012-04-09

Add the needed OpenSSL license exception

943. By Natalia Bidart on 2012-04-11

- When validating the registration screen (in the GTK+ UI), do not force
  accepting the T&C if the tc_url is not defined (LP: #960657).
- Added more logging entries to the registration screen (GTK+ UI) validation
  process.

944. By Manuel de la Peña on 2012-04-17

- Removed duplicated code from the different webclient implementations (LP: #904842).

[Manuel de la Peña (mandel)]

Great start for a succeful port, here there are a few comments:

1. There are several new headers added, we had to add an exception due to openssl to the license, can you update them (you can find the new header in trunk).
2. Lets remove alejandro from the headers :)
3. I think we need to refactor the following import so that it does not import from windows:

09 +if sys.platform in ('win32', 'darwin'):
10 from ubuntu_sso.keyring.windows import Keyring
11 else:
12 from ubuntu_sso.keyring.linux import Keyring

I good idea would be to rename the windows.py to something more generic, maybe pykeyring?

4. Same as the above with:

1150 +if sys.platform in ('win32', 'darwin'):
1151 from ubuntu_sso.qt.main import windows
1152 source = windows

5. There is some code duplication here:

1022 +# Internal NetworkManager State constants
1023 +NM_STATE_UNKNOWN = 0
1024 +NM_STATE_UNKNOWN_LIST = [NM_STATE_UNKNOWN]
1025 +NM_STATE_ASLEEP_OLD = 1
1026 +NM_STATE_ASLEEP = 10
1027 +NM_STATE_ASLEEP_LIST = [NM_STATE_ASLEEP_OLD,
1028 + NM_STATE_ASLEEP]
1029 +NM_STATE_CONNECTING_OLD = 2
1030 +NM_STATE_CONNECTING = 40
1031 +NM_STATE_CONNECTING_LIST = [NM_STATE_CONNECTING_OLD,
1032 + NM_STATE_CONNECTING]
1033 +NM_STATE_CONNECTED_OLD = 3
1034 +NM_STATE_CONNECTED_LOCAL = 50
1035 +NM_STATE_CONNECTED_SITE = 60
1036 +NM_STATE_CONNECTED_GLOBAL = 70
1037 +# Specifically don't include local and site, as they won't let us get to server
1038 +NM_STATE_CONNECTED_LIST = [NM_STATE_CONNECTED_OLD,
1039 + NM_STATE_CONNECTED_GLOBAL]
1040 +NM_STATE_DISCONNECTED_OLD = 4
1041 +NM_STATE_DISCONNECTED = 20
1042 +# For us, local and site connections are the same as diconnected
1043 +NM_STATE_DISCONNECTED_LIST = [NM_STATE_DISCONNECTED_OLD,
1044 + NM_STATE_DISCONNECTED,
1045 + NM_STATE_CONNECTED_LOCAL,
1046 + NM_STATE_CONNECTED_SITE]

I think we can add that in a single module to be shared. I'll be adding some bugs following this brach so that we can track our progress.

review: Needs Fixing

[lp:~urbanape/ubuntu-sso-client/initial-darwin-port]

945. By Manuel de la Peña on 2012-04-18

- Fixed all those broken tests on windows related to the dirty reactor left by twisted.pb (LP: #960436).

946. By Manuel de la Peña on 2012-04-18

- Added the use of the new added webserver that cleans resources correctly (LP: #960436).

947. By Manuel de la Peña on 2012-04-18

- Fixed tcp activation tests to clean resources correctly (LP: #960436).

948. By Zachery Bir on 2012-04-19

Merged mandel's branch

949. By Zachery Bir on 2012-04-19

Shared constants for network states

950. By Zachery Bir on 2012-04-19

Renamed as a shared resource

951. By Zachery Bir on 2012-04-19

Use the shared resource, rather than just windows.py

952. By Zachery Bir on 2012-04-19

Use the shared constants module, and remove some dbus-isms from darwin.py

953. By Zachery Bir on 2012-04-19

renamed tests to reflect shared resources

954. By Zachery Bir on 2012-04-19

Trimmed headers

955. By Zachery Bir on 2012-04-19

Use the new shared networkstates constants, and trim headers.

[Manuel de la Peña (mandel)]

When running the tests on linux I get the following lint issues which will stop tarmac from landing the branch:

ubuntu_sso/main/darwin.py:
    79: [C0301] Line too long (82/79)
    82: [C0301] Line too long (94/79)
    83: [C0301] Line too long (80/79)
    58: [C0111, get_sso_pb_port] Missing docstring
    36: [W0611] Unused import timeout_func
    36: [W0611] Unused import shutdown_func
    36: [W0611] Unused import start_setup
    36: [W0611] Unused import finish_setup
    36: [W0611] Unused import main

ubuntu_sso/main/perspective_broker.py:
    63: [C0103, SSOLoginProxy.CaptchaGenerated] Invalid name "CaptchaGenerated" (should match ([a-z_][a-z0-9_]{2,79}$|setUp|tearDown))
    67: [C0103, SSOLoginProxy.CaptchaGenerationError] Invalid name "CaptchaGenerationError" (should match ([a-z_][a-z0-9_]{2,79}$|setUp|tearDown))
    76: [C0103, SSOLoginProxy.UserRegistered] Invalid name "UserRegistered" (should match ([a-z_][a-z0-9_]{2,79}$|setUp|tearDown))
    80: [C0103, SSOLoginProxy.UserRegistrationError] Invalid name "UserRegistrationError" (should match ([a-z_][a-z0-9_]{2,79}$|setUp|tearDown))
    91: [C0103, SSOLoginProxy.LoggedIn] Invalid name "LoggedIn" (should match ([a-z_][a-z0-9_]{2,79}$|setUp|tearDown))
    95: [C0103, SSOLoginProxy.LoginError] Invalid name "LoginError" (should match ([a-z_][a-z0-9_]{2,79}$|setUp|tearDown))
    99: [C0103, SSOLoginProxy.UserNotValidated] Invalid name "UserNotValidated" (should match ([a-z_][a-z0-9_]{2,79}$|setUp|tearDown))
    110: [C0103, SSOLoginProxy.EmailValidated] Invalid name "EmailValidated" (should match ([a-z_][a-z0-9_]{2,79}$|setUp|tearDown))
    114: [C0103, SSOLoginProxy.EmailValidationError] Invalid name "EmailValidationError" (should match ([a-z_][a-z0-9_]{2,79}$|setUp|tearDown))
    127: [C0103, SSOLoginProxy.PasswordResetTokenSent] Invalid name "PasswordResetTokenSent" (should match ([a-z_][a-z0-9_]{2,79}$|setUp|tearDown))
    131: [C0103, SSOLoginProxy.PasswordResetError] Invalid name "PasswordResetError" (should match ([a-z_][a-z0-9_]{2,79}$|setUp|tearDown))
    140: [C0103, SSOLoginProxy.PasswordChanged] Invalid name "PasswordChanged" (should match ([a-z_][a-z0-9_]{2,79}$|setUp|tearDown))
    144: [C0103, SSOLoginProxy.PasswordChangeError] Invalid name "PasswordChangeError" (should match ([a-z_][a-z0-9_]{2,79}$|setUp|tearDown))
    193: [C0103, CredentialsManagementProxy.AuthorizationDenied] Invalid name "AuthorizationDenied" (should match ([a-z_][a-z0-9_]{2,79}$|setUp|tearDown))
    197: [C0103, CredentialsManagementProxy.CredentialsFound] Invalid name "CredentialsFound" (should match ([a-z_][a-z0-9_]{2,79}$|setUp|tearDown))
    201: [C0103, CredentialsManagementProxy.CredentialsNotFound] Invalid name "CredentialsNotFound" (should match ([a-z_][a-z0-9_]{2,79}$|setUp|tearDown))
    205: [C0103, CredentialsManagementProxy.CredentialsCleared] Invalid name "CredentialsCleared" (should match ([a-z_][a-z0-9_]{2,79}$|setUp|tearDown))
    209: [C0103, CredentialsManagementProxy.CredentialsStored] Invalid name "CredentialsStored" (should match ([a-z_][a-z0-9_]{2,79}$|setUp|tearDown))
    213: [C0103, CredentialsManagementProxy.CredentialsError] Invalid name "Creden...

review: Needs Fixing

[lp:~urbanape/ubuntu-sso-client/initial-darwin-port]

956. By Zachery Bir on 2012-04-20

Clean up long lines and unused imports

957. By Zachery Bir on 2012-04-20

Move the pylint exclusion

958. By Zachery Bir on 2012-04-20

Clean up unused imports, move a pylint exclusion to the shared code,
and provide docstrings (and abstract out the get_user_id function)

959. By Zachery Bir on 2012-04-20

Flow long lines and import SSO_SERVICE_NAME from the right module

[Manuel de la Peña (mandel)]

I get a segfault when running the tests on linux:

ubuntuone.devtools.testcases.dbus
  DBusTestCase
    runTest ... [OK]
ubuntu_sso.utils.tests.test_txsecrets
  ItemTestCase
    test_delete ... [OK]
    test_delete_prompt ... [OK]
    test_delete_prompt_dismissed ... [OK]
    test_delete_throws_dbus_error ... [OK]
    test_get_value ... [OK]
    test_get_value_throws_dbus_error ... [OK]
  SecretServiceTestCase
    test_create_collection ... [OK]
    test_create_collection_prompt ... [OK]
    test_create_collection_prompt_dismissed ... [OK]
    test_create_collection_throws_dbus_error ... [OK]
    test_get_collections ... [OK]
    test_get_default_collection_created_if_no_default ... [OK]
    test_get_default_collection_created_if_nonexistent ... [OK]
    test_get_default_collection_honours_default_path ... [OK]
    test_get_default_collection_honours_readalias ... [OK]
    test_get_default_collection_is_unlocked_default_path ... [OK]
    test_get_default_collection_is_unlocked_readalias ... [OK]
    test_get_default_collection_set_as_default_if_nonexistent ... [OK]
    test_open_session ... [OK]
    test_open_session_fails_before_opening_as_failure ... [OK]
    test_open_session_throws_dbus_error_as_failure ... [OK]
    test_prompt_accepted ... [OK]
    test_prompt_dismissed ... [OK]
    test_search_items_merges_unlocked_and_locked_items ... [OK]
    test_search_items_merges_unlocked_locked_and_prompt_items ... [OK]
    test_search_locked_items ... [OK]
    test_search_locked_items_prompts ... [OK]
    test_search_locked_items_prompts_dismissed ... [OK]
    test_search_unlocked_items ... [OK]
ubuntu_sso.utils.tests.test_qtwisted
  QtDeferToThreadTestCase
    test_exceptions_become_failures ... QThread: Destroyed while thread is still running
Segmentation fault (core dumped)

review: Needs Fixing

[lp:~urbanape/ubuntu-sso-client/initial-darwin-port]

960. By Zachery Bir on 2012-04-20

Import these names at the appropriate place

961. By Zachery Bir on 2012-04-20

Provide the name here for Windows tests to pass.

[Zachery Bir (urbanape)]

That test_qtwisted test used to be test_windows, so can probably be skipped on Linux.

[lp:~urbanape/ubuntu-sso-client/initial-darwin-port]

962. By Zachery Bir on 2012-04-20

Skip the shared code tests between darwin and windows

[Diego Sarmentero (diegosarmentero)]

Why are you doing this??

if sys.platform == 'darwin':
    PREFERED_UI_SIZE['height'] = 533 # I have no idea what I'm doing LOL

review: Needs Information

[Diego Sarmentero (diegosarmentero)]

You should merge your branch with this one:

lp:~diegosarmentero/ubuntu-sso-client/fixing-lint-pep8

That fix all the pep8 and lint issues in this branch.

review: Needs Fixing

[lp:~urbanape/ubuntu-sso-client/initial-darwin-port]

963. By Zachery Bir on 2012-04-23

Merged diegosarmentero's branch, and changed the flippant comment in qt/__init__.py

[Diego Sarmentero (diegosarmentero)]

+1 :D

review: Approve

[Manuel de la Peña (mandel)]

We have to do something with the following:

PLATFORM_QSS = ":/qtwisted.qss"

This line is going to make us not load the style on windows since there is no data/qt/qtwisted.qss and we will look ugly :(

We can:
1. revert it to be called windows.qss
2. add a darwin and a windows module with the correct qss
3. rename data/qt/windows/qss to qtwisted.qss

Do as you please.

review: Needs Fixing

[lp:~urbanape/ubuntu-sso-client/initial-darwin-port]

964. By Zachery Bir on 2012-04-23

Add a specific darwin.qss, and mediate the proper resource in utils/__init__.py

[Diego Sarmentero (diegosarmentero)]

Hi, i found that now there are new lint errors:

ubuntu_sso/utils/__init__.py:
    52: [C0103] Invalid name "qss_map" (should match (([A-Z_][A-Z0-9_]*)|(__.*__))$)

The name of this should be: QSS_MAP.

Also, i would change this:

if sys.platform in ('win32', 'darwin'):
    from ubuntu_sso.utils import qtwisted as source
    qss_map = {'win32': ':/windows.qss',
               'darwin': ':/darwin.qss',
               }
    source.PLATFORM_QSS = qss_map[sys.platform]
else:
    from ubuntu_sso.utils import linux as source
PLATFORM_QSS = source.PLATFORM_QSS

For:

QSS_MAP = dict(win32=':/windows.qss',
               darwin=':/darwin.qss',
               linux=':/linux.qss')

# Setting linux (fox example) as default if we don't find the
# platform as a key in the dictionary
PLATFORM_QSS = QSS_MAP.get(sys.platform, ":/linux.qss")

review: Needs Fixing

[Manuel de la Peña (mandel)]

I'll reject the branch because diego has fixed the issues in a diff one and proposed it for merging.

review: Disapprove

Unmerged revisions

=== added file 'data/qt/darwin.qss'
--- data/qt/darwin.qss	1970-01-01 00:00:00 +0000
+++ data/qt/darwin.qss	2012-04-23 16:23:20 +0000
@@ -0,0 +1,5 @@
+/* Styles specific to the windows platform */
+
+QWidget {
+    font-family: "Ubuntu";
+}

=== modified file 'data/qt/resources.qrc'
--- data/qt/resources.qrc	2012-03-16 21:24:05 +0000
+++ data/qt/resources.qrc	2012-04-23 16:23:20 +0000
@@ -6,6 +6,7 @@
     <file>../Ubuntu-B.ttf</file>
     <file>../balloon_shape.png</file>
     <file>stylesheet.qss</file>
+    <file>darwin.qss</file>
     <file>windows.qss</file>
     <file>linux.qss</file>
   </qresource>

=== modified file 'run-tests'
--- run-tests	2012-04-09 17:38:24 +0000
+++ run-tests	2012-04-23 16:23:20 +0000
@@ -59,7 +59,7 @@
 fi
 
 echo "*** Running GTK test suite for ""$MODULE"" ***"
-$XVFB_CMDLINE u1trial --reactor=gi --gui -p "$QT_TESTS_PATH" -i "test_windows.py,test_qt.py" "$MODULE"
+$XVFB_CMDLINE u1trial --reactor=gi --gui -p "$QT_TESTS_PATH" -i "test_windows.py,test_qt.py,test_qtwisted.py,test_pykeyring.py" "$MODULE"
 rm -rf _trial_temp
 
 # hack to avoid:

=== modified file 'ubuntu_sso/keyring/__init__.py'
--- ubuntu_sso/keyring/__init__.py	2012-04-09 17:38:24 +0000
+++ ubuntu_sso/keyring/__init__.py	2012-04-23 16:23:20 +0000
@@ -1,8 +1,4 @@
 # -*- coding: utf-8 -*-
-# Authors:
-#  Andrew Higginson
-#  Alejandro J. Cura <[e-mail]>
-#  Manuel de la Pena <[e-mail]>
 #
 # Copyright 2011-2012 Canonical Ltd.
 #
@@ -104,8 +100,8 @@
     returnValue(None)
 
 
-if sys.platform == 'win32':
-    from ubuntu_sso.keyring.windows import Keyring
+if sys.platform in ('win32', 'darwin'):
+    from ubuntu_sso.keyring.pykeyring import Keyring
 else:
     from ubuntu_sso.keyring.linux import Keyring
 

=== modified file 'ubuntu_sso/keyring/linux.py'
--- ubuntu_sso/keyring/linux.py	2012-04-09 17:38:24 +0000
+++ ubuntu_sso/keyring/linux.py	2012-04-23 16:23:20 +0000
@@ -2,12 +2,6 @@
 #
 # Copyright (C) 2010-2012 Canonical
 #
-# Authors:
-#  Andrew Higginson
-#  Alejandro J. Cura <[e-mail]>
-#  Natalia B. Bidart <[e-mail]>
-#  Manuel de la Pena <[e-mail]>
-#
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of the GNU General Public License as published by the Free Software
 # Foundation; version 3.

=== renamed file 'ubuntu_sso/keyring/windows.py' => 'ubuntu_sso/keyring/pykeyring.py'
--- ubuntu_sso/keyring/windows.py	2012-04-09 17:38:24 +0000
+++ ubuntu_sso/keyring/pykeyring.py	2012-04-23 16:23:20 +0000
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# Author: Manuel de la Pena <[e-mail]>
 #
 # Copyright 2011-2012 Canonical Ltd.
 #
@@ -27,11 +26,11 @@
 # 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.
-"""Keyring implementation on Windows."""
+"""Keyring implementation for Windows and Darwin."""
 
 from json import loads, dumps
 
-from ubuntu_sso.utils.windows import qtDeferToThread as deferToThread
+from ubuntu_sso.utils.qtwisted import qtDeferToThread as deferToThread
 
 USERNAME = 'ubuntu_sso'
 

=== renamed file 'ubuntu_sso/keyring/tests/test_windows.py' => 'ubuntu_sso/keyring/tests/test_pykeyring.py'
--- ubuntu_sso/keyring/tests/test_windows.py	2012-04-09 17:38:24 +0000
+++ ubuntu_sso/keyring/tests/test_pykeyring.py	2012-04-23 16:23:20 +0000
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# Author: Manuel de la Pena <[e-mail]>
 #
 # Copyright 2011-2012 Canonical Ltd.
 #
@@ -27,14 +26,14 @@
 # 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.
-"""Test the windows keyring implementation."""
+"""Test the pykeyring implementation."""
 
 from json import dumps
 
 from twisted.internet import defer
 from twisted.trial.unittest import TestCase
 
-from ubuntu_sso.keyring import windows
+from ubuntu_sso.keyring import pykeyring
 
 
 class FakePyKeyring(object):
@@ -71,24 +70,24 @@
         return func(args)
 
 
-class TestWindowsKeyring(TestCase):
-    """Test the windows keyring implementation."""
+class TestPyKeyring(TestCase):
+    """Test the pykeyring implementation."""
 
     @defer.inlineCallbacks
     def setUp(self):
         """Setup  tests."""
-        yield super(TestWindowsKeyring, self).setUp()
+        yield super(TestPyKeyring, self).setUp()
         self.app_name = 'app_name'
         self.fake_keyring = FakePyKeyring()
-        self.keyring = windows.Keyring(self.fake_keyring)
+        self.keyring = pykeyring.Keyring(self.fake_keyring)
         self.fake_defer = FakeDefer()
-        self.patch(windows, "deferToThread",
+        self.patch(pykeyring, "deferToThread",
             self.fake_defer.fake_defer_to_thread)
 
     # pylint: disable=E1103
     def test_set_credentials(self):
         """Test setting the credentials."""
-        self.keyring = windows.Keyring(self.fake_keyring)
+        self.keyring = pykeyring.Keyring(self.fake_keyring)
         d = self.keyring.set_credentials(self.app_name, 'password')
         self.assertEqual(d.data['set_password'],
             (('app_name', 'ubuntu_sso', '"password"'), ))

=== modified file 'ubuntu_sso/main/__init__.py'
--- ubuntu_sso/main/__init__.py	2012-04-10 10:43:48 +0000
+++ ubuntu_sso/main/__init__.py	2012-04-23 16:23:20 +0000
@@ -57,12 +57,38 @@
 logger = setup_logging("ubuntu_sso.main")
 TIMEOUT_INTERVAL = 10000  # 10 seconds
 
-# pylint: disable=C0103, W0703
+# pylint: disable=C0103, W0703, W0621
 
 if sys.platform == 'win32':
     from ubuntu_sso.main import windows
+    from ubuntu_sso.main.perspective_broker import (
+        timeout_func,
+        shutdown_func,
+        start_setup,
+        main as main_func,
+        )
+
     source = windows
+    source.timeout_func = timeout_func
+    source.shutdown_func = shutdown_func
+    source.start_setup = start_setup
+    source.main = main_func
+
     TIMEOUT_INTERVAL = 10000000000  # forever (hack)
+elif sys.platform == 'darwin':
+    from ubuntu_sso.main import darwin
+    from ubuntu_sso.main.perspective_broker import (
+        timeout_func,
+        shutdown_func,
+        start_setup,
+        main as main_func,
+        )
+
+    source = darwin
+    source.timeout_func = timeout_func
+    source.shutdown_func = shutdown_func
+    source.start_setup = start_setup
+    source.main = main_func
 else:
     from ubuntu_sso.main import linux
     source = linux

=== added file 'ubuntu_sso/main/darwin.py'
--- ubuntu_sso/main/darwin.py	1970-01-01 00:00:00 +0000
+++ ubuntu_sso/main/darwin.py	2012-04-23 16:23:20 +0000
@@ -0,0 +1,110 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright 2009-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/>.
+"""Main module implementation specific for darwin (OS X).
+
+This module should never import from the multiplatform one (main/__init__.py),
+but the other way around. Likewise, this module should *not* have any logic
+regarding error processing or decision making about when to send a given
+signal.
+
+Also, most of the logging is being made in the main module to avoid
+duplication between the different platform implementations.
+
+"""
+
+import os
+import os.path
+
+from twisted.internet import defer
+
+import ubuntu_sso
+from ubuntu_sso.logger import setup_logging
+from ubuntu_sso.utils.ipc import BaseClient
+from ubuntu_sso.main.perspective_broker import (
+    SSO_SERVICE_NAME,
+    SSOLoginClient,
+    CredentialsManagementClient,
+    UbuntuSSOProxyBase,
+    )
+
+# Invalid name for signals that are CamelCase
+# pylint: disable=C0103
+
+
+logger = setup_logging("ubuntu_sso.main.darwin")
+U1_REG_PATH = r'Software\Ubuntu One'
+SSO_INSTALL_PATH = 'SSOInstallPath'
+SSO_BASE_PB_PORT = 50000
+SSO_RESERVED_PORTS = 3000
+SSO_PORT_ALLOCATION_STEP = 3  # contiguous ports for sso, u1client, and u1cp
+
+
+def get_sso_pb_port():
+    """Compute the port the SSO service should run on per-user."""
+    uid_modulo = os.getuid() % SSO_RESERVED_PORTS
+    return SSO_BASE_PB_PORT + uid_modulo * SSO_PORT_ALLOCATION_STEP
+
+
+class UbuntuSSOProxy(UbuntuSSOProxyBase):
+    """Object that exposes the diff referenceable objects."""
+
+    name = SSO_SERVICE_NAME
+
+    @property
+    def port(self):
+        """Get the port on which the SSO pb is running."""
+        return get_sso_pb_port()
+
+    @property
+    def cmdline(self):
+        """Get the command line to activate an executable."""
+        # MAYBE: use special URI schemes to have LaunchServices handle
+        # running the app, instead of paths to scripts
+        # e.g. 'x-ubuntuone-syncdaemon', 'x-ubuntu-sso-login'
+        ubuntu_sso_pkg_dir = os.path.dirname(
+            os.path.dirname(ubuntu_sso.__file__))
+        ubuntu_sso_bin_dir = os.path.join(ubuntu_sso_pkg_dir, 'bin')
+        ubuntu_sso_bin = os.path.join(ubuntu_sso_bin_dir, self.name)
+        ubuntuone_client_bin_dir = os.path.join(ubuntu_sso_pkg_dir,
+                                                '../ubuntuone-client/bin')
+        ubuntuone_client_bin = os.path.join(ubuntuone_client_bin_dir,
+                                            self.name)
+        if os.path.exists(ubuntuone_client_bin):
+            return ubuntuone_client_bin
+        return ubuntu_sso_bin
+
+
+class UbuntuSSOClient(BaseClient):
+    """Base client that provides remote access to the sso API."""
+
+    name = SSO_SERVICE_NAME
+
+    clients = {
+        'sso_login': SSOLoginClient,
+        'cred_manager': CredentialsManagementClient,
+    }
+
+    service_name = UbuntuSSOProxy.name
+    service_port = UbuntuSSOProxy.port
+    service_cmdline = UbuntuSSOProxy.cmdline
+
+
[e-mail]
+def get_sso_client():
+    """Get a client to access the SSO service."""
+    result = UbuntuSSOClient()
+    yield result.connect()
+    defer.returnValue(result)

=== added file 'ubuntu_sso/main/perspective_broker.py'
--- ubuntu_sso/main/perspective_broker.py	1970-01-01 00:00:00 +0000
+++ ubuntu_sso/main/perspective_broker.py	2012-04-23 16:23:20 +0000
@@ -0,0 +1,352 @@
+# -*- 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/>.
+"""Generic SSO client using Twisted Perspective Broker.
+
+This module should never import from the multiplatform one (main/__init__.py),
+but the other way around. Likewise, this module should *not* have any logic
+regarding error processing or decision making about when to send a given
+signal.
+
+Also, most of the logging is being made in the main module to avoid
+duplication between the different platform implementations.
+
+"""
+
+from twisted.internet.task import LoopingCall
+from twisted.python.failure import Failure
+
+from ubuntu_sso.logger import setup_logging
+from ubuntu_sso.utils.ipc import (
+    BaseService,
+    RemoteClient,
+    RemoteService,
+    signal,
+)
+
+logger = setup_logging("ubuntu_sso.main.perspective_broker")
+SSO_SERVICE_NAME = "ubuntu-sso-client"
+
+# Invalid name for signals that are CamelCase
+# pylint: disable=C0103
+
+
+class SSOLoginProxy(RemoteService):
+    """Login thru the Single Sign On service."""
+
+    remote_calls = [
+        'generate_captcha',
+        'register_user',
+        'login',
+        'login_and_ping',
+        'validate_email',
+        'validate_email_and_ping',
+        'request_password_reset_token',
+        'set_new_password',
+    ]
+
+    def __init__(self, root, *args, **kwargs):
+        super(SSOLoginProxy, self).__init__(*args, **kwargs)
+        self.root = root
+
+    # generate_capcha signals
+    @signal
+    def CaptchaGenerated(self, app_name, result):
+        """Signal thrown after the captcha is generated."""
+
+    @signal
+    def CaptchaGenerationError(self, app_name, error):
+        """Signal thrown when there's a problem generating the captcha."""
+
+    def generate_captcha(self, app_name, filename):
+        """Call the matching method in the processor."""
+        self.root.sso_login.generate_captcha(app_name, filename)
+
+    # register_user signals
+    @signal
+    def UserRegistered(self, app_name, result):
+        """Signal thrown when the user is registered."""
+
+    @signal
+    def UserRegistrationError(self, app_name, error):
+        """Signal thrown when there's a problem registering the user."""
+
+    def register_user(self, app_name, email, password, name,
+                      captcha_id, captcha_solution):
+        """Call the matching method in the processor."""
+        self.root.sso_login.register_user(app_name, email, password, name,
+            captcha_id, captcha_solution)
+
+    # login signals
+    @signal
+    def LoggedIn(self, app_name, result):
+        """Signal thrown when the user is logged in."""
+
+    @signal
+    def LoginError(self, app_name, error):
+        """Signal thrown when there is a problem in the login."""
+
+    @signal
+    def UserNotValidated(self, app_name, result):
+        """Signal thrown when the user is not validated."""
+
+    def login(self, app_name, email, password, ping_url=None):
+        """Call the matching method in the processor."""
+        self.root.sso_login.login(app_name, email, password, ping_url)
+
+    login_and_ping = login
+
+    # validate_email signals
+    @signal
+    def EmailValidated(self, app_name, result):
+        """Signal thrown after the email is validated."""
+
+    @signal
+    def EmailValidationError(self, app_name, error):
+        """Signal thrown when there's a problem validating the email."""
+
+    def validate_email(self, app_name, email, password, email_token,
+                       ping_url=None):
+        """Call the matching method in the processor."""
+        self.root.sso_login.validate_email(app_name,
+            email, password, email_token, ping_url)
+
+    validate_email_and_ping = validate_email
+
+    # request_password_reset_token signals
+    @signal
+    def PasswordResetTokenSent(self, app_name, result):
+        """Signal thrown when the token is succesfully sent."""
+
+    @signal
+    def PasswordResetError(self, app_name, error):
+        """Signal thrown when there's a problem sending the token."""
+
+    def request_password_reset_token(self, app_name, email):
+        """Call the matching method in the processor."""
+        self.root.sso_login.request_password_reset_token(app_name, email)
+
+    # set_new_password signals
+    @signal
+    def PasswordChanged(self, app_name, result):
+        """Signal thrown when the token is succesfully sent."""
+
+    @signal
+    def PasswordChangeError(self, app_name, error):
+        """Signal thrown when there's a problem sending the token."""
+
+    def set_new_password(self, app_name, email, token, new_password):
+        """Call the matching method in the processor."""
+        self.root.sso_login.set_new_password(app_name,
+            email, token, new_password)
+
+
+class CredentialsManagementProxy(RemoteService):
+    """Object that manages credentials.
+
+    Every exposed method in this class requires one mandatory argument:
+
+        - 'app_name': the name of the application. Will be displayed in the
+        GUI header, plus it will be used to find/build/clear tokens.
+
+    And accepts another parameter named 'args', which is a dictionary that
+    can contain the following:
+
+        - 'help_text': an explanatory text for the end-users, will be
+        shown below the header. This is an optional free text field.
+
+        - 'ping_url': the url to open after successful token retrieval. If
+        defined, the email will be attached to the url and will be pinged
+        with a OAuth-signed request.
+
+        - 'tc_url': the link to the Terms and Conditions page. If defined,
+        the checkbox to agree to the terms will link to it.
+
+        - 'window_id': the id of the window which will be set as a parent
+        of the GUI. If not defined, no parent will be set.
+
+    """
+
+    remote_calls = [
+        'find_credentials',
+        'clear_credentials',
+        'store_credentials',
+        'register',
+        'login',
+        'login_email_password',
+    ]
+
+    def __init__(self, root, *args, **kwargs):
+        super(CredentialsManagementProxy, self).__init__(*args, **kwargs)
+        self.root = root
+
+    @signal
+    def AuthorizationDenied(self, app_name):
+        """Signal thrown when the user denies the authorization."""
+
+    @signal
+    def CredentialsFound(self, app_name, credentials):
+        """Signal thrown when the credentials are found."""
+
+    @signal
+    def CredentialsNotFound(self, app_name):
+        """Signal thrown when the credentials are not found."""
+
+    @signal
+    def CredentialsCleared(self, app_name):
+        """Signal thrown when the credentials were cleared."""
+
+    @signal
+    def CredentialsStored(self, app_name):
+        """Signal thrown when the credentials were cleared."""
+
+    @signal
+    def CredentialsError(self, app_name, error_dict):
+        """Signal thrown when there is a problem getting the credentials."""
+
+    def find_credentials(self, app_name, args):
+        """Look for the credentials for an application.
+
+        - 'app_name': the name of the application which credentials are
+        going to be removed.
+
+        - 'args' is a dictionary, currently not used.
+
+        """
+        self.root.cred_manager.find_credentials(app_name, args)
+
+    def clear_credentials(self, app_name, args):
+        """Clear the credentials for an application.
+
+        - 'app_name': the name of the application which credentials are
+        going to be removed.
+
+        - 'args' is a dictionary, currently not used.
+
+        """
+        self.root.cred_manager.clear_credentials(app_name, args)
+
+    def store_credentials(self, app_name, args):
+        """Store the token for an application.
+
+        - 'app_name': the name of the application which credentials are
+        going to be stored.
+
+        - 'args' is the dictionary holding the credentials. Needs to provide
+        the following mandatory keys: 'token', 'token_key', 'consumer_key',
+        'consumer_secret'.
+
+        """
+        self.root.cred_manager.store_credentials(app_name, args)
+
+    def register(self, app_name, args):
+        """Get credentials if found else prompt GUI to register."""
+        self.root.cred_manager.register(app_name, args)
+
+    def login(self, app_name, args):
+        """Get credentials if found else prompt GUI to login."""
+        self.root.cred_manager.login(app_name, args)
+
+    def login_email_password(self, app_name, args):
+        """Get credentials if found, else login using email and password.
+
+        - 'args' should contain at least the follwing keys: 'email' and
+        'password'. Those will be used to issue a new SSO token, which will be
+        returned trough the CredentialsFound signal.
+
+        """
+        self.root.cred_manager.login_email_password(app_name, args)
+
+
+class UbuntuSSOProxyBase(BaseService):
+    """Object that exposes the diff referenceable objects."""
+
+    services = {
+        'sso_login': SSOLoginProxy,
+        'cred_manager': CredentialsManagementProxy,
+    }
+
+    name = SSO_SERVICE_NAME
+
+
+# ============================== client classes ==============================
+
+
+class SSOLoginClient(RemoteClient):
+    """Client that can perform calls to the remote SSOLogin object."""
+
+    call_remote_functions = SSOLoginProxy.remote_calls
+    signal_handlers = [
+        'CaptchaGenerated',
+        'CaptchaGenerationError',
+        'UserRegistered',
+        'UserRegistrationError',
+        'LoggedIn',
+        'LoginError',
+        'UserNotValidated',
+        'EmailValidated',
+        'EmailValidationError',
+        'PasswordResetTokenSent',
+        'PasswordResetError',
+        'PasswordChanged',
+        'PasswordChangeError',
+    ]
+
+
+class CredentialsManagementClient(RemoteClient):
+    """Client that can perform calls to the remote CredManagement object."""
+
+    call_remote_functions = CredentialsManagementProxy.remote_calls
+    signal_handlers = [
+        'AuthorizationDenied',
+        'CredentialsFound',
+        'CredentialsNotFound',
+        'CredentialsCleared',
+        'CredentialsStored',
+        'CredentialsError',
+    ]
+
+
+def add_timeout(interval, callback, *args, **kwargs):
+    """Add a timeout callback as a task."""
+    time_out_task = LoopingCall(callback, *args, **kwargs)
+    time_out_task.start(interval / 1000, now=False)
+
+
+timeout_func = add_timeout
+start_setup = lambda *a, **kw: None
+
+# the reactor does have run and stop methods
+# pylint: disable=E1101
+
+
+def shutdown_func():
+    """Stop the reactor."""
+    from twisted.internet import reactor
+    reactor.stop()
+
+
+def finish_setup(result, loop):
+    """Stop the reactor if a failure ocurred."""
+    if isinstance(result, Failure):
+        shutdown_func()
+
+
+def main():
+    """Run the specific mainloop."""
+    from twisted.internet import reactor
+    reactor.run()
+
+# pylint: enable=E1101

=== added file 'ubuntu_sso/main/tests/test_darwin.py'
--- ubuntu_sso/main/tests/test_darwin.py	1970-01-01 00:00:00 +0000
+++ ubuntu_sso/main/tests/test_darwin.py	2012-04-23 16:23:20 +0000
@@ -0,0 +1,43 @@
+# -*- 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/>.
+"""Darwin specific tests for the main module."""
+
+from ubuntu_sso.main import darwin
+from ubuntu_sso.tests import TestCase
+
+# because we are using twisted we have java like names C0103
+# pylint: disable=C0103
+
+MOCK_SSO_DARWIN_UID = 1001
+
+
+class MockOsGetuid(object):
+    """Mocked os.getuid to support reliable uid for test"""
+
+    def getuid(self):
+        """Return the same uid for tests"""
+        return MOCK_SSO_DARWIN_UID
+
+
+class DarwinTestCase(TestCase):
+    """Tests for module level misc functions"""
+
+    def test_get_sso_pb_port(self):
+        """Test the get_sso_pb_port function, by patching os.getuid"""
+        mock_os = MockOsGetuid()
+        self.patch(darwin, "os", mock_os)
+        expected_port = 53003
+        self.assertEqual(darwin.get_sso_pb_port(), expected_port)

=== modified file 'ubuntu_sso/main/tests/test_windows.py'
--- ubuntu_sso/main/tests/test_windows.py	2012-04-09 17:38:24 +0000
+++ ubuntu_sso/main/tests/test_windows.py	2012-04-23 16:23:20 +0000
@@ -32,6 +32,7 @@
 from _winreg import REG_SZ
 
 from ubuntu_sso.main import windows
+from ubuntu_sso.main import perspective_broker
 from ubuntu_sso.tests import TestCase
 
 # because we are using twisted we have java like names C0103
@@ -110,5 +111,6 @@
         sample_value = "test 123"
         self.patch(windows, "OpenKey", lambda key, subkey: sample_value)
         self.patch(windows, "QueryValueEx", lambda key, v: (key, REG_SZ))
-        cmdline = windows.get_activation_cmdline(windows.SSO_SERVICE_NAME)
+        cmdline = windows.get_activation_cmdline(
+            perspective_broker.SSO_SERVICE_NAME)
         self.assertEqual(sample_value, cmdline)

=== modified file 'ubuntu_sso/main/windows.py'
--- ubuntu_sso/main/windows.py	2012-04-09 17:38:24 +0000
+++ ubuntu_sso/main/windows.py	2012-04-23 16:23:20 +0000
@@ -45,350 +45,71 @@
 # pylint: enable=F0401
 
 from twisted.internet import defer
-from twisted.internet.task import LoopingCall
-from twisted.python.failure import Failure
 
 from ubuntu_sso.logger import setup_logging
-from ubuntu_sso.utils.ipc import (
-    BaseClient,
-    BaseService,
-    RemoteClient,
-    RemoteService,
-    signal,
-)
-
-
-# Invalid name for signals that are CamelCase
-# pylint: disable=C0103
+from ubuntu_sso.utils.ipc import BaseClient
+from ubuntu_sso.main.perspective_broker import (
+    SSO_SERVICE_NAME,
+    SSOLoginClient,
+    CredentialsManagementClient,
+    UbuntuSSOProxyBase,
+    )
 
 
 logger = setup_logging("ubuntu_sso.main.windows")
-NAMED_PIPE_URL = '\\\\.\\pipe\\ubuntu_sso\\%s'
 U1_REG_PATH = r'Software\Ubuntu One'
 SSO_INSTALL_PATH = 'SSOInstallPath'
 SSO_BASE_PB_PORT = 50000
 SSO_RESERVED_PORTS = 3000
 SSO_PORT_ALLOCATION_STEP = 3  # contiguous ports for sso, u1client, and u1cp
-SSO_SERVICE_NAME = "ubuntu-sso-client"
 
 
 def get_user_id():
-    """Find the numeric user id."""
+    """Compute the user id of the currently running process."""
     process_handle = win32process.GetCurrentProcess()
     token_handle = win32security.OpenProcessToken(process_handle,
                                               win32security.TOKEN_ALL_ACCESS)
     user_sid = win32security.GetTokenInformation(token_handle,
                                               win32security.TokenUser)[0]
     sid_parts = str(user_sid).split("-")
-    uid = int(sid_parts[-1])
-    return uid
+    return int(sid_parts[-1])
 
 
 def get_sso_pb_port():
-    """Get the port on which the SSO pb is running."""
-    uid = get_user_id()
-    uid_modulo = uid % SSO_RESERVED_PORTS
-    port = SSO_BASE_PB_PORT + uid_modulo * SSO_PORT_ALLOCATION_STEP
-    return port
-
-
-def get_activation_cmdline(service_name):
-    """Get the command line to activate an executable."""
+    """Compute the port the SSO service should run on per-user."""
+    uid_modulo = get_user_id() % SSO_RESERVED_PORTS
+    return SSO_BASE_PB_PORT + uid_modulo * SSO_PORT_ALLOCATION_STEP
+
+
+def get_activation_cmdline(name):
+    """Find the path to the executable callback."""
     key = OpenKey(HKEY_LOCAL_MACHINE, U1_REG_PATH)
     # pylint: disable=W0612
-    value, registry_type = QueryValueEx(key, "path-" + service_name)
+    value, registry_type = QueryValueEx(key, "path-" + name)
     return value
 
 
-class SSOLoginProxy(RemoteService):
-    """Login thru the Single Sign On service."""
-
-    remote_calls = [
-        'generate_captcha',
-        'register_user',
-        'login',
-        'login_and_ping',
-        'validate_email',
-        'validate_email_and_ping',
-        'request_password_reset_token',
-        'set_new_password',
-    ]
-
-    def __init__(self, root, *args, **kwargs):
-        super(SSOLoginProxy, self).__init__(*args, **kwargs)
-        self.root = root
-
-    # generate_capcha signals
-    @signal
-    def CaptchaGenerated(self, app_name, result):
-        """Signal thrown after the captcha is generated."""
-
-    @signal
-    def CaptchaGenerationError(self, app_name, error):
-        """Signal thrown when there's a problem generating the captcha."""
-
-    def generate_captcha(self, app_name, filename):
-        """Call the matching method in the processor."""
-        self.root.sso_login.generate_captcha(app_name, filename)
-
-    # register_user signals
-    @signal
-    def UserRegistered(self, app_name, result):
-        """Signal thrown when the user is registered."""
-
-    @signal
-    def UserRegistrationError(self, app_name, error):
-        """Signal thrown when there's a problem registering the user."""
-
-    def register_user(self, app_name, email, password, name,
-                      captcha_id, captcha_solution):
-        """Call the matching method in the processor."""
-        self.root.sso_login.register_user(app_name, email, password, name,
-            captcha_id, captcha_solution)
-
-    # login signals
-    @signal
-    def LoggedIn(self, app_name, result):
-        """Signal thrown when the user is logged in."""
-
-    @signal
-    def LoginError(self, app_name, error):
-        """Signal thrown when there is a problem in the login."""
-
-    @signal
-    def UserNotValidated(self, app_name, result):
-        """Signal thrown when the user is not validated."""
-
-    def login(self, app_name, email, password, ping_url=None):
-        """Call the matching method in the processor."""
-        self.root.sso_login.login(app_name, email, password, ping_url)
-
-    login_and_ping = login
-
-    # validate_email signals
-    @signal
-    def EmailValidated(self, app_name, result):
-        """Signal thrown after the email is validated."""
-
-    @signal
-    def EmailValidationError(self, app_name, error):
-        """Signal thrown when there's a problem validating the email."""
-
-    def validate_email(self, app_name, email, password, email_token,
-                       ping_url=None):
-        """Call the matching method in the processor."""
-        self.root.sso_login.validate_email(app_name,
-            email, password, email_token, ping_url)
-
-    validate_email_and_ping = validate_email
-
-    # request_password_reset_token signals
-    @signal
-    def PasswordResetTokenSent(self, app_name, result):
-        """Signal thrown when the token is succesfully sent."""
-
-    @signal
-    def PasswordResetError(self, app_name, error):
-        """Signal thrown when there's a problem sending the token."""
-
-    def request_password_reset_token(self, app_name, email):
-        """Call the matching method in the processor."""
-        self.root.sso_login.request_password_reset_token(app_name, email)
-
-    # set_new_password signals
-    @signal
-    def PasswordChanged(self, app_name, result):
-        """Signal thrown when the token is succesfully sent."""
-
-    @signal
-    def PasswordChangeError(self, app_name, error):
-        """Signal thrown when there's a problem sending the token."""
-
-    def set_new_password(self, app_name, email, token, new_password):
-        """Call the matching method in the processor."""
-        self.root.sso_login.set_new_password(app_name,
-            email, token, new_password)
-
-
-class CredentialsManagementProxy(RemoteService):
-    """Object that manages credentials.
-
-    Every exposed method in this class requires one mandatory argument:
-
-        - 'app_name': the name of the application. Will be displayed in the
-        GUI header, plus it will be used to find/build/clear tokens.
-
-    And accepts another parameter named 'args', which is a dictionary that
-    can contain the following:
-
-        - 'help_text': an explanatory text for the end-users, will be
-        shown below the header. This is an optional free text field.
-
-        - 'ping_url': the url to open after successful token retrieval. If
-        defined, the email will be attached to the url and will be pinged
-        with a OAuth-signed request.
-
-        - 'tc_url': the link to the Terms and Conditions page. If defined,
-        the checkbox to agree to the terms will link to it.
-
-        - 'window_id': the id of the window which will be set as a parent
-        of the GUI. If not defined, no parent will be set.
-
-    """
-
-    remote_calls = [
-        'find_credentials',
-        'clear_credentials',
-        'store_credentials',
-        'register',
-        'login',
-        'login_email_password',
-    ]
-
-    def __init__(self, root, *args, **kwargs):
-        super(CredentialsManagementProxy, self).__init__(*args, **kwargs)
-        self.root = root
-
-    @signal
-    def AuthorizationDenied(self, app_name):
-        """Signal thrown when the user denies the authorization."""
-
-    @signal
-    def CredentialsFound(self, app_name, credentials):
-        """Signal thrown when the credentials are found."""
-
-    @signal
-    def CredentialsNotFound(self, app_name):
-        """Signal thrown when the credentials are not found."""
-
-    @signal
-    def CredentialsCleared(self, app_name):
-        """Signal thrown when the credentials were cleared."""
-
-    @signal
-    def CredentialsStored(self, app_name):
-        """Signal thrown when the credentials were cleared."""
-
-    @signal
-    def CredentialsError(self, app_name, error_dict):
-        """Signal thrown when there is a problem getting the credentials."""
-
-    def find_credentials(self, app_name, args):
-        """Look for the credentials for an application.
-
-        - 'app_name': the name of the application which credentials are
-        going to be removed.
-
-        - 'args' is a dictionary, currently not used.
-
-        """
-        self.root.cred_manager.find_credentials(app_name, args)
-
-    def clear_credentials(self, app_name, args):
-        """Clear the credentials for an application.
-
-        - 'app_name': the name of the application which credentials are
-        going to be removed.
-
-        - 'args' is a dictionary, currently not used.
-
-        """
-        self.root.cred_manager.clear_credentials(app_name, args)
-
-    def store_credentials(self, app_name, args):
-        """Store the token for an application.
-
-        - 'app_name': the name of the application which credentials are
-        going to be stored.
-
-        - 'args' is the dictionary holding the credentials. Needs to provide
-        the following mandatory keys: 'token', 'token_key', 'consumer_key',
-        'consumer_secret'.
-
-        """
-        self.root.cred_manager.store_credentials(app_name, args)
-
-    def register(self, app_name, args):
-        """Get credentials if found else prompt GUI to register."""
-        self.root.cred_manager.register(app_name, args)
-
-    def login(self, app_name, args):
-        """Get credentials if found else prompt GUI to login."""
-        self.root.cred_manager.login(app_name, args)
-
-    def login_email_password(self, app_name, args):
-        """Get credentials if found, else login using email and password.
-
-        - 'args' should contain at least the follwing keys: 'email' and
-        'password'. Those will be used to issue a new SSO token, which will be
-        returned trough the CredentialsFound signal.
-
-        """
-        self.root.cred_manager.login_email_password(app_name, args)
-
-
-class UbuntuSSOProxy(BaseService):
+class UbuntuSSOProxy(UbuntuSSOProxyBase):
     """Object that exposes the diff referenceable objects."""
 
-    services = {
-        'sso_login': SSOLoginProxy,
-        'cred_manager': CredentialsManagementProxy,
-    }
-
     name = SSO_SERVICE_NAME
 
     @property
     def port(self):
-        """Get the port of the remote service."""
+        """Get the port on which the SSO pb is running."""
         return get_sso_pb_port()
 
     @property
     def cmdline(self):
-        """Get the command line to run the service executable."""
-        return get_activation_cmdline(UbuntuSSOProxy.name)
-
-
-# ============================== client classes ==============================
-
-
-class SSOLoginClient(RemoteClient):
-    """Client that can perform calls to the remote SSOLogin object."""
-
-    call_remote_functions = SSOLoginProxy.remote_calls
-    signal_handlers = [
-        'CaptchaGenerated',
-        'CaptchaGenerationError',
-        'UserRegistered',
-        'UserRegistrationError',
-        'LoggedIn',
-        'LoginError',
-        'UserNotValidated',
-        'EmailValidated',
-        'EmailValidationError',
-        'PasswordResetTokenSent',
-        'PasswordResetError',
-        'PasswordChanged',
-        'PasswordChangeError',
-    ]
-
-
-class CredentialsManagementClient(RemoteClient):
-    """Client that can perform calls to the remote CredManagement object."""
-
-    call_remote_functions = CredentialsManagementProxy.remote_calls
-    signal_handlers = [
-        'AuthorizationDenied',
-        'CredentialsFound',
-        'CredentialsNotFound',
-        'CredentialsCleared',
-        'CredentialsStored',
-        'CredentialsError',
-    ]
+        """Get the command line to activate an executable."""
+        return get_activation_cmdline(self.name)
 
 
 class UbuntuSSOClient(BaseClient):
     """Base client that provides remote access to the sso API."""
 
+    name = SSO_SERVICE_NAME
+
     clients = {
         'sso_login': SSOLoginClient,
         'cred_manager': CredentialsManagementClient,
@@ -405,36 +126,3 @@
     result = UbuntuSSOClient()
     yield result.connect()
     defer.returnValue(result)
-
-
-def add_timeout(interval, callback, *args, **kwargs):
-    """Add a timeout callback as a task."""
-    time_out_task = LoopingCall(callback, *args, **kwargs)
-    time_out_task.start(interval / 1000, now=False)
-
-
-timeout_func = add_timeout
-start_setup = lambda *a, **kw: None
-
-# the reactor does have run and stop methods
-# pylint: disable=E1101
-
-
-def shutdown_func():
-    """Stop the reactor."""
-    from twisted.internet import reactor
-    reactor.stop()
-
-
-def finish_setup(result, loop):
-    """Stop the reactor if a failure ocurred."""
-    if isinstance(result, Failure):
-        shutdown_func()
-
-
-def main():
-    """Run the specific mainloop."""
-    from twisted.internet import reactor
-    reactor.run()
-
-# pylint: enable=E1101

=== modified file 'ubuntu_sso/networkstate/__init__.py'
--- ubuntu_sso/networkstate/__init__.py	2012-04-09 17:38:24 +0000
+++ ubuntu_sso/networkstate/__init__.py	2012-04-23 16:23:20 +0000
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# Author: Manuel de la Pena <[e-mail]>
 #
 # Copyright 2011-2012 Canonical Ltd.
 #
@@ -47,15 +46,16 @@
 
 if sys.platform == 'win32':
     from ubuntu_sso.networkstate import windows
-    NetworkManagerState = windows.NetworkManagerState
-    ONLINE = windows.ONLINE
-    OFFLINE = windows.OFFLINE
-    UNKNOWN = windows.UNKNOWN
-    is_machine_connected = windows.is_machine_connected
+    networksource = windows
+elif sys.platform == 'darwin':
+    from ubuntu_sso.networkstate import darwin
+    networksource = darwin
 else:
     from ubuntu_sso.networkstate import linux
-    NetworkManagerState = linux.NetworkManagerState
-    ONLINE = linux.ONLINE
-    OFFLINE = linux.OFFLINE
-    UNKNOWN = linux.UNKNOWN
-    is_machine_connected = linux.is_machine_connected
+    networksource = linux
+
+NetworkManagerState = networksource.NetworkManagerState
+ONLINE = networksource.ONLINE
+OFFLINE = networksource.OFFLINE
+UNKNOWN = networksource.UNKNOWN
+is_machine_connected = networksource.is_machine_connected

=== added file 'ubuntu_sso/networkstate/darwin.py'
--- ubuntu_sso/networkstate/darwin.py	1970-01-01 00:00:00 +0000
+++ ubuntu_sso/networkstate/darwin.py	2012-04-23 16:23:20 +0000
@@ -0,0 +1,95 @@
+# -*- 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/>.
+"""Implementation of network state detection."""
+
+from twisted.internet import defer
+
+from ubuntu_sso.networkstate import NetworkFailException
+from ubuntu_sso.networkstate.networkstates import (
+    ONLINE, OFFLINE, UNKNOWN,
+
+    NM_STATE_CONNECTING_LIST,
+    NM_STATE_CONNECTED_LIST,
+    NM_STATE_DISCONNECTED_LIST,
+    )
+from ubuntu_sso.networkstate.networkstates import NM_STATE_CONNECTED_GLOBAL
+from ubuntu_sso.logger import setup_logging
+logger = setup_logging("ubuntu_sso.networkstate")
+
+
+class NetworkManagerState(object):
+    """All likely to change very soon."""
+
+    def __init__(self, result_cb):
+        """Initialize this instance with a result and error callbacks."""
+        self.result_cb = result_cb
+        self.state_signal = None
+
+    def call_result_cb(self, state):
+        """Return the state thru the result callback."""
+        self.result_cb(state)
+
+    def got_state(self, state):
+        """Not actually called by DBus when the state is retrieved from NM."""
+        if state in NM_STATE_CONNECTED_LIST:
+            self.call_result_cb(ONLINE)
+        elif state in NM_STATE_CONNECTING_LIST:
+            logger.debug("Currently connecting, waiting for signal")
+        else:
+            self.call_result_cb(OFFLINE)
+
+    def got_error(self, error):
+        """Not actually called by DBus when the state is retrieved from NM."""
+        logger.error("Error contacting NetworkManager: %s" % \
+                     str(error))
+        self.call_result_cb(UNKNOWN)
+
+    def state_changed(self, state):
+        """Called when a signal is emmited by Network Manager."""
+        if int(state) in NM_STATE_CONNECTED_LIST:
+            self.call_result_cb(ONLINE)
+        elif int(state) in NM_STATE_DISCONNECTED_LIST:
+            self.call_result_cb(OFFLINE)
+        else:
+            logger.debug("Not yet connected: continuing to wait")
+
+    def find_online_state(self):
+        """Get the network state and return it thru the set callback."""
+        try:
+            self.state_changed(NM_STATE_CONNECTED_GLOBAL)
+        except Exception, e:  # pylint: disable=W0703
+            self.got_error(e)
+
+
+def is_machine_connected():
+    """Return a deferred that when fired, returns if the machine is online."""
+    d = defer.Deferred()
+
+    def got_state(state):
+        """The state was retrieved from the Network Manager."""
+        result = int(state) in NM_STATE_CONNECTED_LIST
+        d.callback(result)
+
+    # pylint: disable=W0702, W0703
+    try:
+        network = NetworkManagerState(got_state)
+        network.find_online_state()
+    except Exception, e:
+        logger.exception('is_machine_connected failed with:')
+        d.errback(NetworkFailException(e))
+    # pylint: enable=W0702, W0703
+
+    return d

=== modified file 'ubuntu_sso/networkstate/linux.py'
--- ubuntu_sso/networkstate/linux.py	2012-04-09 17:38:24 +0000
+++ ubuntu_sso/networkstate/linux.py	2012-04-23 16:23:20 +0000
@@ -1,9 +1,5 @@
 # -*- coding: utf-8 -*-
 #
-# networkstate - detect the current state of the network
-#
-# Author: Alejandro J. Cura <[e-mail]>
-#
 # Copyright 2010-2012 Canonical Ltd.
 #
 # This program is free software: you can redistribute it and/or modify it
@@ -37,44 +33,16 @@
 from twisted.internet import defer
 
 from ubuntu_sso.networkstate import NetworkFailException
+from ubuntu_sso.networkstate.networkstates import (
+    ONLINE, OFFLINE, UNKNOWN,
+
+    NM_STATE_CONNECTING_LIST,
+    NM_STATE_CONNECTED_LIST,
+    NM_STATE_DISCONNECTED_LIST,
+    )
 from ubuntu_sso.logger import setup_logging
 logger = setup_logging("ubuntu_sso.networkstate")
 
-# Values returned by the callback
-ONLINE, OFFLINE, UNKNOWN = object(), object(), object()
-
-NM_STATE_NAMES = {
-    ONLINE: "online",
-    OFFLINE: "offline",
-    UNKNOWN: "unknown",
-}
-
-# Internal NetworkManager State constants
-NM_STATE_UNKNOWN = 0
-NM_STATE_UNKNOWN_LIST = [NM_STATE_UNKNOWN]
-NM_STATE_ASLEEP_OLD = 1
-NM_STATE_ASLEEP = 10
-NM_STATE_ASLEEP_LIST = [NM_STATE_ASLEEP_OLD,
-                        NM_STATE_ASLEEP]
-NM_STATE_CONNECTING_OLD = 2
-NM_STATE_CONNECTING = 40
-NM_STATE_CONNECTING_LIST = [NM_STATE_CONNECTING_OLD,
-                            NM_STATE_CONNECTING]
-NM_STATE_CONNECTED_OLD = 3
-NM_STATE_CONNECTED_LOCAL = 50
-NM_STATE_CONNECTED_SITE = 60
-NM_STATE_CONNECTED_GLOBAL = 70
-# Specifically don't include local and site, as they won't let us get to server
-NM_STATE_CONNECTED_LIST = [NM_STATE_CONNECTED_OLD,
-                           NM_STATE_CONNECTED_GLOBAL]
-NM_STATE_DISCONNECTED_OLD = 4
-NM_STATE_DISCONNECTED = 20
-# For us, local and site connections are the same as diconnected
-NM_STATE_DISCONNECTED_LIST = [NM_STATE_DISCONNECTED_OLD,
-                              NM_STATE_DISCONNECTED,
-                              NM_STATE_CONNECTED_LOCAL,
-                              NM_STATE_CONNECTED_SITE]
-
 NM_DBUS_INTERFACE = "org.freedesktop.NetworkManager"
 NM_DBUS_OBJECTPATH = "/org/freedesktop/NetworkManager"
 DBUS_UNKNOWN_SERVICE = "org.freedesktop.DBus.Error.ServiceUnknown"

=== added file 'ubuntu_sso/networkstate/networkstates.py'
--- ubuntu_sso/networkstate/networkstates.py	1970-01-01 00:00:00 +0000
+++ ubuntu_sso/networkstate/networkstates.py	2012-04-23 16:23:20 +0000
@@ -0,0 +1,51 @@
+# -*- 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/>.
+"""Network states."""
+
+# Values returned by the callback
+ONLINE, OFFLINE, UNKNOWN = object(), object(), object()
+
+NM_STATE_NAMES = {
+    ONLINE: "online",
+    OFFLINE: "offline",
+    UNKNOWN: "unknown",
+}
+
+# Internal NetworkManager State constants
+NM_STATE_UNKNOWN = 0
+NM_STATE_UNKNOWN_LIST = [NM_STATE_UNKNOWN]
+NM_STATE_ASLEEP_OLD = 1
+NM_STATE_ASLEEP = 10
+NM_STATE_ASLEEP_LIST = [NM_STATE_ASLEEP_OLD,
+                        NM_STATE_ASLEEP]
+NM_STATE_CONNECTING_OLD = 2
+NM_STATE_CONNECTING = 40
+NM_STATE_CONNECTING_LIST = [NM_STATE_CONNECTING_OLD,
+                            NM_STATE_CONNECTING]
+NM_STATE_CONNECTED_OLD = 3
+NM_STATE_CONNECTED_LOCAL = 50
+NM_STATE_CONNECTED_SITE = 60
+NM_STATE_CONNECTED_GLOBAL = 70
+# Specifically don't include local and site, as they won't let us get to server
+NM_STATE_CONNECTED_LIST = [NM_STATE_CONNECTED_OLD,
+                           NM_STATE_CONNECTED_GLOBAL]
+NM_STATE_DISCONNECTED_OLD = 4
+NM_STATE_DISCONNECTED = 20
+# For us, local and site connections are the same as diconnected
+NM_STATE_DISCONNECTED_LIST = [NM_STATE_DISCONNECTED_OLD,
+                              NM_STATE_DISCONNECTED,
+                              NM_STATE_CONNECTED_LOCAL,
+                              NM_STATE_CONNECTED_SITE]

=== modified file 'ubuntu_sso/networkstate/tests/test_linux.py'
--- ubuntu_sso/networkstate/tests/test_linux.py	2012-04-09 17:38:24 +0000
+++ ubuntu_sso/networkstate/tests/test_linux.py	2012-04-23 16:23:20 +0000
@@ -1,9 +1,5 @@
 # -*- coding: utf-8 -*-
 #
-# test_networkstate - tests for ubuntu_sso.networkstate
-#
-# Author: Alejandro J. Cura <[e-mail]>
-#
 # Copyright 2010-2012 Canonical Ltd.
 #
 # This program is free software: you can redistribute it and/or modify it
@@ -42,13 +38,10 @@
     linux,
     NetworkFailException,
     NetworkManagerState,
+)
+
+from ubuntu_sso.networkstate.networkstates import (
     ONLINE, OFFLINE, UNKNOWN,
-)
-
-from ubuntu_sso.networkstate.linux import  (is_machine_connected,
-    DBUS_UNKNOWN_SERVICE,
-    NM_DBUS_INTERFACE,
-    NM_DBUS_OBJECTPATH,
     NM_STATE_ASLEEP,
     NM_STATE_ASLEEP_OLD,
     NM_STATE_CONNECTING,
@@ -62,6 +55,12 @@
     NM_STATE_UNKNOWN,
 )
 
+from ubuntu_sso.networkstate.linux import  (is_machine_connected,
+    DBUS_UNKNOWN_SERVICE,
+    NM_DBUS_INTERFACE,
+    NM_DBUS_OBJECTPATH,
+)
+
 
 class TestException(Exception):
     """An exception to test error conditions."""

=== modified file 'ubuntu_sso/qt/__init__.py'
--- ubuntu_sso/qt/__init__.py	2012-04-09 17:38:24 +0000
+++ ubuntu_sso/qt/__init__.py	2012-04-23 16:23:20 +0000
@@ -28,6 +28,7 @@
 # files in the program, then also delete it here.
 """The Qt graphical interface for the Ubuntu Single Sign On Client."""
 
+import sys
 import collections
 
 from PyQt4 import QtGui, QtCore
@@ -46,6 +47,12 @@
 TITLE_STYLE = u'<span style="font-size:xx-large;font-weight:bold;">%s</span>'
 WINDOW_TITLE = 'Ubuntu Single Sign On'
 
+# TODO: There is a pixel discrepancy between Qt on Linux and Windows
+# and Mac OS X. On Mac OS X, one test fails with the height being
+# off. For now, we're forcing a different UI height on darwin.
+if sys.platform == 'darwin':
+    PREFERED_UI_SIZE['height'] = 533
+
 
 # Based on the gtk implementation
 def build_general_error_message(errordict):

=== modified file 'ubuntu_sso/qt/main/__init__.py'
--- ubuntu_sso/qt/main/__init__.py	2012-04-09 17:38:24 +0000
+++ ubuntu_sso/qt/main/__init__.py	2012-04-23 16:23:20 +0000
@@ -41,7 +41,7 @@
 
 
 # Invalid name "source", pylint: disable=C0103
-if sys.platform == 'win32':
+if sys.platform in ('win32', 'darwin'):
     from ubuntu_sso.qt.main import windows
     source = windows
 else:

=== modified file 'ubuntu_sso/utils/__init__.py'
--- ubuntu_sso/utils/__init__.py	2012-04-09 17:38:24 +0000
+++ ubuntu_sso/utils/__init__.py	2012-04-23 16:23:20 +0000
@@ -47,8 +47,12 @@
 BIN_SUFFIX = 'bin'
 DATA_SUFFIX = 'data'
 
-if sys.platform == "win32":
-    from ubuntu_sso.utils import windows as source
+if sys.platform in ('win32', 'darwin'):
+    from ubuntu_sso.utils import qtwisted as source
+    qss_map = {'win32': ':/windows.qss',
+               'darwin': ':/darwin.qss',
+               }
+    source.PLATFORM_QSS = qss_map[sys.platform]
 else:
     from ubuntu_sso.utils import linux as source
 PLATFORM_QSS = source.PLATFORM_QSS

=== renamed file 'ubuntu_sso/utils/windows.py' => 'ubuntu_sso/utils/qtwisted.py'
--- ubuntu_sso/utils/windows.py	2012-04-09 17:38:24 +0000
+++ ubuntu_sso/utils/qtwisted.py	2012-04-23 16:23:20 +0000
@@ -26,9 +26,7 @@
 # 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.
-"""Platform specific constants and functions (for Windows)."""
-
-PLATFORM_QSS = ":/windows.qss"
+"""Platform specific constants and functions (for Qt/Twisted)."""
 
 from twisted.internet import defer
 from PyQt4.QtCore import QThread, QCoreApplication

=== renamed file 'ubuntu_sso/utils/tests/test_windows.py' => 'ubuntu_sso/utils/tests/test_qtwisted.py'
--- ubuntu_sso/utils/tests/test_windows.py	2012-04-09 17:38:24 +0000
+++ ubuntu_sso/utils/tests/test_qtwisted.py	2012-04-23 16:23:20 +0000
@@ -33,7 +33,7 @@
 from twisted.internet import defer
 from twisted.trial.unittest import TestCase
 
-from ubuntu_sso.utils.windows import qtDeferToThread
+from ubuntu_sso.utils.qtwisted import qtDeferToThread
 
 
 class FakeException(Exception):