diff --git a/CONTRIBUTORS b/CONTRIBUTORS --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -97,6 +97,7 @@ List of contributors to Kallithea projec Aparkar 2013 Dennis Brakhane 2013 Grzegorz Rożniecki 2013 + Ilya Beda 2013 Jonathan Sternberg 2013 Leonardo Carneiro 2013 Magnus Ericmats 2013 diff --git a/kallithea/config/routing.py b/kallithea/config/routing.py --- a/kallithea/config/routing.py +++ b/kallithea/config/routing.py @@ -183,6 +183,13 @@ def make_map(config): m.connect("edit_user_api_keys_delete", "/users/{id}/edit/api_keys/delete", action="delete_api_key", conditions=dict(method=["POST"])) + m.connect("edit_user_ssh_keys", "/users/{id}/edit/ssh_keys", + action="edit_ssh_keys", conditions=dict(method=["GET"])) + m.connect("edit_user_ssh_keys", "/users/{id}/edit/ssh_keys", + action="ssh_keys_add", conditions=dict(method=["POST"])) + m.connect("edit_user_ssh_keys_delete", "/users/{id}/edit/ssh_keys/delete", + action="ssh_keys_delete", conditions=dict(method=["POST"])) + m.connect("edit_user_perms", "/users/{id}/edit/permissions", action="edit_perms", conditions=dict(method=["GET"])) m.connect("edit_user_perms_update", "/users/{id}/edit/permissions", diff --git a/kallithea/controllers/admin/users.py b/kallithea/controllers/admin/users.py --- a/kallithea/controllers/admin/users.py +++ b/kallithea/controllers/admin/users.py @@ -43,9 +43,9 @@ from kallithea.lib import helpers as h from kallithea.lib.auth import LoginRequired, HasPermissionAnyDecorator, \ AuthUser from kallithea.lib import auth_modules -from kallithea.lib.base import BaseController, render +from kallithea.lib.base import BaseController, render, IfSshEnabled from kallithea.model.api_key import ApiKeyModel - +from kallithea.model.ssh_key import SshKeyModel from kallithea.model.db import User, UserEmailMap, UserIpMap, UserToPerm from kallithea.model.forms import UserForm, CustomDefaultPermissionsForm from kallithea.model.user import UserModel @@ -429,3 +429,37 @@ class UsersController(BaseController): if 'default_user' in request.POST: raise HTTPFound(location=url('admin_permissions_ips')) raise HTTPFound(location=url('edit_user_ips', id=id)) + + @IfSshEnabled + def edit_ssh_keys(self, id): + c.user = self._get_user_or_raise_if_default(id) + c.active = 'ssh_keys' + c.user_ssh_keys = SshKeyModel().get_ssh_keys(c.user.user_id) + defaults = c.user.get_dict() + return htmlfill.render( + render('admin/users/user_edit.html'), + defaults=defaults, + encoding="UTF-8", + force_defaults=False) + + @IfSshEnabled + def ssh_keys_add(self, id): + c.user = self._get_user_or_raise_if_default(id) + + description = request.POST.get('description') + public_key = request.POST.get('public_key') + new_ssh_key = SshKeyModel().create(c.user.user_id, + description, public_key) + Session().commit() + h.flash(_("SSH key %s successfully added") % new_ssh_key.fingerprint, category='success') + raise HTTPFound(location=url('edit_user_ssh_keys', id=c.user.user_id)) + + @IfSshEnabled + def ssh_keys_delete(self, id): + c.user = self._get_user_or_raise_if_default(id) + + public_key = request.POST.get('del_public_key') + SshKeyModel().delete(public_key, c.user.user_id) + Session().commit() + h.flash(_("SSH key successfully deleted"), category='success') + raise HTTPFound(location=url('edit_user_ssh_keys', id=c.user.user_id)) diff --git a/kallithea/templates/about.html b/kallithea/templates/about.html --- a/kallithea/templates/about.html +++ b/kallithea/templates/about.html @@ -121,6 +121,7 @@
  • Copyright © 2012–2013, xpol
  • Copyright © 2013, Dennis Brakhane
  • Copyright © 2013, Grzegorz Rożniecki
    • +
  • Copyright © 2013, Ilya Beda
  • Copyright © 2013, Jonathan Sternberg
  • Copyright © 2013, Leonardo Carneiro
  • Copyright © 2013, Magnus Ericmats
    • diff --git a/kallithea/templates/admin/users/user_edit.html b/kallithea/templates/admin/users/user_edit.html --- a/kallithea/templates/admin/users/user_edit.html +++ b/kallithea/templates/admin/users/user_edit.html @@ -28,6 +28,9 @@
    • ${_('Profile')}
    • ${_('Emails')}
      • + %if c.ssh_enabled: +
    • ${_('SSH Keys')}
      • + %endif
    • ${_('API Keys')}
    • ${_('IP Whitelist')}
    • ${_('Advanced')}
      • diff --git a/kallithea/templates/admin/users/user_edit_ssh_keys.html b/kallithea/templates/admin/users/user_edit_ssh_keys.html new file mode 100644 --- /dev/null +++ b/kallithea/templates/admin/users/user_edit_ssh_keys.html @@ -0,0 +1,63 @@ + + %if c.user_ssh_keys: + + + + + + %for ssh_key in c.user_ssh_keys: + + + + + + %endfor + %else: + + + + %endif +
      ${_('Fingerprint')}${_('Description')}${_('Action')}
      + ${ssh_key.fingerprint} + + ${ssh_key.description} + + ${h.form(url('edit_user_ssh_keys_delete', id=c.user.user_id))} + ${h.hidden('del_public_key', ssh_key.public_key)} + + ${h.end_form()} +
      +
      ${_('No SSH keys have been added')}
      +
      + +
      + ${h.form(url('edit_user_ssh_keys', id=c.user.user_id))} +
      +
      + +
      +
      + +
      + ${h.textarea('public_key', '', class_='form-control', placeholder=_('Public key (contents of e.g. ~/.ssh/id_rsa.pub)'), cols=80, rows=5)} +
      +
      +
      + +
      + ${h.text('description', class_='form-control', placeholder=_('Description'))} +
      +
      +
      +
      + ${h.submit('save', _('Add'), class_="btn btn-default")} + ${h.reset('reset', _('Reset'), class_="btn btn-default")} +
      +
      +
      + ${h.end_form()} +
      diff --git a/kallithea/tests/functional/test_admin_users.py b/kallithea/tests/functional/test_admin_users.py --- a/kallithea/tests/functional/test_admin_users.py +++ b/kallithea/tests/functional/test_admin_users.py @@ -18,7 +18,7 @@ import pytest from kallithea.tests.base import * from kallithea.tests.fixture import Fixture from kallithea.controllers.admin.users import UsersController -from kallithea.model.db import User, Permission, UserIpMap, UserApiKeys, RepoGroup +from kallithea.model.db import User, Permission, UserIpMap, UserApiKeys, RepoGroup, UserSshKeys from kallithea.lib.auth import check_password from kallithea.model.user import UserModel from kallithea.model import validators @@ -514,6 +514,54 @@ class TestAdminUsersController(TestContr response = response.follow() response.mustcontain(no=[api_key]) + def test_add_ssh_key(self): + description = u'something' + public_key = u'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQC6Ycnc2oUZHQnQwuqgZqTTdMDZD7ataf3JM7oG2Fw8JR6cdmz4QZLe5mfDwaFwG2pWHLRpVqzfrD/Pn3rIO++bgCJH5ydczrl1WScfryV1hYMJ/4EzLGM657J1/q5EI+b9SntKjf4ax+KP322L0TNQGbZUHLbfG2MwHMrYBQpHUQ== me@localhost' + fingerprint = u'Ke3oUCNJM87P0jJTb3D+e3shjceP2CqMpQKVd75E9I8' + + self.log_user() + user = User.get_by_username(TEST_USER_REGULAR_LOGIN) + user_id = user.user_id + + response = self.app.post(url('edit_user_ssh_keys', id=user_id), + {'description': description, + 'public_key': public_key, + '_authentication_token': self.authentication_token()}) + self.checkSessionFlash(response, 'SSH key %s successfully added' % fingerprint) + + response = response.follow() + response.mustcontain(fingerprint) + ssh_key = UserSshKeys.query().filter(UserSshKeys.user_id == user_id).one() + assert ssh_key.fingerprint == fingerprint + assert ssh_key.description == description + Session().delete(ssh_key) + Session().commit() + + def test_remove_ssh_key(self): + description = u'' + public_key = u'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQC6Ycnc2oUZHQnQwuqgZqTTdMDZD7ataf3JM7oG2Fw8JR6cdmz4QZLe5mfDwaFwG2pWHLRpVqzfrD/Pn3rIO++bgCJH5ydczrl1WScfryV1hYMJ/4EzLGM657J1/q5EI+b9SntKjf4ax+KP322L0TNQGbZUHLbfG2MwHMrYBQpHUQ== me@localhost' + fingerprint = u'Ke3oUCNJM87P0jJTb3D+e3shjceP2CqMpQKVd75E9I8' + + self.log_user() + user = User.get_by_username(TEST_USER_REGULAR_LOGIN) + user_id = user.user_id + + response = self.app.post(url('edit_user_ssh_keys', id=user_id), + {'description': description, + 'public_key': public_key, + '_authentication_token': self.authentication_token()}) + 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 + + response = self.app.post(url('edit_user_ssh_keys_delete', id=user_id), + {'del_public_key': ssh_key.public_key, + '_authentication_token': self.authentication_token()}) + self.checkSessionFlash(response, 'SSH key successfully deleted') + keys = UserSshKeys.query().all() + assert 0 == len(keys) + class TestAdminUsersController_unittest(TestController): """ Unit tests for the users controller """ diff --git a/scripts/contributor_data.py b/scripts/contributor_data.py --- a/scripts/contributor_data.py +++ b/scripts/contributor_data.py @@ -66,6 +66,7 @@ no_about.add(('Sean Farley '), ] # Preserve contributors listed in about.html but not appearing in repository