Merge lp:~maxiberta/canonical-identity-provider/ssh-form-improvements into lp:canonical-identity-provider/release

[Maximiliano Bertacchini]

Assorted improvements to the SSH keys form.

- Prevent extraneous line breaks when showing SSH keys.
- Improve parsing of SSH keys with multiple white spaces.

Additionally, drop unused ./tools/ and ./tools/pyflakes.txt.

I admit the CSS machinery seemed too complicated for such a small change, README didn't help much and I ran out of patience, so ended up inlining it. Happy to revisit if we're against that.

[Daniel Manrique (roadmr)]

Let's go with this, we need to check with Karl to refine the CSS hacking story later, then we can decide whether to tweak this to use non-inlined style.

review: Approve

=== modified file 'src/webui/forms.py'
--- src/webui/forms.py	2020-01-30 21:14:27 +0000
+++ src/webui/forms.py	2020-01-31 20:54:26 +0000
@@ -96,7 +96,7 @@
     being displayed to the user.
     """
     try:
-        key_type, key_text, comment = ssh_key.split(' ', 2)
+        key_type, key_text, comment = ssh_key.strip().split(None, 2)
     except ValueError:
         # This should never happen, as launchpad is supposed to guarantee a
         # valid ssh key format. However, we need to exercise this code path

=== modified file 'src/webui/templates/account/ssh_keys.html'
--- src/webui/templates/account/ssh_keys.html	2020-01-30 21:14:27 +0000
+++ src/webui/templates/account/ssh_keys.html	2020-01-31 20:54:26 +0000
@@ -31,7 +31,7 @@
                         <dt>Type</dt>
                         <dd>{{ key_info.type }}</dd>
                         <dt>Text</dt>
-                        <dd><code>{{ key_info.text }}</code></dd>
+                        <dd><code style="word-break: keep-all;">{{ key_info.text }}</code></dd>
                       </dl>
                     </section>
                   </li>

=== modified file 'src/webui/tests/test_forms.py'
--- src/webui/tests/test_forms.py	2020-01-30 21:14:27 +0000
+++ src/webui/tests/test_forms.py	2020-01-31 20:54:26 +0000
@@ -266,6 +266,19 @@
         formatted_key = format_ssh_key(keytext)
         self.assertIn('¿ʇuǝɯɯoɔ', formatted_key['label'])
 
+    def test_multiple_whitespace(self):
+        keytext = '  ssh-rsa       keytext\t\t\t\t\tcomment  '
+        result = format_ssh_key(keytext)
+        self.assertEqual(
+            {
+                'ssh_key': keytext,
+                'label': 'comment',
+                'type': 'ssh-rsa',
+                'text': 'keytext',
+            },
+            result
+        )
+
     def test_invalid_keys(self):
         invalid_key_text = "INVALID"
         formatted_key = format_ssh_key(invalid_key_text)

=== removed directory 'tools'
=== removed file 'tools/pyflakes.txt'