Renamed class to avoid confusion with FileKeyManager

James Moger

2014-09-26 7a273c783e31a9e87b702af8ac865df1d2d57c58

Renamed class to avoid confusion with FileKeyManager

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

@@ -96,8 +96,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 +123,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());

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

File was renamed from src/main/java/com/gitblit/transport/ssh/FileBasedPubKeyAuth.java
@@ -32,7 +32,7 @@
 * Authenticates an SSH session against a public key.
 *
 */
public class FileBasedPubKeyAuth implements PublickeyAuthenticator {
public class SshKeyAuthenticator implements PublickeyAuthenticator {

    protected final Logger log = LoggerFactory.getLogger(getClass());

@@ -40,7 +40,7 @@

    protected final IAuthenticationManager authManager;

    public FileBasedPubKeyAuth(IPublicKeyManager keyManager, IAuthenticationManager authManager) {
    public SshKeyAuthenticator(IPublicKeyManager keyManager, IAuthenticationManager authManager) {
        this.keyManager = keyManager;
        this.authManager = authManager;
    }