From f81ed74578eb1d0fed26c56ddcfbb39f08a4e47c Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 10 Apr 2014 18:58:10 -0400
Subject: [PATCH] Support querying in tickets ls and accept Object[][] for table data
---
src/main/java/com/gitblit/transport/ssh/MemoryKeyManager.java | 32 +++++++++++++++-----------------
1 files changed, 15 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/gitblit/transport/ssh/MemoryKeyManager.java b/src/main/java/com/gitblit/transport/ssh/MemoryKeyManager.java
index 26bd021..18f9a4e 100644
--- a/src/main/java/com/gitblit/transport/ssh/MemoryKeyManager.java
+++ b/src/main/java/com/gitblit/transport/ssh/MemoryKeyManager.java
@@ -15,7 +15,6 @@
*/
package com.gitblit.transport.ssh;
-import java.security.PublicKey;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -29,10 +28,10 @@
*/
public class MemoryKeyManager extends IPublicKeyManager {
- Map<String, List<PublicKey>> keys;
+ Map<String, List<SshKey>> keys;
public MemoryKeyManager() {
- keys = new HashMap<String, List<PublicKey>>();
+ keys = new HashMap<String, List<SshKey>>();
}
@Override
@@ -62,7 +61,7 @@
}
@Override
- protected List<PublicKey> getKeysImpl(String username) {
+ protected List<SshKey> getKeysImpl(String username) {
String id = username.toLowerCase();
if (keys.containsKey(id)) {
return keys.get(id);
@@ -71,13 +70,21 @@
}
@Override
- public boolean addKey(String username, String data) {
- return false;
+ public boolean addKey(String username, SshKey key) {
+ String id = username.toLowerCase();
+ if (!keys.containsKey(id)) {
+ keys.put(id, new ArrayList<SshKey>());
+ }
+ return keys.get(id).add(key);
}
@Override
- public boolean removeKey(String username, String data) {
- return false;
+ public boolean removeKey(String username, SshKey key) {
+ String id = username.toLowerCase();
+ if (!keys.containsKey(id)) {
+ return false;
+ }
+ return keys.get(id).remove(key);
}
@Override
@@ -85,14 +92,5 @@
String id = username.toLowerCase();
keys.remove(id.toLowerCase());
return true;
- }
-
- /* Test method for populating the memory key manager */
- public void addKey(String username, PublicKey key) {
- String id = username.toLowerCase();
- if (!keys.containsKey(id)) {
- keys.put(id, new ArrayList<PublicKey>());
- }
- keys.get(id).add(key);
}
}
--
Gitblit v1.9.1