Merged #217 "Exclude SSLv3 from Gitblit GO https protocols"

James Moger

2014-11-04 4e84166db5c5538e3984d9d2d6bb1f9902e65ee0

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

@@ -86,6 +86,9 @@

      // Ensure that Bouncy Castle is our JCE provider
      SecurityUtils.setRegisterBouncyCastle(true);
      if (SecurityUtils.isBouncyCastleRegistered()) {
         log.debug("BouncyCastle is registered as a JCE provider");
      }

      // Generate host RSA and DSA keypairs and create the host keypair provider
      File rsaKeyStore = new File(gitblit.getBaseFolder(), "ssh-rsa-hostkey.pem");
@@ -96,8 +99,8 @@
      hostKeyPairProvider.setFiles(new String [] { rsaKeyStore.getPath(), dsaKeyStore.getPath(), dsaKeyStore.getPath() });

      // Client public key authenticator
      CachingPublicKeyAuthenticator keyAuthenticator =
            new CachingPublicKeyAuthenticator(new FileBasedPubKeyAuth(gitblit.getPublicKeyManager(), gitblit));
      SshKeyAuthenticator keyAuthenticator =
            new SshKeyAuthenticator(gitblit.getPublicKeyManager(), gitblit);

      // Configure the preferred SSHD backend
      String sshBackendStr = settings.getString(Keys.git.sshBackend,
@@ -123,7 +126,7 @@
      sshd.setPort(addr.getPort());
      sshd.setHost(addr.getHostName());
      sshd.setKeyPairProvider(hostKeyPairProvider);
      sshd.setPublickeyAuthenticator(keyAuthenticator);
      sshd.setPublickeyAuthenticator(new CachingPublicKeyAuthenticator(keyAuthenticator));
      sshd.setPasswordAuthenticator(new UsernamePasswordAuthenticator(gitblit));
      sshd.setSessionFactory(new SshServerSessionFactory());
      sshd.setFileSystemFactory(new DisabledFilesystemFactory());