Merge lp:~mvo/ubiquity/ssologin into lp:ubiquity

[Michael Vogt]

This branch adds a "Ubuntu ONE" login page to the install and moves the oauth token into the users login keyring.

At this point its WIP and what is still missing is:
- a API for registering new users without a capture (or with a delayed capture)
- approval for the UI design
- the lp:~mvo/+junk/cli-sso-login helper binary must go into a package (like ubuntu-sso-login)
- review from a ubiquity developer to get all the ubiquity details right
- kill(?) plugin-viewer, I mostly used it to explore the system

But its work for existing logins and the token get added to the users login keyring.

[Michael Vogt (mvo)]

I think the branch is at a point where a first tentative review from a ubiquity developer would be nice to get a idea if it fits well enough into ubiquity or if it needs refactor there. I expect some UI tweaks when the final design is there, but that should all be relatively contained.

[Stéphane Graber (stgraber)]

Some comments:
 - You appear to have a duplicate ubiquity/text/ubuntuone_heading_label entry in the debconf template.
 - KEYRING_FILE shouldn't hardcode the live username as the livefs username changes depending on the flavour or casper configuration.
 - I'm surprised not to see any added dependencies to debian/control? Does ubiquity already depend on gnome-keyring and the other libraries you're using?

A few more thoughts:
 - Did you test your plugin in pre-seeded "automatic" mode? My guess is that it should be skipped in such case.
 - What happens when the user reinstalls the system (keeping /home intact) instead of doing a clean install?

I must admit having only very quickly read through the code, so there very well may be more

[lp:~mvo/ubiquity/ssologin]

5806. By Michael Vogt on 2012-12-04

debian/ubiquity.templates: remove duplicated ubiquity/text/ubuntuone_heading_label - thanks Stephane

5807. By Michael Vogt on 2012-12-04

do not hardcode KEYRING_FILE but get from uid 999 instead, thanks to Stephane

5808. By Michael Vogt on 2012-12-04

skip copy of the keyring if the target path is already there, thanks to Stephane

5809. By Michael Vogt on 2012-12-04

ubiquity/plugins/ubi-ubuntuone.py: do not create the page if in UBIQUITY_AUTOMATIC mode (or if the user has UBIQUITY_NO_SSO set). also skip if GnomeKeyring can not be imported

[Michael Vogt (mvo)]

Thanks a lot Stephane!

that is very helpful feedback and I addressed the points you raised now.

The only thing I'm unsure about is the dependencies. Right now the regular ubuntu desktop CD has
everything needed and I'm not sure what the policy should be for the other desktop environments, i.e.
I don't know if xubuntu has a gnome-keyring-daemon and if so if they want to integrate with ubuntusso.
So I changed the code to simply skip the page if "from gi.repository import GnomeKeyring" fails.

[Michael Vogt (mvo)]

Setting back to WIP based on the recent discussions around if this actually should be part of the installer of if it should go in as a first-run wizard.

=== modified file 'debian/ubiquity.templates'
--- debian/ubiquity.templates	2012-10-19 14:27:05 +0000
+++ debian/ubiquity.templates	2012-12-04 15:21:26 +0000
@@ -149,6 +149,22 @@
 Type: text
 _Description: Take Photo
 
+Template: ubiquity/text/ubuntuone_heading_label
+Type: text
+_Description: Setup Ubuntu ONE
+
+Template: ubiquity/text/error_register
+Type: text
+_Description: Error registering account
+
+Template: ubiquity/text/error_login
+Type: text
+_Description: Error loging into the account
+
+Template: ubiquity/text/email_inactive_label
+Type: text
+_Description: Enter your E-Mail address
+
 Template: ubiquity/text/fullname_label
 Type: text
 _Description: Your name:

