From 8b63e0aaf044b36627e9ce02a1d73618e50700e4 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 10 Apr 2014 18:58:08 -0400
Subject: [PATCH] Listen for ssh clients on all interfaces, by default
---
src/main/java/com/gitblit/manager/AuthenticationManager.java | 29 +++++++++++++++++++++++++++++
1 files changed, 29 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/gitblit/manager/AuthenticationManager.java b/src/main/java/com/gitblit/manager/AuthenticationManager.java
index 4f3e652..658c289 100644
--- a/src/main/java/com/gitblit/manager/AuthenticationManager.java
+++ b/src/main/java/com/gitblit/manager/AuthenticationManager.java
@@ -47,6 +47,7 @@
import com.gitblit.auth.WindowsAuthProvider;
import com.gitblit.models.TeamModel;
import com.gitblit.models.UserModel;
+import com.gitblit.transport.ssh.SshSession;
import com.gitblit.utils.Base64;
import com.gitblit.utils.HttpUtils;
import com.gitblit.utils.StringUtils;
@@ -290,6 +291,34 @@
}
/**
+ * Authenticate a user based on SSH session.
+ *
+ * @param SshSession
+ * @return a user object or null
+ */
+ @Override
+ public UserModel authenticate(SshSession sshSession) {
+ String username = sshSession.getRemoteUser();
+ if (username != null) {
+ if (!StringUtils.isEmpty(username)) {
+ UserModel user = userManager.getUserModel(username);
+ if (user != null) {
+ // existing user
+ logger.debug(MessageFormat.format("{0} authenticated by SSH key from {1}",
+ user.username, sshSession.getRemoteAddress()));
+ return validateAuthentication(user, AuthenticationType.SSH);
+ }
+ logger.warn(MessageFormat.format("Failed to find UserModel for {0}, attempted ssh authentication from {1}",
+ username, sshSession.getRemoteAddress()));
+ }
+ } else {
+ logger.warn("Empty user in SSH session");
+ }
+ return null;
+ }
+
+
+ /**
* This method allows the authentication manager to reject authentication
* attempts. It is called after the username/secret have been verified to
* ensure that the authentication technique has been logged.
--
Gitblit v1.9.1