From 1f4cc634ec72934d5f71131e91cf0ff8cdf7d9e5 Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Thu, 10 Apr 2014 12:10:56 -0400 Subject: [PATCH] Remove unused/garbage artifact from an earlier merge --- src/main/java/com/gitblit/manager/IFederationManager.java | 17 ++++++++++++++++- 1 files changed, 16 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/gitblit/manager/IFederationManager.java b/src/main/java/com/gitblit/manager/IFederationManager.java index 5afdeea..d5880c0 100644 --- a/src/main/java/com/gitblit/manager/IFederationManager.java +++ b/src/main/java/com/gitblit/manager/IFederationManager.java @@ -19,6 +19,8 @@ import java.util.List; import java.util.Map; +import javax.servlet.http.HttpServletRequest; + import com.gitblit.Constants.FederationRequest; import com.gitblit.Constants.FederationToken; import com.gitblit.models.FederationModel; @@ -37,9 +39,22 @@ */ File getProposalsFolder(); + boolean canFederate(); + + /** + * Returns the federation user account. + * + * @return the federation user account + */ UserModel getFederationUser(); - boolean canFederate(); + /** + * Try to authenticate request as the Federation user. + * + * @param httpRequest + * @return the federation user, if authenticated + */ + UserModel authenticate(HttpServletRequest httpRequest); /** * Returns the list of federated gitblit instances that this instance will -- Gitblit v1.9.1