=== added file 'gui/gtk/stepUbuntuOne.ui'
--- gui/gtk/stepUbuntuOne.ui	1970-01-01 00:00:00 +0000
+++ gui/gtk/stepUbuntuOne.ui	2012-12-04 15:21:26 +0000
@@ -0,0 +1,451 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <!-- interface-requires gtk+ 3.0 -->
+  <object class="GtkBox" id="stepUbuntuOne">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="orientation">vertical</property>
+    <child>
+      <object class="GtkNotebook" id="notebook_main">
+        <property name="visible">True</property>
+        <property name="can_focus">True</property>
+        <property name="show_border">False</property>
+        <child>
+          <object class="GtkAlignment" id="alignment3">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="top_padding">6</property>
+            <property name="bottom_padding">6</property>
+            <property name="left_padding">6</property>
+            <property name="right_padding">6</property>
+            <child>
+              <object class="GtkBox" id="box2">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="orientation">vertical</property>
+                <property name="spacing">18</property>
+                <child>
+                  <object class="GtkLabel" id="label4">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="xalign">0</property>
+                    <property name="label" translatable="yes">Ubuntu ONE</property>
+                    <attributes>
+                      <attribute name="weight" value="bold"/>
+                    </attributes>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="label10">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="xalign">0</property>
+                    <property name="label" translatable="yes">Ubuntu ONE allows you to store, share  and sync your files accross multiple plattforms...</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkGrid" id="grid1">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="row_spacing">6</property>
+                    <property name="column_spacing">6</property>
+                    <child>
+                      <object class="GtkEntry" id="entry_email">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="invisible_char">•</property>
+                        <property name="invisible_char_set">True</property>
+                        <signal name="changed" handler="info_loop" swapped="no"/>
+                      </object>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="top_attach">0</property>
+                        <property name="width">1</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="label6">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes">Your E-Mail:</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">0</property>
+                        <property name="width">1</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="label11">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes">Password:</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">1</property>
+                        <property name="width">1</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="label12">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes">Password:</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">2</property>
+                        <property name="width">1</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkEntry" id="entry_new_password">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="visibility">False</property>
+                        <property name="invisible_char">•</property>
+                        <signal name="changed" handler="info_loop" swapped="no"/>
+                      </object>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="top_attach">1</property>
+                        <property name="width">1</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkEntry" id="entry_new_password2">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="visibility">False</property>
+                        <property name="invisible_char">•</property>
+                        <signal name="changed" handler="info_loop" swapped="no"/>
+                      </object>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="top_attach">2</property>
+                        <property name="width">1</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">2</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkBox" id="box4">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="orientation">vertical</property>
+                    <property name="spacing">12</property>
+                    <child>
+                      <object class="GtkBox" id="box1">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <child>
+                          <object class="GtkLinkButton" id="linkbutton_have_account">
+                            <property name="label" translatable="yes">I'm already a registered user</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">True</property>
+                            <property name="has_tooltip">True</property>
+                            <property name="relief">none</property>
+                            <signal name="clicked" handler="on_button_have_account_clicked" swapped="no"/>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <placeholder/>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkBox" id="box5">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <child>
+                          <object class="GtkLinkButton" id="linkbutton_skip_account">
+                            <property name="label" translatable="yes">Skip this step</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">True</property>
+                            <property name="has_tooltip">True</property>
+                            <property name="relief">none</property>
+                            <signal name="clicked" handler="on_button_skip_account_clicked" swapped="no"/>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <placeholder/>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">3</property>
+                  </packing>
+                </child>
+              </object>
+            </child>
+          </object>
+        </child>
+        <child type="tab">
+          <object class="GtkLabel" id="label1">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="label" translatable="yes">page 1</property>
+          </object>
+          <packing>
+            <property name="tab_fill">False</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkAlignment" id="alignment4">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="top_padding">12</property>
+            <property name="bottom_padding">12</property>
+            <property name="left_padding">12</property>
+            <property name="right_padding">12</property>
+            <child>
+              <object class="GtkBox" id="box6">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="orientation">vertical</property>
+                <property name="spacing">12</property>
+                <child>
+                  <object class="GtkLabel" id="label5">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="xalign">0</property>
+                    <property name="label" translatable="yes">Connect to Ubuntu ONE</property>
+                    <attributes>
+                      <attribute name="weight" value="bold"/>
+                    </attributes>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkAlignment" id="alignment1">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="yalign">1</property>
+                    <property name="xscale">0.5</property>
+                    <property name="yscale">0.5</property>
+                    <child>
+                      <object class="GtkGrid" id="grid2">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="column_spacing">6</property>
+                        <child>
+                          <object class="GtkEntry" id="entry_existing_email">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="invisible_char">•</property>
+                            <property name="invisible_char_set">True</property>
+                            <signal name="changed" handler="info_loop" swapped="no"/>
+                          </object>
+                          <packing>
+                            <property name="left_attach">1</property>
+                            <property name="top_attach">0</property>
+                            <property name="width">1</property>
+                            <property name="height">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkEntry" id="entry_existing_password">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="visibility">False</property>
+                            <property name="invisible_char">•</property>
+                            <property name="invisible_char_set">True</property>
+                            <signal name="changed" handler="info_loop" swapped="no"/>
+                          </object>
+                          <packing>
+                            <property name="left_attach">1</property>
+                            <property name="top_attach">1</property>
+                            <property name="width">1</property>
+                            <property name="height">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkLabel" id="label8">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="label" translatable="yes">E-Mail:</property>
+                          </object>
+                          <packing>
+                            <property name="left_attach">0</property>
+                            <property name="top_attach">0</property>
+                            <property name="width">1</property>
+                            <property name="height">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkLabel" id="label9">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="label" translatable="yes">Password:</property>
+                          </object>
+                          <packing>
+                            <property name="left_attach">0</property>
+                            <property name="top_attach">1</property>
+                            <property name="width">1</property>
+                            <property name="height">1</property>
+                          </packing>
+                        </child>
+                      </object>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkBox" id="box3">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <child>
+                      <object class="GtkLinkButton" id="linkbutton_need_account">
+                        <property name="label" translatable="yes">I need to create a new account</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">True</property>
+                        <property name="has_tooltip">True</property>
+                        <property name="relief">none</property>
+                        <signal name="clicked" handler="on_button_need_account_clicked" swapped="no"/>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <placeholder/>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">2</property>
+                  </packing>
+                </child>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child type="tab">
+          <object class="GtkLabel" id="label2">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="label" translatable="yes">page 2</property>
+          </object>
+          <packing>
+            <property name="position">1</property>
+            <property name="tab_fill">False</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkAspectFrame" id="aspectframe1">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="label_xalign">0</property>
+            <property name="shadow_type">none</property>
+            <child>
+              <object class="GtkSpinner" id="spinner_connect">
+                <property name="height_request">32</property>
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="position">2</property>
+          </packing>
+        </child>
+        <child type="tab">
+          <object class="GtkLabel" id="label3">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="label" translatable="yes">page 3</property>
+          </object>
+          <packing>
+            <property name="position">2</property>
+            <property name="tab_fill">False</property>
+          </packing>
+        </child>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="fill">True</property>
+        <property name="position">0</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkLabel" id="label_global_error">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="xalign">0</property>
+        <property name="xpad">12</property>
+        <property name="ypad">12</property>
+        <property name="label" translatable="yes">error label</property>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="fill">True</property>
+        <property name="position">1</property>
+      </packing>
+    </child>
+    <child>
+      <placeholder/>
+    </child>
+  </object>
+</interface>

