From bdcb8d6d8c858e71f21a274654a41d6d5ab799fc Mon Sep 17 00:00:00 2001 From: Anthony O. <netangel+github@gmail.com> Date: Fri, 08 Aug 2014 04:47:05 -0400 Subject: [PATCH] Update setup_authentication.mkd --- src/main/java/com/gitblit/manager/IAuthenticationManager.java | 24 +++++++++++++++++++++--- 1 files changed, 21 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/gitblit/manager/IAuthenticationManager.java b/src/main/java/com/gitblit/manager/IAuthenticationManager.java index 5d98d12..2665b43 100644 --- a/src/main/java/com/gitblit/manager/IAuthenticationManager.java +++ b/src/main/java/com/gitblit/manager/IAuthenticationManager.java @@ -20,7 +20,7 @@ import com.gitblit.models.TeamModel; import com.gitblit.models.UserModel; -import com.gitblit.transport.ssh.SshSession; +import com.gitblit.transport.ssh.SshKey; public interface IAuthenticationManager extends IManager { @@ -31,10 +31,19 @@ * * @param httpRequest * @return a user object or null + * @since 1.4.0 */ UserModel authenticate(HttpServletRequest httpRequest); - public UserModel authenticate(SshSession sshSession); + /** + * 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, SshKey key); /** * Authenticate a user based on HTTP request parameters. @@ -45,6 +54,7 @@ * @param httpRequest * @param requiresCertificate * @return a user object or null + * @since 1.4.0 */ UserModel authenticate(HttpServletRequest httpRequest, boolean requiresCertificate); @@ -55,6 +65,7 @@ * @param username * @param password * @return a user object or null + * @since 1.4.0 */ UserModel authenticate(String username, char[] password); @@ -63,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); @@ -71,6 +83,7 @@ * * @param response * @param user + * @since 1.4.0 */ void setCookie(HttpServletResponse response, UserModel user); @@ -78,6 +91,7 @@ * Logout a user. * * @param user + * @since 1.4.0 */ void logout(HttpServletResponse response, UserModel user); @@ -85,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); @@ -94,6 +108,7 @@ * * @param user * @return true if the user service supports display name changes + * @since 1.4.0 */ boolean supportsDisplayNameChanges(UserModel user); @@ -102,6 +117,7 @@ * * @param user * @return true if the user service supports email address changes + * @since 1.4.0 */ boolean supportsEmailAddressChanges(UserModel user); @@ -110,6 +126,7 @@ * * @param user * @return true if the user service supports team membership changes + * @since 1.4.0 */ boolean supportsTeamMembershipChanges(UserModel user); @@ -118,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