From 24be4953f79738af41182ca9ab89a6e5e5208f3f Mon Sep 17 00:00:00 2001 From: James Moger Date: Mon, 14 Apr 2014 09:32:47 -0400 Subject: [PATCH] Add ssh command to update the permission for an SSH key --- .../transport/ssh/keys/KeysDispatcher.java | 38 +++++++++++++++++++ .../gitblit/tests/SshKeysDispatcherTest.java | 16 ++++++++ 2 files changed, 54 insertions(+) diff --git a/src/main/java/com/gitblit/transport/ssh/keys/KeysDispatcher.java b/src/main/java/com/gitblit/transport/ssh/keys/KeysDispatcher.java index 3f581462..44c3bbe8 100644 --- a/src/main/java/com/gitblit/transport/ssh/keys/KeysDispatcher.java +++ b/src/main/java/com/gitblit/transport/ssh/keys/KeysDispatcher.java @@ -53,6 +53,7 @@ public class KeysDispatcher extends DispatchCommand { register(user, ListKeys.class); register(user, WhichKey.class); register(user, CommentKey.class); + register(user, PermissionKey.class); } @CommandMetaData(name = "add", description = "Add an SSH public key to your account") @@ -265,4 +266,41 @@ public class KeysDispatcher extends DispatchCommand { } } + + @CommandMetaData(name = "permission", description = "Set the permission of an SSH public key") + @UsageExample(syntax = "${cmd} 3 RW", description = "Set the permission for key #3 to PUSH (PW)") + public static class PermissionKey extends SshCommand { + + @Argument(index = 0, metaVar = "INDEX", usage = "the key index", required = true) + private int index; + + @Argument(index = 1, metaVar = "PERMISSION", usage = "the new permission", required = true) + private String value; + + @Override + public void run() throws Failure { + final String username = getContext().getClient().getUsername(); + IPublicKeyManager keyManager = getContext().getGitblit().getPublicKeyManager(); + List keys = keyManager.getKeys(username); + if (index > keys.size()) { + throw new UnloggedFailure(1, "Invalid key index!"); + } + + SshKey key = keys.get(index - 1); + AccessPermission permission = AccessPermission.fromCode(value); + if (permission.exceeds(AccessPermission.NONE)) { + try { + key.setPermission(permission); + } catch (IllegalArgumentException e) { + throw new Failure(1, e.getMessage()); + } + } + if (keyManager.addKey(username, key)) { + stdout.println(String.format("Updated the permission for key #%d.", index)); + } else { + throw new Failure(1, String.format("Failed to update the comment for key #%d!", index)); + } + } + + } } diff --git a/src/test/java/com/gitblit/tests/SshKeysDispatcherTest.java b/src/test/java/com/gitblit/tests/SshKeysDispatcherTest.java index 8ccdc5bf..dbe4bce8 100644 --- a/src/test/java/com/gitblit/tests/SshKeysDispatcherTest.java +++ b/src/test/java/com/gitblit/tests/SshKeysDispatcherTest.java @@ -112,4 +112,20 @@ public class SshKeysDispatcherTest extends SshUnitTest { keys = getKeyManager().getKeys(username); assertEquals(comment, keys.get(0).getComment()); } + + @Test + public void testKeysPermissionCommand() throws Exception { + List keys = getKeyManager().getKeys(username); + assertTrue(StringUtils.isEmpty(keys.get(0).getComment())); + testSshCommand(String.format("keys permission 1 %s", AccessPermission.CLONE)); + + keys = getKeyManager().getKeys(username); + assertEquals(AccessPermission.CLONE, keys.get(0).getPermission()); + + testSshCommand(String.format("keys permission 1 %s", AccessPermission.PUSH)); + + keys = getKeyManager().getKeys(username); + assertEquals(AccessPermission.PUSH, keys.get(0).getPermission()); + + } } -- 2.39.5