=== added file 'plugin-viewer-gtk.py'
--- plugin-viewer-gtk.py	1970-01-01 00:00:00 +0000
+++ plugin-viewer-gtk.py	2012-12-04 15:21:26 +0000
@@ -0,0 +1,87 @@
+#!/usr/bin/python3
+
+import os
+import sys
+
+from gi.repository import Gtk
+
+# we could use this as the base for the MockController as well
+#   from ubiquity.frontend.base import Controller
+
+
+class MockController(object):
+
+    def __init__(self, parent):
+        self.parent = parent
+        self.oem_user_config = None
+        self.oem_config = None
+        self.dbfilter = None
+        self._allow_go_foward = True
+        self._allow_go_backward = True
+
+    def go_forward(self):
+        self.parent.button_next.clicked()
+
+    def get_string(self, s, lang):
+        return "get_string: %s (lang=%s)" % (s, lang)
+
+    def add_builder(self, builder):
+        pass
+
+    def allow_go_forward(self, v):
+        self._allow_go_forward = v
+        self.parent.button_next.set_sensitive(v)
+
+    def allow_go_backward(self, v):
+        self._allow_go_backward = v
+        self.parent.button_back.set_sensitive(v)
+
+
+if __name__ == "__main__":
+    """ Run with:
+    ./plugin-viewer-gtk.py ubi-ubuntuone
+    """
+    def _on_button_next_clicked(button):
+        stop = page_gtk.plugin_on_next_clicked()
+        if not stop:
+            Gtk.main_quit()
+
+    # setup env
+    for envvar, path in (
+            ("UBIQUITY_PLUGIN_PATH", "./ubiquity/plugins"),
+            ("UBIQUITY_GLADE", "./gui/gtk")):
+        if os.path.exists(path):
+            os.environ[envvar] = path
+    # ... and then import the plugin_manager
+    from ubiquity.plugin_manager import load_plugin
+
+    plugin_name = sys.argv[1]
+    plugin_module = load_plugin(plugin_name)
+
+    win = Gtk.Window()
+    win.button_next = Gtk.Button("next")
+    win.button_back = Gtk.Button("back")
+
+    mock_controller = MockController(win)
+    page_gtk = plugin_module.PageGtk(mock_controller)
+    page_gtk.plugin_translate("en")
+
+    win.button_next.connect(
+        "clicked", _on_button_next_clicked)
+    win.button_back.connect(
+        "clicked", lambda b: page_gtk.plugin_on_back_clicked())
+
+    button_box = Gtk.ButtonBox(spacing=12)
+    button_box.set_layout(Gtk.ButtonBoxStyle.END)
+    button_box.pack_start(win.button_back, True, True, 6)
+    button_box.pack_start(win.button_next, True, True, 6)
+
+    box = Gtk.VBox()
+    box.pack_start(page_gtk.page, True, True, 6)
+    box.pack_start(button_box, True, True, 6)
+
+    win.add(box)
+    win.connect("destroy", Gtk.main_quit)
+    win.show_all()
+
+    Gtk.main()

=== modified file 'scripts/plugininstall.py'
--- scripts/plugininstall.py	2012-11-22 16:27:21 +0000
+++ scripts/plugininstall.py	2012-12-04 15:21:26 +0000
@@ -312,9 +312,8 @@
 
         self.db.progress('SET', self.end)
 
