From 2551e848373035202a0a34b864049bc7e565ba91 Mon Sep 17 00:00:00 2001
From: Peter Loron <peter.loron@docusign.com>
Date: Tue, 08 May 2012 15:54:58 -0400
Subject: [PATCH] Adding a limit of 2 [user + pass] on the credential string split. This works around issues with passwords containing colons
---
src/WEB-INF/web.xml | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 53 insertions(+), 4 deletions(-)
diff --git a/src/WEB-INF/web.xml b/src/WEB-INF/web.xml
index 0a6cea9..eef49d4 100644
--- a/src/WEB-INF/web.xml
+++ b/src/WEB-INF/web.xml
@@ -82,8 +82,23 @@
<servlet-name>RpcServlet</servlet-name>
<url-pattern>/rpc/*</url-pattern>
</servlet-mapping>
+
+
+ <!-- Pages Servlet
+ <url-pattern> MUST match:
+ * PagesFilter
+ * com.gitblit.Constants.PAGES_PATH
+ * Wicket Filter ignorePaths parameter -->
+ <servlet>
+ <servlet-name>PagesServlet</servlet-name>
+ <servlet-class>com.gitblit.PagesServlet</servlet-class>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>PagesServlet</servlet-name>
+ <url-pattern>/pages/*</url-pattern>
+ </servlet-mapping>
-
+
<!-- Git Access Restriction Filter
<url-pattern> MUST match:
* GitServlet
@@ -127,8 +142,38 @@
<filter-name>ZipFilter</filter-name>
<url-pattern>/zip/*</url-pattern>
</filter-mapping>
+
-
+ <!-- Rpc Restriction Filter
+ <url-pattern> MUST match:
+ * RpcServlet
+ * com.gitblit.Constants.RPC_PATH
+ * Wicket Filter ignorePaths parameter -->
+ <filter>
+ <filter-name>RpcFilter</filter-name>
+ <filter-class>com.gitblit.RpcFilter</filter-class>
+ </filter>
+ <filter-mapping>
+ <filter-name>RpcFilter</filter-name>
+ <url-pattern>/rpc/*</url-pattern>
+ </filter-mapping>
+
+
+ <!-- Pges Restriction Filter
+ <url-pattern> MUST match:
+ * PagesServlet
+ * com.gitblit.Constants.PAGES_PATH
+ * Wicket Filter ignorePaths parameter -->
+ <filter>
+ <filter-name>PagesFilter</filter-name>
+ <filter-class>com.gitblit.PagesFilter</filter-class>
+ </filter>
+ <filter-mapping>
+ <filter-name>PagesFilter</filter-name>
+ <url-pattern>/pages/*</url-pattern>
+ </filter-mapping>
+
+
<!-- Wicket Filter -->
<filter>
<filter-name>wicketFilter</filter-name>
@@ -152,8 +197,12 @@
* ZipServlet <url-pattern>
* com.gitblit.Constants.ZIP_PATH
* FederationServlet <url-pattern>
- * RpcServlet <url-pattern> -->
- <param-value>git/,feed/,zip/,federation/,rpc/</param-value>
+ * RpcFilter <url-pattern>
+ * RpcServlet <url-pattern>
+ * PagesFilter <url-pattern>
+ * PagesServlet <url-pattern>
+ * com.gitblit.Constants.PAGES_PATH -->
+ <param-value>git/,feed/,zip/,federation/,rpc/,pages/</param-value>
</init-param>
</filter>
<filter-mapping>
--
Gitblit v1.9.1