From a502d96a860456ec5e8c96761db70f7cabb74751 Mon Sep 17 00:00:00 2001
From: Paul Martin <paul@paulsputer.com>
Date: Sat, 30 Apr 2016 04:19:14 -0400
Subject: [PATCH] Merge pull request #1073 from gitblit/1062-DocEditorUpdates
---
src/main/java/com/gitblit/transport/ssh/NullKeyManager.java | 35 ++++++++++++++++++++++++-----------
1 files changed, 24 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/gitblit/transport/ssh/NullKeyManager.java b/src/main/java/com/gitblit/transport/ssh/NullKeyManager.java
index 2a2ef36..fcd3e19 100644
--- a/src/main/java/com/gitblit/transport/ssh/NullKeyManager.java
+++ b/src/main/java/com/gitblit/transport/ssh/NullKeyManager.java
@@ -15,20 +15,22 @@
*/
package com.gitblit.transport.ssh;
-import java.security.PublicKey;
import java.util.List;
+import com.google.inject.Inject;
+
/**
- * Rejects all SSH key management requests.
- *
+ * Rejects all public key management requests.
+ *
* @author James Moger
*
*/
-public class NullKeyManager implements IKeyManager {
+public class NullKeyManager extends IPublicKeyManager {
+ @Inject
public NullKeyManager() {
}
-
+
@Override
public String toString() {
return getClass().getSimpleName();
@@ -36,31 +38,42 @@
@Override
public NullKeyManager start() {
+ log.info(toString());
return this;
}
-
+
@Override
public boolean isReady() {
return true;
}
-
+
@Override
public NullKeyManager stop() {
return this;
}
@Override
- public List<PublicKey> getKeys(String username) {
+ protected boolean isStale(String username) {
+ return false;
+ }
+
+ @Override
+ protected List<SshKey> getKeysImpl(String username) {
return null;
}
@Override
- public boolean addKey(String username, String data) {
+ public boolean addKey(String username, SshKey key) {
return false;
}
-
+
@Override
- public boolean removeKey(String username, String data) {
+ public boolean removeKey(String username, SshKey key) {
+ return false;
+ }
+
+ @Override
+ public boolean removeAllKeys(String username) {
return false;
}
}
--
Gitblit v1.9.1