From 4495ff757818e2a5c2a556ab2e6a0c3d36bbbc11 Mon Sep 17 00:00:00 2001
From: David Ostrovsky <david@ostrovsky.org>
Date: Thu, 10 Apr 2014 18:58:09 -0400
Subject: [PATCH] Report identified user and command on command failure
---
src/main/java/com/gitblit/manager/IFederationManager.java | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/gitblit/manager/IFederationManager.java b/src/main/java/com/gitblit/manager/IFederationManager.java
index debe362..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;
@@ -27,7 +29,7 @@
import com.gitblit.models.RepositoryModel;
import com.gitblit.models.UserModel;
-public interface IFederationManager {
+public interface IFederationManager extends IManager {
/**
* Returns the path of the proposals folder. This method checks to see if
@@ -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