kallithea Changeset - e53f1db2b839

Changeset - e53f1db2b839

Parent rev.

Child rev.

[Not reviewed]

default

0 3 0

Christian Oyarzun - 11 years ago 2014-11-17 20:42:45
oyarzun@gmail.com

ssh: when adding a new public key, if no description is provided and the SSH key itself has a comment, use that as description

Based on work by Ilya Beda <ir4y.ix@gmail.com> on
https://bitbucket.org/ir4y/rhodecode/commits/branch/ssh_server_support , also
heavily modified by Mads Kiilerich.

3 files changed with 5 insertions and 3 deletions:

kallithea/model/ssh_key.py

kallithea/tests/functional/test_admin_users.py

kallithea/tests/functional/test_my_account.py

0 comments (0 inline, 0 general)

kallithea/model/ssh_key.py

➞

Show inline comments

@@ @@ -45,9 +45,11 @@ class SshKeyModel(object): @@
         Will raise SshKeyModelException on errors
         """
         try:
             ssh.parse_pub_key(public_key)
+            keytype, pub, comment = ssh.parse_pub_key(public_key)
         except ssh.SshKeyParseError as e:
             raise SshKeyModelException(_('SSH key %r is invalid: %s') % (safe_str(public_key), e.message))
         if not description.strip():
             description = comment.strip()
         user = User.guess_instance(user)

kallithea/tests/functional/test_admin_users.py

➞

Show inline comments

@@ @@ -553,7 +553,7 @@ class TestAdminUsersController(TestContr @@
         self.checkSessionFlash(response, 'SSH key %s successfully added' % fingerprint)
         response.follow()
         ssh_key = UserSshKeys.query().filter(UserSshKeys.user_id == user_id).one()
-        assert ssh_key.description == description
+        assert ssh_key.description == u'me@localhost'
         response = self.app.post(url('edit_user_ssh_keys_delete', id=user_id),
                                  {'del_public_key': ssh_key.public_key,

kallithea/tests/functional/test_my_account.py

➞

Show inline comments

@@ @@ -285,7 +285,7 @@ class TestMyAccountController(TestContro @@
         response.follow()
         user_id = response.session['authuser']['user_id']
         ssh_key = UserSshKeys.query().filter(UserSshKeys.user_id == user_id).one()
-        assert ssh_key.description == description
+        assert ssh_key.description == u'me@localhost'
         response = self.app.post(url('my_account_ssh_keys_delete'),
                                  {'del_public_key': ssh_key.public_key,

0 comments (0 inline, 0 general)