Elevate the public key manager to a top-level manager

James Moger

2014-03-17 245836904ba5cecdc31773cf7c9616396c8ad8c0

 src/main/java/com/gitblit/transport/ssh/gitblit/BaseKeyCommand.java

@@ -21,8 +21,7 @@
import java.io.UnsupportedEncodingException;
import java.util.List;

import com.gitblit.transport.ssh.IKeyManager;
import com.gitblit.transport.ssh.CachingPublicKeyAuthenticator;
import com.gitblit.transport.ssh.IPublicKeyManager;
import com.gitblit.transport.ssh.commands.SshCommand;
import com.google.common.base.Charsets;

@@ -53,12 +52,7 @@
      return sshKeys;
   }

   protected CachingPublicKeyAuthenticator authenticator;
   public void setAuthenticator(CachingPublicKeyAuthenticator authenticator) {
      this.authenticator = authenticator;
   }
	
   protected IKeyManager getKeyManager() {
      return authenticator.getKeyManager();
   protected IPublicKeyManager getKeyManager() {
      return ctx.getGitblit().getPublicKeyManager();
   }
}