From bcc8a015ae552726742b4f437b2cb9e809270f96 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 10 Apr 2014 18:58:09 -0400
Subject: [PATCH] Handle ssh keys as objects, not strings, and improve the ls and rm key commands
---
src/main/java/com/gitblit/manager/IAuthenticationManager.java | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/gitblit/manager/IAuthenticationManager.java b/src/main/java/com/gitblit/manager/IAuthenticationManager.java
index 4f43d92..33546d9 100644
--- a/src/main/java/com/gitblit/manager/IAuthenticationManager.java
+++ b/src/main/java/com/gitblit/manager/IAuthenticationManager.java
@@ -15,13 +15,12 @@
*/
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.SshKey;
public interface IAuthenticationManager extends IManager {
@@ -36,13 +35,13 @@
UserModel authenticate(HttpServletRequest httpRequest);
/**
- * Authenticate a user based on a public key.
+ * Authenticate a user based on a ssh public key.
*
* @param username
* @param key
* @return a user object or null
*/
- UserModel authenticate(String username, PublicKey key);
+ UserModel authenticate(String username, SshKey key);
/**
* Authenticate a user based on HTTP request parameters.
--
Gitblit v1.9.1