From cefac9ec81878dfdbbcb0d13843cb2c4430786bc Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 08 Sep 2014 16:22:42 -0400
Subject: [PATCH] Fix value discarding bug in SafeTextModel

---
 src/main/java/com/gitblit/manager/IAuthenticationManager.java |   20 +++++++++++++++-----
 1 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/gitblit/manager/IAuthenticationManager.java b/src/main/java/com/gitblit/manager/IAuthenticationManager.java
index 4f43d92..2665b43 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 {
 
@@ -32,17 +31,19 @@
 	 *
 	 * @param httpRequest
 	 * @return a user object or null
+	 * @since 1.4.0
 	 */
 	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
+* 	 * @since 1.5.0
 	 */
-	UserModel authenticate(String username, PublicKey key);
+	UserModel authenticate(String username, SshKey key);
 
 	/**
 	 * Authenticate a user based on HTTP request parameters.
@@ -53,6 +54,7 @@
 	 * @param httpRequest
 	 * @param requiresCertificate
 	 * @return a user object or null
+	 * @since 1.4.0
 	 */
 	UserModel authenticate(HttpServletRequest httpRequest, boolean requiresCertificate);
 
@@ -63,6 +65,7 @@
 	 * @param username
 	 * @param password
 	 * @return a user object or null
+	 * @since 1.4.0
 	 */
 	UserModel authenticate(String username, char[] password);
 
@@ -71,6 +74,7 @@
 	 *
 	 * @param request
 	 * @return the Gitblit cookie for the request or null if not found
+	 * @since 1.4.0
 	 */
 	String getCookie(HttpServletRequest request);
 
@@ -79,6 +83,7 @@
 	 *
 	 * @param response
 	 * @param user
+	 * @since 1.4.0
 	 */
 	void setCookie(HttpServletResponse response, UserModel user);
 
@@ -86,6 +91,7 @@
 	 * Logout a user.
 	 *
 	 * @param user
+	 * @since 1.4.0
 	 */
 	void logout(HttpServletResponse response, UserModel user);
 
@@ -93,7 +99,7 @@
 	 * Does the user service support changes to credentials?
 	 *
 	 * @return true or false
-	 * @since 1.0.0
+	 * @since 1.4.0
 	 */
 	boolean supportsCredentialChanges(UserModel user);
 
@@ -102,6 +108,7 @@
 	 *
 	 * @param user
 	 * @return true if the user service supports display name changes
+	 * @since 1.4.0
 	 */
 	boolean supportsDisplayNameChanges(UserModel user);
 
@@ -110,6 +117,7 @@
 	 *
 	 * @param user
 	 * @return true if the user service supports email address changes
+	 * @since 1.4.0
 	 */
 	boolean supportsEmailAddressChanges(UserModel user);
 
@@ -118,6 +126,7 @@
 	 *
 	 * @param user
 	 * @return true if the user service supports team membership changes
+	 * @since 1.4.0
 	 */
 	boolean supportsTeamMembershipChanges(UserModel user);
 
@@ -126,6 +135,7 @@
 	 *
 	 * @param user
 	 * @return true if the team memberships can be changed
+	 * @since 1.4.0
 	 */
 	boolean supportsTeamMembershipChanges(TeamModel team);
 

--
Gitblit v1.9.1