Rename authenticators for clarity

diff --git a/src/main/java/com/gitblit/transport/ssh/PublicKeyAuthenticator.java b/src/main/java/com/gitblit/transport/ssh/PublicKeyAuthenticator.java
new file mode 100644 (file)
index 0000000..84e7afa
--- /dev/null
+++ b/src/main/java/com/gitblit/transport/ssh/PublicKeyAuthenticator.java
@@ -0,0 +1,83 @@
+/*
+ * Copyright 2014 gitblit.com.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.gitblit.transport.ssh;
+
+import java.security.PublicKey;
+import java.util.List;
+import java.util.Locale;
+
+import org.apache.sshd.server.PublickeyAuthenticator;
+import org.apache.sshd.server.session.ServerSession;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.gitblit.manager.IAuthenticationManager;
+import com.gitblit.models.UserModel;
+
+/**
+ *
+ * @author Eric Myrhe
+ *
+ */
+public class PublicKeyAuthenticator implements PublickeyAuthenticator {
+
+       protected final Logger log = LoggerFactory.getLogger(getClass());
+
+       protected final IKeyManager keyManager;
+
+       protected final IAuthenticationManager authManager;
+
+       public PublicKeyAuthenticator(IKeyManager keyManager, IAuthenticationManager authManager) {
+               this.keyManager = keyManager;
+               this.authManager = authManager;
+       }
+
+       @Override
+       public boolean authenticate(String username, final PublicKey suppliedKey,
+                       final ServerSession session) {
+               final SshDaemonClient client = session.getAttribute(SshDaemonClient.KEY);
+
+               if (client.getUser() != null) {
+                       // TODO why do we re-authenticate?
+                       log.info("{} has already authenticated!", username);
+                       return true;
+               }
+
+               username = username.toLowerCase(Locale.US);
+               List<PublicKey> keys = keyManager.getKeys(username);
+               if (keys == null || keys.isEmpty()) {
+                       log.info("{} has not added any public keys for ssh authentication", username);
+                       return false;
+               }
+
+               for (PublicKey key : keys) {
+                       if (key.equals(suppliedKey)) {
+                               UserModel user = authManager.authenticate(username, key);
+                               if (user != null) {
+                                       client.setUser(user);
+                                       return true;
+                               }
+                       }
+               }
+
+               log.warn("could not authenticate {} for SSH using the supplied public key", username);
+               return false;
+       }
+
+       public IKeyManager getKeyManager() {
+               return keyManager;
+       }
+}

