James Moger
2014-03-17 9d44ade215922fd9e7bda7c604b31c31d217d750
src/main/java/com/gitblit/transport/ssh/SshDaemon.java
@@ -32,8 +32,10 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.gitblit.Constants;
import com.gitblit.IStoredSettings;
import com.gitblit.Keys;
import com.gitblit.manager.IAuthenticationManager;
import com.gitblit.manager.IGitblit;
import com.gitblit.utils.IdGenerator;
import com.gitblit.utils.StringUtils;
@@ -104,22 +106,47 @@
         addr = new InetSocketAddress(bindInterface, port);
      }
      CachingPublicKeyAuthenticator keyAuthenticator =
            new CachingPublicKeyAuthenticator(keyManager, gitblit);
      File hostKeyStore = new File(gitblit.getBaseFolder(), HOST_KEY_STORE);
      CachingPublicKeyAuthenticator keyAuthenticator =
            getPublicKeyAuthenticator(keyManager, gitblit);
      sshd = SshServer.setUpDefaultServer();
      sshd.setPort(addr.getPort());
      sshd.setHost(addr.getHostName());
      sshd.setKeyPairProvider(new PEMGeneratorHostKeyProvider(new File(
            gitblit.getBaseFolder(), HOST_KEY_STORE).getPath()));
      sshd.setKeyPairProvider(new PEMGeneratorHostKeyProvider(hostKeyStore.getPath()));
      sshd.setPublickeyAuthenticator(keyAuthenticator);
      sshd.setPasswordAuthenticator(new UsernamePasswordAuthenticator(gitblit));
      sshd.setSessionFactory(new SshServerSessionFactory());
      sshd.setFileSystemFactory(new DisabledFilesystemFactory());
      sshd.setTcpipForwardingFilter(new NonForwardingFilter());
      sshd.setCommandFactory(new SshCommandFactory(gitblit, keyAuthenticator, idGenerator));
      sshd.setShellFactory(new WelcomeShell(settings));
      String version = Constants.getGitBlitVersion() + " (" + sshd.getVersion() + ")";
      sshd.getProperties().put(SshServer.SERVER_IDENTIFICATION, version);
      run = new AtomicBoolean(false);
   }
   private CachingPublicKeyAuthenticator getPublicKeyAuthenticator(
         IKeyManager keyManager, IGitblit gitblit) {
      IStoredSettings settings = gitblit.getSettings();
      String clazz = settings.getString(Keys.git.sshPublicKeyAuthenticator,
            CachingPublicKeyAuthenticator.class.getName());
      if (StringUtils.isEmpty(clazz)) {
         clazz = CachingPublicKeyAuthenticator.class.getName();
      }
      try {
         Class<CachingPublicKeyAuthenticator> authClass =
               (Class<CachingPublicKeyAuthenticator>) Class.forName(clazz);
         return authClass.getConstructor(
               new Class[] { IKeyManager.class,
                     IAuthenticationManager.class }).newInstance(
               keyManager, gitblit);
      } catch (Exception e) {
         log.error("failed to create ssh auth manager " + clazz, e);
      }
      return null;
   }
   public String formatUrl(String gituser, String servername, String repository) {
@@ -200,6 +227,29 @@
      return keyManager;
   }
   @SuppressWarnings("unchecked")
   protected IKeyManager getKeyAuthenticator() {
      IKeyManager keyManager = null;
      IStoredSettings settings = gitblit.getSettings();
      String clazz = settings.getString(Keys.git.sshKeysManager, FileKeyManager.class.getName());
      if (StringUtils.isEmpty(clazz)) {
         clazz = FileKeyManager.class.getName();
      }
      try {
         Class<? extends IKeyManager> managerClass = (Class<? extends IKeyManager>) Class.forName(clazz);
         keyManager = injector.get(managerClass).start();
         if (keyManager.isReady()) {
            log.info("{} is ready.", keyManager);
         } else {
            log.warn("{} is disabled.", keyManager);
         }
      } catch (Exception e) {
         log.error("failed to create ssh key manager " + clazz, e);
         keyManager = injector.get(NullKeyManager.class).start();
      }
      return keyManager;
   }
   /**
    * A nested Dagger graph is used for constructor dependency injection of
    * complex classes.