From 44e2ee1d05a9d455ae60dd64058b31f006d551b7 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] Revise SSH public key integration with AuthenticationManager
---
src/main/java/com/gitblit/manager/IAuthenticationManager.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/gitblit/manager/IAuthenticationManager.java b/src/main/java/com/gitblit/manager/IAuthenticationManager.java
index 5d98d12..4f43d92 100644
--- a/src/main/java/com/gitblit/manager/IAuthenticationManager.java
+++ b/src/main/java/com/gitblit/manager/IAuthenticationManager.java
@@ -15,12 +15,13 @@
*/
package com.gitblit.manager;
+import java.security.PublicKey;
+
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.gitblit.models.TeamModel;
import com.gitblit.models.UserModel;
-import com.gitblit.transport.ssh.SshSession;
public interface IAuthenticationManager extends IManager {
@@ -34,7 +35,14 @@
*/
UserModel authenticate(HttpServletRequest httpRequest);
- public UserModel authenticate(SshSession sshSession);
+ /**
+ * Authenticate a user based on a public key.
+ *
+ * @param username
+ * @param key
+ * @return a user object or null
+ */
+ UserModel authenticate(String username, PublicKey key);
/**
* Authenticate a user based on HTTP request parameters.
--
Gitblit v1.9.1