Merge lp:~rvb/maas/bug-1270052 into lp:~maas-committers/maas/trunk

[Raphaël Badin]

Make sshkey.py:validate_ssh_public_key cope with UnicodeEncodeError.

Drive-by fix: fix lint.

[Graham Binns (gmb)]

Nice work!

review: Approve

=== modified file 'src/maasserver/models/sshkey.py'
--- src/maasserver/models/sshkey.py	2013-10-07 09:12:40 +0000
+++ src/maasserver/models/sshkey.py	2014-01-17 08:45:45 +0000
@@ -52,7 +52,7 @@
         if not key.isPublic():
             raise ValidationError(
                 "Invalid SSH public key (this key is a private key).")
-    except (BadKeyError, binascii.Error):
+    except (BadKeyError, binascii.Error, UnicodeEncodeError):
         raise ValidationError("Invalid SSH public key.")
 
 

=== modified file 'src/maasserver/models/tests/test_sshkey.py'
--- src/maasserver/models/tests/test_sshkey.py	2013-10-07 09:12:40 +0000
+++ src/maasserver/models/tests/test_sshkey.py	2014-01-17 08:45:45 +0000
@@ -55,6 +55,14 @@
         self.assertRaises(
             ValidationError, validate_ssh_public_key, key_string)
 
+    def test_does_not_validate_non_ascii_key(self):
+        non_ascii_key = 'AAB3NzaC' + u'\u2502' + 'mN6Lo2I9w=='
+        key_string = 'ssh-rsa %s %s@%s' % (
+            non_ascii_key, factory.getRandomString(),
+            factory.getRandomString())
+        self.assertRaises(
+            ValidationError, validate_ssh_public_key, key_string)
+
     def test_does_not_validate_rsa_private_key(self):
         key_string = get_data('data/test_rsa')
         self.assertRaises(

=== modified file 'src/provisioningserver/pxe/config.py'
--- src/provisioningserver/pxe/config.py	2014-01-16 09:35:02 +0000
+++ src/provisioningserver/pxe/config.py	2014-01-17 08:45:45 +0000
@@ -77,8 +77,8 @@
             "This can happen if you manually power up a node when its "
             "state is not one that allows it. Is the node in the 'Declared' "
             "or 'Ready' states? It needs to be Enlisting, Commissioning or "
-            "Allocated."
-                % (pxe_templates_dir, purpose, arch, subarch))
+            "Allocated." % (
+                pxe_templates_dir, purpose, arch, subarch))
 
         raise AssertionError(error)