From 9f92fb94aa403928a2efe5e673e118b3b02ba291 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Tue, 25 Nov 2014 09:38:58 -0500
Subject: [PATCH] Fix regression in BasePage due to changes in page construction for bottom script injection
---
src/main/java/com/gitblit/transport/ssh/NullKeyManager.java | 38 +++++++++++++++++++++++---------------
1 files changed, 23 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/gitblit/transport/ssh/NullKeyManager.java b/src/main/java/com/gitblit/transport/ssh/NullKeyManager.java
index 6990d0d..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,36 +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) {
- return false;
- }
-
- @Override
- public boolean removeKey(String username, String data) {
+ public boolean addKey(String username, SshKey key) {
return false;
}
@Override
- public boolean removeAllKey(String username) {
+ public boolean removeKey(String username, SshKey key) {
+ return false;
+ }
+
+ @Override
+ public boolean removeAllKeys(String username) {
return false;
}
}
--
Gitblit v1.9.1