-    def configure_face(self):
-        PHOTO_PATH = '/var/lib/ubiquity/webcam_photo.png'
-        target_user = self.db.get('passwd/username')
+    def _get_uid_gid_on_target(self, target_user):
+        """Helper that gets the uid/gid of the username in the target chroot"""
         uid = subprocess.Popen(
             ['chroot', self.target, 'sudo', '-u', target_user, '--',
              'id', '-u'], stdout=subprocess.PIPE, universal_newlines=True)
@@ -327,8 +326,14 @@
             uid = int(uid)
             gid = int(gid)
         except ValueError:
-            return
-        if os.path.exists(PHOTO_PATH):
+            return (None, None)
+        return uid, gid
+
+    def configure_face(self):
+        PHOTO_PATH = '/var/lib/ubiquity/webcam_photo.png'
+        target_user = self.db.get('passwd/username')
+        uid, gid = self._get_uid_gid_on_target(target_user)
+        if os.path.exists(PHOTO_PATH) and uid and gid:
             targetpath = self.target_file('home', target_user, '.face')
             shutil.copy2(PHOTO_PATH, targetpath)
             os.lchown(targetpath, uid, gid)

=== added file 'scripts/ubuntuone-keyring-helper'
--- scripts/ubuntuone-keyring-helper	1970-01-01 00:00:00 +0000
+++ scripts/ubuntuone-keyring-helper	2012-12-04 15:21:26 +0000
@@ -0,0 +1,31 @@
+#!/usr/bin/python
+
+import os
+import syslog
+import sys
+
+from gi.repository import GnomeKeyring, GLib
+
+if __name__ == "__main__":
+
+    if not "DBUS_SESSION_BUS_ADDRESS" in os.environ:
+        os.environ["DBUS_SESSION_BUS_ADDRESS"] = "autolaunch:"
+
+    password = sys.stdin.readline().strip("\n")
+    token = sys.stdin.readline().strip("\n")
+
+    # we create the keyring using the users login password
+    KEYRING_NAME = "login"
+    TOKEN_NAME = "Ubuntu one"
+    res = GnomeKeyring.create_sync(KEYRING_NAME, password)
+    if res == GnomeKeyring.Result.OK:
+        res = GnomeKeyring.item_create_sync(
+            KEYRING_NAME,
+            GnomeKeyring.ItemType.GENERIC_SECRET,
+            TOKEN_NAME,
+            GLib.Array(),
+            token,
+            True)
+        syslog.syslog("failed to create item '%s': %s" % (TOKEN_NAME, res))
+    else:
+        syslog.syslog("failed to create keyring '%s': %s" % (KEYRING_NAME, res))