diff --git a/src/main/java/com/gitblit/transport/ssh/SshDaemon.java b/src/main/java/com/gitblit/transport/ssh/SshDaemon.java
index c8c20f56d154cecaaf4b2472920ead9d64222dc7..5415779e652b45e79b5ac3dfa6366992da7cb934 100644 (file)
--- a/src/main/java/com/gitblit/transport/ssh/SshDaemon.java
+++ b/src/main/java/com/gitblit/transport/ssh/SshDaemon.java
@@ -117,7 +117,7 @@ public class SshDaemon {
                        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 @@ public class SshDaemon {
                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());

diff --git a/src/main/java/com/gitblit/transport/ssh/SshKeyAuthenticator.java b/src/main/java/com/gitblit/transport/ssh/SshKeyAuthenticator.java
deleted file mode 100644 (file)
index 922f25a..0000000
--- a/src/main/java/com/gitblit/transport/ssh/SshKeyAuthenticator.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright 2014 gitblit.com.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-package com.gitblit.transport.ssh;
-
-import java.security.PublicKey;
-import java.util.List;
-import java.util.Locale;
-
-import org.apache.sshd.server.PublickeyAuthenticator;
-import org.apache.sshd.server.session.ServerSession;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.gitblit.manager.IAuthenticationManager;
-import com.gitblit.models.UserModel;
-
-/**
- *
- * @author Eric Myrhe
- *
- */
-public class SshKeyAuthenticator implements PublickeyAuthenticator {
-
-       protected final Logger log = LoggerFactory.getLogger(getClass());
-
-       protected final IKeyManager keyManager;
-
-       protected final IAuthenticationManager authManager;
-
-       public SshKeyAuthenticator(IKeyManager keyManager, IAuthenticationManager authManager) {
-               this.keyManager = keyManager;
-               this.authManager = authManager;
-       }
-
-       @Override
-       public boolean authenticate(String username, final PublicKey suppliedKey,
-                       final ServerSession session) {
-               final SshDaemonClient client = session.getAttribute(SshDaemonClient.KEY);
-
-               if (client.getUser() != null) {
-                       // TODO why do we re-authenticate?
-                       log.info("{} has already authenticated!", username);
-                       return true;
-               }
-
-               username = username.toLowerCase(Locale.US);
-               List<PublicKey> keys = keyManager.getKeys(username);
-               if (keys == null || keys.isEmpty()) {
-                       log.info("{} has not added any public keys for ssh authentication", username);
-                       return false;
-               }
-
-               for (PublicKey key : keys) {
-                       if (key.equals(suppliedKey)) {
-                               UserModel user = authManager.authenticate(username, key);
-                               if (user != null) {
-                                       client.setUser(user);
-                                       return true;
-                               }
-                       }
-               }
-
-               log.warn("could not authenticate {} for SSH using the supplied public key", username);
-               return false;
-       }
-
-       public IKeyManager getKeyManager() {
-               return keyManager;
-       }
-}

diff --git a/src/main/java/com/gitblit/transport/ssh/SshPasswordAuthenticator.java b/src/main/java/com/gitblit/transport/ssh/SshPasswordAuthenticator.java
deleted file mode 100644 (file)
index 5ddc4a3..0000000
--- a/src/main/java/com/gitblit/transport/ssh/SshPasswordAuthenticator.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright 2014 gitblit.com.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-package com.gitblit.transport.ssh;
-
-import java.util.Locale;
-
-import org.apache.sshd.server.PasswordAuthenticator;
-import org.apache.sshd.server.session.ServerSession;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.gitblit.manager.IAuthenticationManager;
-import com.gitblit.models.UserModel;
-
-/**
- *
- * @author James Moger
- *
- */
-public class SshPasswordAuthenticator implements PasswordAuthenticator {
-
-       protected final Logger log = LoggerFactory.getLogger(getClass());
-
-       protected final IAuthenticationManager authManager;
-
-       public SshPasswordAuthenticator(IAuthenticationManager authManager) {
-               this.authManager = authManager;
-       }
-
-       @Override
-       public boolean authenticate(String username, String password, ServerSession session) {
-               SshDaemonClient client = session.getAttribute(SshDaemonClient.KEY);
-               if (client.getUser() != null) {
-                       log.info("{} has already authenticated!", username);
-                       return true;
-               }
-
-               username = username.toLowerCase(Locale.US);
-               UserModel user = authManager.authenticate(username, password.toCharArray());
-               if (user != null) {
-                       client.setUser(user);
-                       return true;
-               }
-
-               log.warn("could not authenticate {} for SSH using the supplied password", username);
-               return false;
-       }
-}

diff --git a/src/main/java/com/gitblit/transport/ssh/UsernamePasswordAuthenticator.java b/src/main/java/com/gitblit/transport/ssh/UsernamePasswordAuthenticator.java
new file mode 100644 (file)
index 0000000..861bc22
--- /dev/null
+++ b/src/main/java/com/gitblit/transport/ssh/UsernamePasswordAuthenticator.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2014 gitblit.com.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.gitblit.transport.ssh;
+
+import java.util.Locale;
+
+import org.apache.sshd.server.PasswordAuthenticator;
+import org.apache.sshd.server.session.ServerSession;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.gitblit.manager.IAuthenticationManager;
+import com.gitblit.models.UserModel;
+
+/**
+ *
+ * @author James Moger
+ *
+ */
+public class UsernamePasswordAuthenticator implements PasswordAuthenticator {
+
+       protected final Logger log = LoggerFactory.getLogger(getClass());
+
+       protected final IAuthenticationManager authManager;
+
+       public UsernamePasswordAuthenticator(IAuthenticationManager authManager) {
+               this.authManager = authManager;
+       }
+
+       @Override
+       public boolean authenticate(String username, String password, ServerSession session) {
+               SshDaemonClient client = session.getAttribute(SshDaemonClient.KEY);
+               if (client.getUser() != null) {
+                       log.info("{} has already authenticated!", username);
+                       return true;
+               }
+
+               username = username.toLowerCase(Locale.US);
+               UserModel user = authManager.authenticate(username, password.toCharArray());
+               if (user != null) {
+                       client.setUser(user);
+                       return true;
+               }
+
+               log.warn("could not authenticate {} for SSH using the supplied password", username);
+               return false;
+       }
+}

diff --git a/src/main/java/com/gitblit/transport/ssh/commands/BaseKeyCommand.java b/src/main/java/com/gitblit/transport/ssh/commands/BaseKeyCommand.java
index 50927cc2c5ff4303b8326747e013941613f21ef7..36475244541f2d18ab2d23ff0e5c28ad805a477d 100644 (file)
--- a/src/main/java/com/gitblit/transport/ssh/commands/BaseKeyCommand.java
+++ b/src/main/java/com/gitblit/transport/ssh/commands/BaseKeyCommand.java
@@ -21,7 +21,7 @@ import java.io.InputStreamReader;
 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 @@ public abstract class BaseKeyCommand extends SshCommand {
                return sshKeys;
        }
 
-       protected SshKeyAuthenticator authenticator;
-       public void setAuthenticator(SshKeyAuthenticator authenticator) {
+       protected PublicKeyAuthenticator authenticator;
+       public void setAuthenticator(PublicKeyAuthenticator authenticator) {
                this.authenticator = authenticator;
        }
 }

diff --git a/src/main/java/com/gitblit/transport/ssh/commands/DispatchCommand.java b/src/main/java/com/gitblit/transport/ssh/commands/DispatchCommand.java
index 5c022732c2354d1badb3bbc05b65306ffae624cb..7cd1b045bf1788dcee8ebc9a1ba3d1fc45ee4b25 100644 (file)
--- a/src/main/java/com/gitblit/transport/ssh/commands/DispatchCommand.java
+++ b/src/main/java/com/gitblit/transport/ssh/commands/DispatchCommand.java
@@ -32,7 +32,7 @@ import com.gitblit.git.GitblitUploadPackFactory;
 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 @@ public class DispatchCommand extends BaseCommand {
          this.gitblitReceivePackFactory = gitblitReceivePackFactory;
   }
 
-  private SshKeyAuthenticator authenticator;
-  public void setAuthenticator(SshKeyAuthenticator authenticator) {
+  private PublicKeyAuthenticator authenticator;
+  public void setAuthenticator(PublicKeyAuthenticator authenticator) {
        this.authenticator = authenticator;
   }
 }