Rename authenticators for clarity

James Moger

2014-03-14 448145827d66cc10326298e60abe53d5b935bbd0

Rename authenticators for clarity

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

File was renamed from src/main/java/com/gitblit/transport/ssh/SshKeyAuthenticator.java
@@ -32,7 +32,7 @@
 * @author Eric Myrhe
 *
 */
public class SshKeyAuthenticator implements PublickeyAuthenticator {
public class PublicKeyAuthenticator implements PublickeyAuthenticator {

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

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

    protected final IAuthenticationManager authManager;

    public SshKeyAuthenticator(IKeyManager keyManager, IAuthenticationManager authManager) {
    public PublicKeyAuthenticator(IKeyManager keyManager, IAuthenticationManager authManager) {
        this.keyManager = keyManager;
        this.authManager = authManager;
    }

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

@@ -117,7 +117,7 @@
            addr = new InetSocketAddress(bindInterface, port);
        }

        SshKeyAuthenticator publickeyAuthenticator = new SshKeyAuthenticator(
        PublicKeyAuthenticator publickeyAuthenticator = new PublicKeyAuthenticator(
                keyManager, gitblit);
        sshd = SshServer.setUpDefaultServer();
        sshd.setPort(addr.getPort());
@@ -125,7 +125,7 @@
        sshd.setKeyPairProvider(new PEMGeneratorHostKeyProvider(new File(
                gitblit.getBaseFolder(), HOST_KEY_STORE).getPath()));
        sshd.setPublickeyAuthenticator(publickeyAuthenticator);
        sshd.setPasswordAuthenticator(new SshPasswordAuthenticator(gitblit));
        sshd.setPasswordAuthenticator(new UsernamePasswordAuthenticator(gitblit));
        sshd.setSessionFactory(new SshSessionFactory());
        sshd.setFileSystemFactory(new DisabledFilesystemFactory());
        sshd.setTcpipForwardingFilter(new NonForwardingFilter());

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

File was renamed from src/main/java/com/gitblit/transport/ssh/SshPasswordAuthenticator.java
@@ -30,13 +30,13 @@
 * @author James Moger
 *
 */
public class SshPasswordAuthenticator implements PasswordAuthenticator {
public class UsernamePasswordAuthenticator implements PasswordAuthenticator {

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

    protected final IAuthenticationManager authManager;

    public SshPasswordAuthenticator(IAuthenticationManager authManager) {
    public UsernamePasswordAuthenticator(IAuthenticationManager authManager) {
        this.authManager = authManager;
    }


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

@@ -21,7 +21,7 @@
import java.io.UnsupportedEncodingException;
import java.util.List;

import com.gitblit.transport.ssh.SshKeyAuthenticator;
import com.gitblit.transport.ssh.PublicKeyAuthenticator;
import com.google.common.base.Charsets;

/**
@@ -51,8 +51,8 @@
        return sshKeys;
    }

    protected SshKeyAuthenticator authenticator;
    public void setAuthenticator(SshKeyAuthenticator authenticator) {
    protected PublicKeyAuthenticator authenticator;
    public void setAuthenticator(PublicKeyAuthenticator authenticator) {
        this.authenticator = authenticator;
    }
}

 src/main/java/com/gitblit/transport/ssh/commands/DispatchCommand.java

@@ -32,7 +32,7 @@
import com.gitblit.git.RepositoryResolver;
import com.gitblit.transport.ssh.AbstractGitCommand;
import com.gitblit.transport.ssh.CommandMetaData;
import com.gitblit.transport.ssh.SshKeyAuthenticator;
import com.gitblit.transport.ssh.PublicKeyAuthenticator;
import com.gitblit.transport.ssh.SshDaemonClient;
import com.gitblit.utils.cli.SubcommandHandler;
import com.google.common.base.Charsets;
@@ -231,8 +231,8 @@
      this.gitblitReceivePackFactory = gitblitReceivePackFactory;
  }

  private SshKeyAuthenticator authenticator;
  public void setAuthenticator(SshKeyAuthenticator authenticator) {
  private PublicKeyAuthenticator authenticator;
  public void setAuthenticator(PublicKeyAuthenticator authenticator) {
    this.authenticator = authenticator;
  }
}