=== added file 'tests/test_ubi_ubuntuone.py'
--- tests/test_ubi_ubuntuone.py	1970-01-01 00:00:00 +0000
+++ tests/test_ubi_ubuntuone.py	2012-12-04 15:21:26 +0000
@@ -0,0 +1,144 @@
+#!/usr/bin/python3
+
+import tempfile
+import unittest
+
+import mock
+from gi.repository import Gtk, GObject, GLib
+
+from ubiquity import plugin_manager
+
+
+ubi_ubuntuone = plugin_manager.load_plugin('ubi-ubuntuone')
+
+
+class BaseTestPageGtk(unittest.TestCase):
+
+    def setUp(self):
+        mock_controller = mock.Mock()
+        self.page = ubi_ubuntuone.PageGtk(mock_controller, ui=mock.Mock())
+
+
+class TestPageGtk(BaseTestPageGtk):
+
+    def test_ui_visible(self):
+        self.page.plugin_get_current_page()
+        self.assertTrue(self.page.entry_email.get_property("visible"))
+
+    def test_init_ui(self):
+        self.page.plugin_get_current_page()
+        self.assertEqual(
+            self.page.notebook_main.get_current_page(),
+            ubi_ubuntuone.PAGE_REGISTER)
+
+    def test_switch_pages(self):
+        self.page.plugin_get_current_page()
+        self.page.linkbutton_have_account.clicked()
+        self.assertEqual(
+            self.page.notebook_main.get_current_page(),
+            ubi_ubuntuone.PAGE_LOGIN)
+        self.page.linkbutton_need_account.clicked()
+        self.assertEqual(
+            self.page.notebook_main.get_current_page(),
+            ubi_ubuntuone.PAGE_REGISTER)
+
+    def test_verify_email_entry(self):
+        self.assertFalse(self.page._verify_email_entry("meep"))
+        self.assertTrue(self.page._verify_email_entry("[e-mail]"))
+
+    def test_verify_password_entry(self):
+        self.assertFalse(self.page._verify_password_entry(""))
+        self.assertTrue(self.page._verify_password_entry("xxx"))
+
+
+class MockSSOTestCase(BaseTestPageGtk):
+
+    class MockUbuntuSSO():
+
+        TOKEN = "{'token': 'nonex'}"
+
+        def mock_done(self, callback, errback, data):
+            callback(self.TOKEN, data)
+            Gtk.main_quit()
+
+        def register(self, email, passw, callback, errback, data):
+            GObject.idle_add(self.mock_done, callback, errback, data)
+
+        def login(self, email, passw, callback, errback, data):
+            GObject.idle_add(self.mock_done, callback, errback, data)
+
+    def test_click_next(self):
+        self.page.ubuntu_sso = self.MockUbuntuSSO()
+        with mock.patch.object(
+                self.page, "_create_keyring_and_store_u1_token") as m_create:
+            self.page.plugin_on_next_clicked()
+            self.assertEqual(self.page.notebook_main.get_current_page(),
+                             ubi_ubuntuone.PAGE_SPINNER)
+            m_create.assert_called_with(self.page.ubuntu_sso.TOKEN)
+
+
+class RegisterTestCase(BaseTestPageGtk):
+
+    def test_register_allow_go_forward_not_yet(self):
+        self.page.entry_email.set_text("foo")
+        self.page.controller.allow_go_forward.assert_called_with(False)
+
+    def test_register_allow_go_foward(self):
+        self.page.entry_email.set_text("[e-mail]")
+        self.page.entry_new_password.set_text("pw")
+        self.page.entry_new_password2.set_text("pw")
+        self.page.controller.allow_go_forward.assert_called_with(True)
+
+
+class LoginTestCase(BaseTestPageGtk):
+
+    def test_login_allow_go_forward_not_yet(self):
+        self.page.entry_existing_email.set_text("foo")
+        self.page.entry_existing_password.set_text("pass")
+        self.page.controller.allow_go_forward.assert_called_with(False)
+
+    def test_login_allow_go_foward(self):
+        self.page.linkbutton_have_account.clicked()
+        self.page.entry_existing_email.set_text("[e-mail]")
+        self.page.entry_existing_password.set_text("pass")
+        self.page.controller.allow_go_forward.assert_called_with(True)
+
+
+class UbuntuSSOHelperTestCase(unittest.TestCase):
+
+    def setUp(self):
+        self.callback = mock.Mock()
+        self.callback.side_effect = lambda *args: self.loop.quit()
+        self.errback = mock.Mock()
+        self.errback.side_effect = lambda *args: self.loop.quit()
+        self.loop = GLib.MainLoop(GLib.main_context_default())
+        self.sso_helper = ubi_ubuntuone.UbuntuSSO()
+
+    def test_spawning_error(self):
+        self.sso_helper.login("[e-mail]", "nopass",
+                              self.callback, self.errback)
+        self.loop.run()
+        self.assertTrue(self.errback.called)
+        self.assertFalse(self.callback.called)
+
+    def test_spawning_success(self):
+        self.sso_helper.BINARY = "/bin/echo"
+        self.sso_helper.login("[e-mail]", "nopass",
+                              self.callback, self.errback, data="data")
+        self.loop.run()
+        self.assertFalse(self.errback.called)
+        self.assertTrue(self.callback.called)
+        # ensure stdout is captured and data is also send
+        self.callback.assert_called_with("--login [e-mail]\n", "data")
+
+
+if __name__ == '__main__':
+    # run tests in a sourcetree with:
+    """
+    UBIQUITY_GLADE=./gui/gtk \
+    UBIQUITY_PLUGIN_PATH=./ubiquity/plugins/ \
+    PYTHONPATH=. python3 tests/test_ubi_ubuntuone.py
+    """
+    #from test.support import run_unittest
+    # run_unittest()
+    unittest.main()

=== modified file 'ubiquity/gtkwidgets.py'
--- ubiquity/gtkwidgets.py	2012-11-27 05:48:42 +0000
+++ ubiquity/gtkwidgets.py	2012-12-04 15:21:26 +0000
@@ -2,7 +2,7 @@
 
 import cairo
 from gi.repository import Gtk, Gdk, GObject, Pango
-from gi.repository import UbiquityWebcam, GdkPixbuf
+from gi.repository import GdkPixbuf
 
 from ubiquity import misc
 
@@ -383,7 +383,11 @@
         self.photo_label = Gtk.Label('Take a photo:')
         vb_left.pack_start(self.photo_label, False, False, 0)
         f = Gtk.Frame()
+
+        # import here because mvo is too lazy to build the tree
+        from gi.repository import UbiquityWebcam
         self.webcam = UbiquityWebcam.Webcam()
+
         self.webcam.connect('image-captured', self.image_captured)
         f.add(self.webcam)
         vb_left.pack_start(f, True, True, 0)

