From e55930b4a3c657eb71fad3aa3f2d276439fc4a8c Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Wed, 11 Dec 2013 14:52:45 -0500
Subject: [PATCH] Show mirror indicator on repository url panel
---
src/main/java/com/gitblit/servlet/GitFilter.java | 30 +++++++++++++++++++++++++++---
1 files changed, 27 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/gitblit/servlet/GitFilter.java b/src/main/java/com/gitblit/servlet/GitFilter.java
index 402636e..58a45ca 100644
--- a/src/main/java/com/gitblit/servlet/GitFilter.java
+++ b/src/main/java/com/gitblit/servlet/GitFilter.java
@@ -17,7 +17,7 @@
import java.text.MessageFormat;
-import javax.inject.Inject;
+import javax.servlet.http.HttpServletRequest;
import com.gitblit.Constants.AccessRestrictionType;
import com.gitblit.Constants.AuthorizationControl;
@@ -25,8 +25,10 @@
import com.gitblit.IStoredSettings;
import com.gitblit.Keys;
import com.gitblit.manager.IAuthenticationManager;
+import com.gitblit.manager.IFederationManager;
import com.gitblit.manager.IRepositoryManager;
import com.gitblit.manager.IRuntimeManager;
+import com.gitblit.manager.IUserManager;
import com.gitblit.models.RepositoryModel;
import com.gitblit.models.UserModel;
import com.gitblit.utils.StringUtils;
@@ -50,14 +52,21 @@
private final IStoredSettings settings;
- @Inject
+ private final IUserManager userManager;
+
+ private final IFederationManager federationManager;
+
public GitFilter(
IRuntimeManager runtimeManager,
+ IUserManager userManager,
IAuthenticationManager authenticationManager,
- IRepositoryManager repositoryManager) {
+ IRepositoryManager repositoryManager,
+ IFederationManager federationManager) {
super(runtimeManager, authenticationManager, repositoryManager);
this.settings = runtimeManager.getSettings();
+ this.userManager = userManager;
+ this.federationManager = federationManager;
}
/**
@@ -114,6 +123,21 @@
}
/**
+ * Returns the user making the request, if the user has authenticated.
+ *
+ * @param httpRequest
+ * @return user
+ */
+ @Override
+ protected UserModel getUser(HttpServletRequest httpRequest) {
+ UserModel user = authenticationManager.authenticate(httpRequest, requiresClientCertificate());
+ if (user == null) {
+ user = federationManager.authenticate(httpRequest);
+ }
+ return user;
+ }
+
+ /**
* Determine if a non-existing repository can be created using this filter.
*
* @return true if the server allows repository creation on-push
--
Gitblit v1.9.1