Track the SSH public key used for a session and add a `keys which` command

James Moger

2014-03-27 8d96b960e472433d2b4a5b71df7000bf1fbde648

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

@@ -21,8 +21,8 @@
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.SshKey;
import com.gitblit.transport.ssh.commands.SshCommand;
import com.google.common.base.Charsets;

@@ -36,7 +36,7 @@
   protected List<String> readKeys(List<String> sshKeys)
         throws UnsupportedEncodingException, IOException {
      int idx = -1;
      if (sshKeys.isEmpty() || ((idx = sshKeys.indexOf("-")) >= 0)) {
      if ((idx = sshKeys.indexOf("-")) >= 0) {
         String sshKey = "";
         BufferedReader br = new BufferedReader(new InputStreamReader(
               in, Charsets.UTF_8));
@@ -53,12 +53,15 @@
      return sshKeys;
   }

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

   protected SshKey parseKey(String rawData) throws UnloggedFailure {
      if (rawData.contains("PRIVATE")) {
         throw new UnloggedFailure(1,  "Please provide a PUBLIC key, not a PRIVATE key!");
      }
      SshKey key = new SshKey(rawData);
      return key;
   }
}