=== added file 'ubiquity/plugins/ubi-ubuntuone.py'
--- ubiquity/plugins/ubi-ubuntuone.py	1970-01-01 00:00:00 +0000
+++ ubiquity/plugins/ubi-ubuntuone.py	2012-12-04 15:21:26 +0000
@@ -0,0 +1,378 @@
+# -*- coding: utf-8; Mode: Python; indent-tabs-mode: nil; tab-width: 4 -*-
+
+# Copyright (C) 2012 Canonical Ltd.
+# Written by Michael Vogt <[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; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY 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, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+import pwd
+import re
+import os
+import os.path
+import subprocess
+import shutil
+import syslog
+
+from ubiquity import plugin, misc
+
+
+NAME = 'ubuntuone'
+AFTER = 'usersetup'
+WEIGHT = 10
+
+(PAGE_REGISTER,
+ PAGE_LOGIN,
+ PAGE_SPINNER,
+ ) = range(3)
+
+# TODO:
+#  - network awareness (steal from timezone map page)
+#  - rename this all to ubuntu sso instead of ubuntuone to avoid confusion
+#    that we force people to sign up for payed services on install (?) where
+#    what we want is to make it super simple to use our services
+#  - take the username from the usersetup step when creating the token
+#  - get a design for the UI
+#    * to create a new account
+#    * to login into a existing account
+#    * deal with forgoten passwords
+#    * skip account creation
+
+
+# TESTING end-to-end for real
+#
+# * get a raring cdimage
+# * run:
+#    kvm -m 1500 -hda /path/to/random-image -cdrom /path/to/raring-arch.iso \
+#        -boot d
+# * in the VM:
+#   - add universe
+#   - sudo apt-get install bzr build-essential python3-setuptools debhelper python3-piston-mini-client
+#   - bzr co lp:~mvo/+junk/cli-sso-login
+#   - (cd cli-sso-login; dpkg-buildpackage; sudo dpkg -i ../python3*.deb)
+#
+#   - install cli-sso-login from 
+#   - bzr co --lightweight lp:~mvo/ubiquity/ssologin
+#   - cd ssologin
+#   - sudo cp ubiquity/plugins/* /usr/lib/ubiquity/plugins
+#   - sudo cp ubiquity/* /usr/lib/ubiquity/ubiquity
+#   - sudo cp gui/gtk//*.ui /usr/share/ubiquity/gtk
+#   - sudo cp scripts/* /usr/share/ubiquity/
+#   - sudo cp bin/ubiquity /usr/bin
+#   - sudo ubiquity
+
+
+class UbuntuSSO(object):
+
+    # this will need the helper
+    #   lp:~mvo/+junk/cli-sso-login installed
+
+    BINARY = "/usr/bin/ubuntu-sso-cli"
+
+    def _child_exited(self, pid, status, data):
+        stdin_fd, stdout_fd, stderr_fd, callback, errback, user_data = data
+        exit_code = os.WEXITSTATUS(status)
+        # the delayed reading will only work if the amount of data is
+        # small enough to not cause the pipe to block which on most
+        # system is ok as "ulimit -p" shows 8 pages by default (4k)
+        stdout = os.read(stdout_fd, 2048).decode("utf-8")
+        stderr = os.read(stderr_fd, 2048).decode("utf-8")
+        if exit_code == 0:
+            callback(stdout, user_data)
+        else:
+            errback(stderr, user_data)
+
+    def _spawn_sso_helper(self, cmd, password, callback, errback, data):
+        from gi.repository import GLib
+        res, pid, stdin_fd, stdout_fd, stderr_fd = GLib.spawn_async_with_pipes(
+            "/", cmd, None,
+            (GLib.SpawnFlags.LEAVE_DESCRIPTORS_OPEN |
+             GLib.SpawnFlags.DO_NOT_REAP_CHILD), None, None)
+        if res:
+            os.write(stdin_fd, password.encode("utf-8"))
+            os.write(stdin_fd, "\n".encode("utf-8"))
+            GLib.child_watch_add(
+                GLib.PRIORITY_DEFAULT, pid, self._child_exited,
+                (stdin_fd, stdout_fd, stderr_fd, callback, errback, data))
+        else:
+            errback("Failed to spawn %s" % cmd, data)
+
+    def login(self, email, password, callback, errback, data=None):
+        cmd = [self.BINARY, "--login", email]
+        self._spawn_sso_helper(cmd, password, callback, errback, data)
+
+    def register(self, email, password, callback, errback, data=None):
+        cmd = [self.BINARY, "--register", email]
+        self._spawn_sso_helper(cmd, password, callback, errback, data)
+
+
+class Page(plugin.Plugin):
+
+    def prepare(self, unfiltered=False):
+        self.ui._user_password = self.db.get('passwd/user-password')
+        return plugin.Plugin.prepare(unfiltered)
+
+
+class PageGtk(plugin.PluginUI):
+    plugin_title = 'ubiquity/text/ubuntuone_heading_label'
+
+    def __init__(self, controller, *args, **kwargs):
+        from gi.repository import Gtk
+        self.controller = controller
+        # check if we are needed at all
+        if ('UBIQUITY_AUTOMATIC' in os.environ or
+                'UBIQUITY_NO_SSO' in os.environ):
+            self.page = None
+            return
+        # check dependencies
+        try:
+            from gi.repository import GnomeKeyring
+            assert(GnomeKeyring)
+        except ImportError as e:
+            syslog.syslog("skipping SSO page, no GnomeKeyring (%s)" % e)
+            self.page = None
+            return
+        # add builder/signals
+        builder = Gtk.Builder()
+        self.controller.add_builder(builder)
+        builder.add_from_file(
+            os.path.join(os.environ['UBIQUITY_GLADE'], 'stepUbuntuOne.ui'))
+        builder.connect_signals(self)
+        # make the widgets available under their gtkbuilder name
+        for obj in builder.get_objects():
+            if issubclass(type(obj), Gtk.Buildable):
+                setattr(self, Gtk.Buildable.get_name(obj), obj)
+        self.page = builder.get_object('stepUbuntuOne')
+        self.notebook_main.set_show_tabs(False)
+        self.plugin_widgets = self.page
+        self.oauth_token = None
+        self.skip_step = False
+        self.online = False
+        self.label_global_error.set_text("")
+        # the worker
+        self.ubuntu_sso = UbuntuSSO()
+        self.info_loop(None)
+
+    def plugin_set_online_state(self, state):
+        self.online = state
+
+    def plugin_get_current_page(self):
+        self.page.show_all()
+        self.notebook_main.set_current_page(PAGE_REGISTER)
+        return self.page
+
+    def plugin_on_back_clicked(self):
+        # stop whatever needs stopping
+        return False
+
+    def plugin_on_next_clicked(self):
+        from gi.repository import Gtk
+        if self.skip_step:
+            return False
+        if self.notebook_main.get_current_page() == PAGE_REGISTER:
+            self.ubuntu_sso.register(self.entry_email.get_text(),
+                                     self.entry_new_password.get_text(),
+                                     callback=self._ubuntu_sso_callback,
+                                     errback=self._ubuntu_sso_errback,
+                                     data=PAGE_REGISTER)
+        elif self.notebook_main.get_current_page() == PAGE_LOGIN:
+            self.ubuntu_sso.login(self.entry_existing_email.get_text(),
+                                  self.entry_existing_password.get_text(),
+                                  callback=self._ubuntu_sso_callback,
+                                  errback=self._ubuntu_sso_errback,
+                                  data=PAGE_LOGIN)
+        else:
+            raise AssertionError("Should never be reached happen")
+
+        self.notebook_main.set_current_page(PAGE_SPINNER)
+        self.spinner_connect.start()
+        # the ubuntu_sso.{login,register} will stop this loop when its done
+        Gtk.main()
+        self.spinner_connect.stop()
+
+        # if there is no token at this point, there is a error,
+        # so stop moving forward
+        if self.oauth_token is None:
+            return True
+
+        # all good, create a (encrypted) keyring and store the token for later
+        self._create_keyring_and_store_u1_token(self.oauth_token)
+        return False
+
+    def _create_keyring_and_store_u1_token(self, token):
+        """Helper that spawns a external helper to create the keyring"""
+        # this needs to be a external helper as ubiquity is running as
+        # root and it seems that anything other than "drop_all_privileges"
+        # will not trigger the correct dbus activation for the
+        # gnome-keyring daemon
+        #
+        # mvo: We could do this in the "install" phase too, but more fragile
+        #      I think, here is what would be required:
+        #      - copy over XAUTHORITY to /target/home/$targetuser/.Xauthority
+        #      - chown $targetuser.$targetuser \
+        #            /target/home/$targetuser/.Xauthority
+        #      - (bind)mount /proc in /target
+        #      - run "dbus-uuidgen --ensure" in /target to get a dbus 
+        #        machine-id
+        #      - run the helper with:
+        #        chroot /target sudo -u $targetuser HOME=/home/$targetuser \
+        #         XAUTHORITY=/home/$targetuser/.Xauthority \
+        #         DBUS_SESSION_BUS_ADDRESS="autolaunch:" \
+        #         ubuntuone-keyring-helper
+        #      - ensure that the dbus-daemon and gnome-keyring-daemon that
+        #        get spawned in /target get killed so that /target can
+        #        get unmounted again
+        #      - umount /proc
+        p = subprocess.Popen(
+            ["/usr/share/ubiquity/ubuntuone-keyring-helper"],
+            stdin=subprocess.PIPE,
+            preexec_fn=misc.drop_all_privileges,
+            universal_newlines=True)
+        p.stdin.write(self._user_password)
+        p.stdin.write("\n")
+        p.stdin.write(token)
+        p.stdin.write("\n")
+        res = p.wait()
+        syslog.syslog("keyring helper returned %s" % res)
+
+    def plugin_translate(self, lang):
+        pasw = self.controller.get_string('password_inactive_label', lang)
+        self.entry_new_password.set_placeholder_text(pasw)
+        self.entry_existing_password.set_placeholder_text(pasw)
+        pasw_again = self.controller.get_string(
+            'password_again_inactive_label', lang)
+        self.entry_new_password2.set_placeholder_text(pasw_again)
+        email_p = self.controller.get_string('email_inactive_label', lang)
+        self.entry_email.set_placeholder_text(email_p)
+        self.entry_existing_email.set_placeholder_text(email_p)
+        # error messages
+        self._error_register = self.controller.get_string(
+            'error_register', lang)
+        self._error_login = self.controller.get_string(
+            'error_login', lang)
+
+    # callbacks
+    def _ubuntu_sso_callback(self, oauth_token, data):
+        """Called when a oauth token was returned successfully"""
+        from gi.repository import Gtk
+        self.oauth_token = oauth_token
+        Gtk.main_quit()
+
+    def _ubuntu_sso_errback(self, error, data):
+        """Called when a error acquiring the oauth token from the helper"""
+        from gi.repository import Gtk
+        syslog.syslog("ubuntu sso failed: '%s'" % error)
+        self.notebook_main.set_current_page(data)
+        if data == PAGE_REGISTER:
+            err = self._error_register
+        else:
+            err = self._error_login
+        self.label_global_error.set_markup("<b><big>%s</big></b>" % err)
+        Gtk.main_quit()
+
+    # signals
+    def on_button_have_account_clicked(self, button):
+        self.notebook_main.set_current_page(PAGE_LOGIN)
+
+    def on_button_need_account_clicked(self, button):
+        self.notebook_main.set_current_page(PAGE_REGISTER)
+
+    def on_button_skip_account_clicked(self, button):
+        self.oauth_token = None
+        self.skip_step = True
+        self.controller.go_forward()
+
+    def _verify_email_entry(self, email):
+        """Return True if the email address looks valid"""
+        EMAIL_REGEXP = "[a-zA-Z]+@[a-zA-Z]+\.[a-zA-Z]+"
+        match = re.match(EMAIL_REGEXP, email)
+        return (match is not None)
+
+    def _verify_password_entry(self, password):
+        """Return True if there is a valid password"""
+        return len(password) > 0
+
+    def info_loop(self, widget):
+        """Run each time the user inputs something to make controlls
+           sensitive or insensitive
+        """
+        complete = False
+        if self.notebook_main.get_current_page() == PAGE_REGISTER:
+            email = self.entry_email.get_text()
+            password = self.entry_new_password.get_text()
+            password2 = self.entry_new_password2.get_text()
+            complete = (self._verify_email_entry(email) and
+                        len(password) > 0 and
+                        (password == password2))
+        elif self.notebook_main.get_current_page() == PAGE_LOGIN:
+            email = self.entry_existing_email.get_text()
+            password = self.entry_existing_password.get_text()
+            complete = (self._verify_email_entry(email) and
+                        self._verify_password_entry(password))
+        self.controller.allow_go_forward(complete)
+
+
+class Install(plugin.InstallPlugin):
+
+    def install(self, target, progress, *args, **kwargs):
+        self.configure_oauth_token(target)
+
+    def _get_target_uid(self, target_path, target_user):
+        # stolen from: plugininstall.py, is there a better way?
+        p = subprocess.Popen(
+            ['chroot', target_path, 'sudo', '-u', target_user, '--',
+             'id', '-u'], stdout=subprocess.PIPE, universal_newlines=True)
+        uid = int(p.communicate()[0].strip('\n'))
+        return uid
+
+    def _get_casper_user_keyring_file_path(self):
+        # stolen (again) from pluginstall.py
+        try:
+            casper_user = pwd.getpwuid(999).pw_name
+        except KeyError:
+            # We're on a weird system where the casper user isn't uid 999
+            # just stop there
+            return ""
+        casper_user_home = os.path.expanduser('~%s' % casper_user)
+        keyring_file = os.path.join(casper_user_home, ".local", "share",
+                                    "keyrings", "login.keyring")
+        return keyring_file
+
+    # XXX: I am untested
+    def configure_oauth_token(self, target):
+        target_user = self.db.get('passwd/username')
+        uid = self._get_target_uid(target, target_user)
+        keyring_file = self._get_casper_user_keyring_file_path()
+        if os.path.exists(keyring_file) and uid:
+            targetpath = os.path.join(
+                target, 'home', target_user, '.local', 'share', 'keyrings',
+                'login.keyring')
+            # skip copy if the target already exists, this can happen
+            # if e.g. the user selected reinstall-with-keep-home
+            if os.path.exists(targetpath):
+                syslog.syslog("keyring path: '%s' already exists, skip copy" %
+                              targetpath)
+                return
+            basedir = os.path.dirname(targetpath)
+            # ensure we have the basedir with the righ permissions
+            if not os.path.exists(basedir):
+                basedir_in_chroot = os.path.join(
+                    "home", target_user, ".local", "share", "keyrings")
+                subprocess.call(
+                    ["chroot", target,  "sudo", "-u", target_user, "--",
+                     "mkdir", "-p", basedir_in_chroot])
+            shutil.copy2(self.KEYRING_FILE, targetpath)
+            os.lchown(targetpath, uid, uid)
+            os.chmod(targetpath, 0o600)
+            os.chmod(basedir, 0o700)