summaryrefslogtreecommitdiffstats
path: root/src/main/java/com/gitblit/manager/IAuthenticationManager.java
diff options
context:
space:
mode:
authorJames Moger <james.moger@gitblit.com>2014-03-14 12:10:25 -0400
committerJames Moger <james.moger@gitblit.com>2014-04-10 18:58:08 -0400
commit44e2ee1d05a9d455ae60dd64058b31f006d551b7 (patch)
treee2ebf0e3602d4ffac049295f723f51b43e378efa /src/main/java/com/gitblit/manager/IAuthenticationManager.java
parent39ffede55f79395d6d1298f24ce201dbae262a32 (diff)
downloadgitblit-44e2ee1d05a9d455ae60dd64058b31f006d551b7.tar.gz
gitblit-44e2ee1d05a9d455ae60dd64058b31f006d551b7.zip
Revise SSH public key integration with AuthenticationManager
Diffstat (limited to 'src/main/java/com/gitblit/manager/IAuthenticationManager.java')
-rw-r--r--src/main/java/com/gitblit/manager/IAuthenticationManager.java12
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 5d98d127..4f43d928 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 @@ public interface IAuthenticationManager extends IManager {
*/
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.