Merge lp:~mterry/user-setup/only-ascii-passwords into lp:~ubuntu-core-dev/user-setup/ubuntu

[Michael Terry]

[Colin Watson (cjwatson)]

Thanks for the branch. Can we send this to Debian instead, with
appropriate justification? Translation changes are expensive to
maintain locally in Ubuntu, and I would like to only do it when it's
absolutely necessary.

Before we merge this, I think comments 8 and 9 from the linked bug
report need to be addressed with specific information on things that go
wrong with non-ASCII passwords.

 review needs-info

review: Needs Information

Unmerged revisions

228. By Michael Terry on 2010-11-24

Don't allow user to enter a non-ascii character in oem-config's password
fields (LP: #495695)

227. By Colin Watson on 2010-10-04

releasing version 1.28ubuntu10

226. By Colin Watson on 2010-10-04

Fix syntax error introduced in 1.28ubuntu9.

225. By Oliver Grawert on 2010-10-02

adjust the dd command for zeroing out swapfiles

224. By Oliver Grawert on 2010-10-01

releasing version 1.28ubuntu9

223. By Oliver Grawert on 2010-10-01

make zeroing swap work also with swapfiles if encrypted home is selected Bug #646421

222. By Oliver Grawert on 2010-10-01

merge 16M blocksize for swap zeroing change from the package LP: #432422

221. By Evan on 2010-04-21

releasing version 1.28ubuntu7

220. By Evan on 2010-04-19

Allow forcing the encrypted home option (LP: #566552).

219. By Colin Watson on 2010-04-15

releasing version 1.28ubuntu6

=== modified file 'debian/changelog'
--- debian/changelog	2010-10-04 11:41:38 +0000
+++ debian/changelog	2010-11-24 15:56:22 +0000
@@ -1,3 +1,10 @@
+user-setup (1.28ubuntu11) natty; urgency=low
+
+  * Don't allow user to enter a non-ascii character in oem-config's password
+    fields (LP: #495695)
+
+ -- Debbie Beliveau <[e-mail]>  Wed, 24 Nov 2010 10:51:41 -0500
+
 user-setup (1.28ubuntu10) maverick; urgency=low
 
   * Fix syntax error introduced in 1.28ubuntu9.

=== modified file 'debian/po/templates.pot'
--- debian/po/templates.pot	2009-07-03 12:47:44 +0000
+++ debian/po/templates.pot	2010-11-24 15:56:22 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2009-07-03 13:45+0100\n"
+"POT-Creation-Date: 2009-12-10 17:31-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -347,3 +347,16 @@
 #: ../user-setup-udeb.templates:22001
 msgid "Check /var/log/syslog or see virtual console 4 for the details."
 msgstr ""
+
+#. Type: error
+#. Description
+#: ../user-setup-udeb.templates:23001
+msgid "Password input error"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../user-setup-udeb.templates:23001
+msgid "Invalid character in password. Please try again."
+msgstr ""
+

=== modified file 'debian/user-setup-udeb.templates'
--- debian/user-setup-udeb.templates	2010-04-19 16:59:35 +0000
+++ debian/user-setup-udeb.templates	2010-11-24 15:56:22 +0000
@@ -205,6 +205,12 @@
 Default: false
 Description: for internal use only
 
+# Error when non-ascii character is included in password
+Template: user-setup/password-not-ascii
+Type: error
+_Description: Password input error
+ Invalid character in password. Please try again.
+
 Template: user-setup/progress/wipe-swap
 Type: text
 _Description: Wiping swap space for security (this may take a while)...

=== modified file 'functions.sh'
--- functions.sh	2009-06-03 14:17:53 +0000
+++ functions.sh	2010-11-24 15:56:22 +0000
@@ -65,3 +65,12 @@
 	fi
 	[ "$(printf %s "$1" | wc -c)" -lt 8 ]
 }
+
+password_is_not_ascii () {
+	if LC_ALL=C expr "$1" : '[[:graph:]]*$' >/dev/null; then
+		return 1 # Password all ascii characters
+	fi
+
+	return 0
+}
+

=== modified file 'user-setup-ask'
--- user-setup-ask	2010-04-19 16:59:35 +0000
+++ user-setup-ask	2010-11-24 15:56:22 +0000
@@ -209,6 +209,15 @@
 					db_fset passwd/user-password-again seen false
 					STATE=6
 					continue
+				elif [ "$USER_PW" ] && password_is_not_ascii "$USER_PW"; then
+					db_set passwd/user-password ""
+					db_set passwd/user-password-again ""
+					db_fset user-setup/password-not-ascii seen false
+					db_input critical user-setup/password-not-ascii
+					db_fset passwd/user-password seen false
+					db_fset passwd/user-password-again seen false
+					STATE=6
+					continue
 				elif [ "$USER_PW" ] && password_is_weak "$USER_PW"; then
 					db_set user-setup/password-weak false
 					db_fset user-setup/password-weak seen false