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/manager/GitblitManager.java

@@ -22,7 +22,6 @@
import java.io.InputStream;
import java.io.InputStreamReader;
import java.lang.reflect.Type;
import java.security.PublicKey;
import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Collection;
@@ -42,6 +41,8 @@
import org.eclipse.jgit.transport.RefSpec;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import ro.fortsoft.pf4j.PluginWrapper;

import com.gitblit.Constants;
import com.gitblit.Constants.AccessPermission;
@@ -70,6 +71,7 @@
import com.gitblit.models.UserModel;
import com.gitblit.tickets.ITicketService;
import com.gitblit.transport.ssh.IPublicKeyManager;
import com.gitblit.transport.ssh.SshKey;
import com.gitblit.utils.ArrayUtils;
import com.gitblit.utils.HttpUtils;
import com.gitblit.utils.JsonUtils;
@@ -102,6 +104,8 @@

   protected final IRuntimeManager runtimeManager;

   protected final IPluginManager pluginManager;

   protected final INotificationManager notificationManager;

   protected final IUserManager userManager;
@@ -118,6 +122,7 @@

   public GitblitManager(
         IRuntimeManager runtimeManager,
         IPluginManager pluginManager,
         INotificationManager notificationManager,
         IUserManager userManager,
         IAuthenticationManager authenticationManager,
@@ -128,6 +133,7 @@

      this.settings = runtimeManager.getSettings();
      this.runtimeManager = runtimeManager;
      this.pluginManager = pluginManager;
      this.notificationManager = notificationManager;
      this.userManager = userManager;
      this.authenticationManager = authenticationManager;
@@ -664,7 +670,7 @@
   }

   @Override
   public UserModel authenticate(String username, PublicKey key) {
   public UserModel authenticate(String username, SshKey key) {
      return authenticationManager.authenticate(username, key);
   }

@@ -1171,4 +1177,14 @@
   public boolean isIdle(Repository repository) {
      return repositoryManager.isIdle(repository);
   }

   @Override
   public <T> List<T> getExtensions(Class<T> clazz) {
      return pluginManager.getExtensions(clazz);
   }

   @Override
   public PluginWrapper whichPlugin(Class<?> clazz) {
      return pluginManager.whichPlugin(clazz);
   }
}