From a3e480e28aa25dbbe341b10cfeb3fb1cfa625d18 Mon Sep 17 00:00:00 2001
From: Joel Johnson <joel.johnson@issinc.com>
Date: Mon, 29 Jun 2015 12:17:11 -0400
Subject: [PATCH] typo: instantiate log message
---
src/main/java/com/gitblit/servlet/AccessRestrictionFilter.java | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/gitblit/servlet/AccessRestrictionFilter.java b/src/main/java/com/gitblit/servlet/AccessRestrictionFilter.java
index d5ded33..ee4a91a 100644
--- a/src/main/java/com/gitblit/servlet/AccessRestrictionFilter.java
+++ b/src/main/java/com/gitblit/servlet/AccessRestrictionFilter.java
@@ -25,9 +25,9 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import com.gitblit.manager.IAuthenticationManager;
import com.gitblit.manager.IRepositoryManager;
import com.gitblit.manager.IRuntimeManager;
-import com.gitblit.manager.ISessionManager;
import com.gitblit.models.RepositoryModel;
import com.gitblit.models.UserModel;
import com.gitblit.utils.StringUtils;
@@ -48,15 +48,17 @@
*/
public abstract class AccessRestrictionFilter extends AuthenticationFilter {
- protected final IRuntimeManager runtimeManager;
+ protected IRuntimeManager runtimeManager;
- protected final IRepositoryManager repositoryManager;
+ protected IRepositoryManager repositoryManager;
protected AccessRestrictionFilter(
IRuntimeManager runtimeManager,
- ISessionManager sessionManager,
+ IAuthenticationManager authenticationManager,
IRepositoryManager repositoryManager) {
- super(sessionManager);
+
+ super(authenticationManager);
+
this.runtimeManager = runtimeManager;
this.repositoryManager = repositoryManager;
}
@@ -141,6 +143,10 @@
String fullUrl = getFullUrl(httpRequest);
String repository = extractRepositoryName(fullUrl);
+ if (StringUtils.isEmpty(repository)) {
+ httpResponse.setStatus(HttpServletResponse.SC_BAD_REQUEST);
+ return;
+ }
if (repositoryManager.isCollectingGarbage(repository)) {
logger.info(MessageFormat.format("ARF: Rejecting request for {0}, busy collecting garbage!", repository));
--
Gitblit v1.9.1