Merge lp:~cjwatson/ubiquity/default-username-783295 into lp:ubiquity

[Colin Watson]

Strip invalid characters from default username (LP: #783295).

[Evan (ev)]

Looks good!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2012-03-20 19:47:50 +0000
+++ debian/changelog	2012-03-20 22:02:20 +0000
@@ -3,6 +3,7 @@
   [ Colin Watson ]
   * Fix misc.set_indicator_keymaps to handle ll_CC forms of lang, and also
     to avoid crashing on unknown languages in general (LP: #960047).
+  * Strip invalid characters from default username (LP: #783295).
 
   [ Oliver Grawert ]
   * add support for automatic-oem-config kernel commandline option to the

=== modified file 'tests/test_usersetup.py'
--- tests/test_usersetup.py	2012-03-19 21:19:23 +0000
+++ tests/test_usersetup.py	2012-03-20 22:02:20 +0000
@@ -114,3 +114,23 @@
         self.gtk.login_encrypt.set_active(True)
         self.gtk.on_authentication_toggled(self.gtk.login_encrypt)
         self.assertTrue(self.gtk.login_pass.get_active())
+
+    def test_default_username(self):
+        self.gtk.controller.get_string = mock_get_string
+        self.gtk.set_fullname('Example Person')
+        # Shortcut initialization
+        self.gtk.fullname.set_name('fullname')
+        self.gtk.username_edited = False
+        self.gtk.info_loop(self.gtk.fullname)
+        self.assertEqual('example', self.gtk.get_username())
+        self.assertUsernameErrors([], self.gtk.get_username())
+
+    def test_default_username_strips_invalid_characters(self):
+        self.gtk.controller.get_string = mock_get_string
+        self.gtk.set_fullname('&Foo!$ Bar!')
+        # Shortcut initialization
+        self.gtk.fullname.set_name('fullname')
+        self.gtk.username_edited = False
+        self.gtk.info_loop(self.gtk.fullname)
+        self.assertEqual('foo', self.gtk.get_username())
+        self.assertUsernameErrors([], self.gtk.get_username())

=== modified file 'ubiquity/plugins/ubi-usersetup.py'
--- ubiquity/plugins/ubi-usersetup.py	2012-02-22 02:04:29 +0000
+++ ubiquity/plugins/ubi-usersetup.py	2012-03-20 22:02:20 +0000
@@ -319,6 +319,8 @@
             new_username = misc.utf8(widget.get_text().split(' ')[0])
             new_username = new_username.encode('ascii', 'ascii_transliterate')
             new_username = new_username.lower()
+            new_username = re.sub('^[^a-z]+', '', new_username)
+            new_username = re.sub('[^-a-z0-9_]', '', new_username)
             self.username.set_text(new_username)
             self.username.handler_unblock(self.username_changed_id)
         elif (widget is not None and widget.get_name() == 'username' and