Merge release 1.6.0

15 files changed, 975 insertions, 442 deletions

diff --git a/src/main/java/com/gitblit/servlet/AccessRestrictionFilter.java b/src/main/java/com/gitblit/servlet/AccessRestrictionFilter.java
index e6a0169c..0e6d323d 100644
--- a/src/main/java/com/gitblit/servlet/AccessRestrictionFilter.java
+++ b/src/main/java/com/gitblit/servlet/AccessRestrictionFilter.java
@@ -19,6 +19,7 @@ import java.io.IOException;
 import java.text.MessageFormat;

 

 import javax.servlet.FilterChain;

+import javax.servlet.FilterConfig;

 import javax.servlet.ServletException;

 import javax.servlet.ServletRequest;

 import javax.servlet.ServletResponse;

@@ -54,8 +55,8 @@ public abstract class AccessRestrictionFilter extends AuthenticationFilter {
 	protected IRepositoryManager repositoryManager;

 

 	@Override

-	protected void inject(ObjectGraph dagger) {

-		super.inject(dagger);

+	protected void inject(ObjectGraph dagger, FilterConfig filterConfig) {

+		super.inject(dagger, filterConfig);

 		this.runtimeManager = dagger.get(IRuntimeManager.class);

 		this.repositoryManager = dagger.get(IRepositoryManager.class);

 	}

diff --git a/src/main/java/com/gitblit/servlet/AuthenticationFilter.java b/src/main/java/com/gitblit/servlet/AuthenticationFilter.java
index ddb85f49..c21f8692 100644
--- a/src/main/java/com/gitblit/servlet/AuthenticationFilter.java
+++ b/src/main/java/com/gitblit/servlet/AuthenticationFilter.java
@@ -22,6 +22,7 @@ import java.util.HashMap;
 import java.util.Map;

 

 import javax.servlet.FilterChain;

+import javax.servlet.FilterConfig;

 import javax.servlet.ServletException;

 import javax.servlet.ServletRequest;

 import javax.servlet.ServletResponse;

@@ -62,7 +63,7 @@ public abstract class AuthenticationFilter extends DaggerFilter {
 	protected IAuthenticationManager authenticationManager;

 

 	@Override

-	protected void inject(ObjectGraph dagger) {

+	protected void inject(ObjectGraph dagger, FilterConfig filterConfig) {

 		this.authenticationManager = dagger.get(IAuthenticationManager.class);

 	}

 

diff --git a/src/main/java/com/gitblit/servlet/EnforceAuthenticationFilter.java b/src/main/java/com/gitblit/servlet/EnforceAuthenticationFilter.java
index 5fdccb71..c015021d 100644
--- a/src/main/java/com/gitblit/servlet/EnforceAuthenticationFilter.java
+++ b/src/main/java/com/gitblit/servlet/EnforceAuthenticationFilter.java
@@ -19,6 +19,7 @@ import java.io.IOException;
 import java.text.MessageFormat;
 
 import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
 import javax.servlet.ServletException;
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
@@ -53,7 +54,7 @@ public class EnforceAuthenticationFilter extends DaggerFilter {
 	private IAuthenticationManager authenticationManager;
 
 	@Override
-	protected void inject(ObjectGraph dagger) {
+	protected void inject(ObjectGraph dagger, FilterConfig filterConfig) {
 		this.settings = dagger.get(IStoredSettings.class);
 		this.authenticationManager = dagger.get(IAuthenticationManager.class);
 	}
diff --git a/src/main/java/com/gitblit/servlet/FilterRuntimeConfig.java b/src/main/java/com/gitblit/servlet/FilterRuntimeConfig.java
new file mode 100644
index 00000000..9f0c0ac5
--- /dev/null
+++ b/src/main/java/com/gitblit/servlet/FilterRuntimeConfig.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright 2014 gitblit.com.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.gitblit.servlet;
+
+import java.util.Enumeration;
+
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletContext;
+
+import com.gitblit.IStoredSettings;
+import com.gitblit.manager.IRuntimeManager;
+
+/**
+ * Wraps a filter config and will prefer a setting retrieved from IStoredSettings
+ * if one is available.
+ *
+ * @author James Moger
+ * @since 1.6.0
+ */
+public class FilterRuntimeConfig implements FilterConfig {
+
+	final IRuntimeManager runtime;
+	final IStoredSettings settings;
+	final String namespace;
+	final FilterConfig config;
+
+	public FilterRuntimeConfig(IRuntimeManager runtime, String namespace, FilterConfig config) {
+		this.runtime = runtime;
+		this.settings = runtime.getSettings();
+		this.namespace = namespace;
+		this.config = config;
+	}
+
+	@Override
+	public String getFilterName() {
+		return config.getFilterName();
+	}
+
+	@Override
+	public ServletContext getServletContext() {
+		return config.getServletContext();
+	}
+
+	@Override
+	public String getInitParameter(String name) {
+		String key = namespace + "." + name;
+		if (settings.hasSettings(key)) {
+			String value = settings.getString(key, null);
+			return value;
+		}
+		return config.getInitParameter(name);
+	}
+
+	@Override
+	public Enumeration<String> getInitParameterNames() {
+		return config.getInitParameterNames();
+	}
+}
diff --git a/src/main/java/com/gitblit/servlet/GitFilter.java b/src/main/java/com/gitblit/servlet/GitFilter.java
index f9c062d2..bb3d3216 100644
--- a/src/main/java/com/gitblit/servlet/GitFilter.java
+++ b/src/main/java/com/gitblit/servlet/GitFilter.java
@@ -17,6 +17,7 @@ package com.gitblit.servlet;
 

 import java.text.MessageFormat;

 

+import javax.servlet.FilterConfig;

 import javax.servlet.http.HttpServletRequest;

 

 import com.gitblit.Constants.AccessRestrictionType;

@@ -53,8 +54,8 @@ public class GitFilter extends AccessRestrictionFilter {
 	private IFederationManager federationManager;

 

 	@Override

-	protected void inject(ObjectGraph dagger) {

-		super.inject(dagger);

+	protected void inject(ObjectGraph dagger, FilterConfig filterConfig) {

+		super.inject(dagger, filterConfig);

 		this.settings = dagger.get(IStoredSettings.class);

 		this.federationManager = dagger.get(IFederationManager.class);

 	}

diff --git a/src/main/java/com/gitblit/servlet/GitblitContext.java b/src/main/java/com/gitblit/servlet/GitblitContext.java
index ebe2cc2b..d5b4092c 100644
--- a/src/main/java/com/gitblit/servlet/GitblitContext.java
+++ b/src/main/java/com/gitblit/servlet/GitblitContext.java
@@ -38,6 +38,7 @@ import com.gitblit.IStoredSettings;
 import com.gitblit.Keys;
 import com.gitblit.WebXmlSettings;
 import com.gitblit.dagger.DaggerContext;
+import com.gitblit.extensions.LifeCycleListener;
 import com.gitblit.manager.IAuthenticationManager;
 import com.gitblit.manager.IFederationManager;
 import com.gitblit.manager.IGitblit;
@@ -174,6 +175,9 @@ public class GitblitContext extends DaggerContext {
 		runtime.start();
 		managers.add(runtime);
 
+		// create the plugin manager instance but do not start it
+		loadManager(injector, IPluginManager.class);
+
 		// start all other managers
 		startManager(injector, INotificationManager.class);
 		startManager(injector, IUserManager.class);
@@ -191,6 +195,15 @@ public class GitblitContext extends DaggerContext {
 		logger.info("");
 		logger.info("All managers started.");
 		logger.info("");
+
+		IPluginManager pluginManager = injector.get(IPluginManager.class);
+		for (LifeCycleListener listener : pluginManager.getExtensions(LifeCycleListener.class)) {
+			try {
+				listener.onStartup();
+			} catch (Throwable t) {
+				logger.error(null, t);
+			}
+		}
 	}
 
 	private String lookupBaseFolderFromJndi() {
@@ -205,9 +218,14 @@ public class GitblitContext extends DaggerContext {
 		return null;
 	}
 
+	protected <X extends IManager> X loadManager(ObjectGraph injector, Class<X> clazz) {
+		X x = injector.get(clazz);
+		return x;
+	}
+
 	protected <X extends IManager> X startManager(ObjectGraph injector, Class<X> clazz) {
+		X x = loadManager(injector, clazz);
 		logManager(clazz);
-		X x = injector.get(clazz);
 		x.start();
 		managers.add(x);
 		return x;
@@ -225,6 +243,16 @@ public class GitblitContext extends DaggerContext {
 	@Override
 	protected void destroyContext(ServletContext context) {
 		logger.info("Gitblit context destroyed by servlet container.");
+
+		IPluginManager pluginManager = getManager(IPluginManager.class);
+		for (LifeCycleListener listener : pluginManager.getExtensions(LifeCycleListener.class)) {
+			try {
+				listener.onShutdown();
+			} catch (Throwable t) {
+				logger.error(null, t);
+			}
+		}
+
 		for (IManager manager : managers) {
 			logger.debug("stopping {}", manager.getClass().getSimpleName());
 			manager.stop();
@@ -352,6 +380,22 @@ public class GitblitContext extends DaggerContext {
 			}
 		}
 
+		// Copy the included gitignore files to the configured gitignore folder
+		String gitignorePath = webxmlSettings.getString(Keys.git.gitignoreFolder, "gitignore");
+		File localGitignores = com.gitblit.utils.FileUtils.resolveParameter(Constants.baseFolder$, base, gitignorePath);
+		if (!localGitignores.exists()) {
+			File warGitignores = new File(contextFolder, "/WEB-INF/data/gitignore");
+			if (!warGitignores.equals(localGitignores)) {
+				try {
+					com.gitblit.utils.FileUtils.copy(localGitignores, warGitignores.listFiles());
+				} catch (IOException e) {
+					logger.error(MessageFormat.format(
+							"Failed to copy included .gitignore files from {0} to {1}",
+							warGitignores, localGitignores));
+				}
+			}
+		}
+
 		// merge the WebXmlSettings into the runtime settings (for backwards-compatibilty)
 		runtimeSettings.merge(webxmlSettings);
 
diff --git a/src/main/java/com/gitblit/servlet/PagesFilter.java b/src/main/java/com/gitblit/servlet/PagesFilter.java
index 9e009163..e07d9b3b 100644
--- a/src/main/java/com/gitblit/servlet/PagesFilter.java
+++ b/src/main/java/com/gitblit/servlet/PagesFilter.java
@@ -15,11 +15,6 @@
  */

 package com.gitblit.servlet;

 

-import org.eclipse.jgit.lib.Repository;

-

-import com.gitblit.Constants.AccessRestrictionType;

-import com.gitblit.models.RepositoryModel;

-import com.gitblit.models.UserModel;

 

 /**

  * The PagesFilter is an AccessRestrictionFilter which ensures the gh-pages

@@ -28,99 +23,7 @@ import com.gitblit.models.UserModel;
  * @author James Moger

  *

  */

-public class PagesFilter extends AccessRestrictionFilter {

-

-	/**

-	 * Extract the repository name from the url.

-	 *

-	 * @param url

-	 * @return repository name

-	 */

-	@Override

-	protected String extractRepositoryName(String url) {

-		// get the repository name from the url by finding a known url suffix

-		String repository = "";

-		Repository r = null;

-		int offset = 0;

-		while (r == null) {

-			int slash = url.indexOf('/', offset);

-			if (slash == -1) {

-				repository = url;

-			} else {

-				repository = url.substring(0, slash);

-			}

-			r = repositoryManager.getRepository(repository, false);

-			if (r == null) {

-				// try again

-				offset = slash + 1;

-			} else {

-				// close the repo

-				r.close();

-			}

-			if (repository.equals(url)) {

-				// either only repository in url or no repository found

-				break;

-			}

-		}

-		return repository;

-	}

-

-	/**

-	 * Analyze the url and returns the action of the request.

-	 *

-	 * @param cloneUrl

-	 * @return action of the request

-	 */

-	@Override

-	protected String getUrlRequestAction(String suffix) {

-		return "VIEW";

-	}

-

-	/**

-	 * Determine if a non-existing repository can be created using this filter.

-	 *

-	 * @return true if the filter allows repository creation

-	 */

-	@Override

-	protected boolean isCreationAllowed() {

-		return false;

-	}

-

-	/**

-	 * Determine if the action may be executed on the repository.

-	 *

-	 * @param repository

-	 * @param action

-	 * @return true if the action may be performed

-	 */

-	@Override

-	protected boolean isActionAllowed(RepositoryModel repository, String action) {

-		return true;

-	}

+public class PagesFilter extends RawFilter {

 

-	/**

-	 * Determine if the repository requires authentication.

-	 *

-	 * @param repository

-	 * @param action

-	 * @return true if authentication required

-	 */

-	@Override

-	protected boolean requiresAuthentication(RepositoryModel repository, String action) {

-		return repository.accessRestriction.atLeast(AccessRestrictionType.VIEW);

-	}

 

-	/**

-	 * Determine if the user can access the repository and perform the specified

-	 * action.

-	 *

-	 * @param repository

-	 * @param user

-	 * @param action

-	 * @return true if user may execute the action on the repository

-	 */

-	@Override

-	protected boolean canAccess(RepositoryModel repository, UserModel user, String action) {

-		return user.canView(repository);

-	}

 }

diff --git a/src/main/java/com/gitblit/servlet/PagesServlet.java b/src/main/java/com/gitblit/servlet/PagesServlet.java
index 7e48f8e2..f578f86f 100644
--- a/src/main/java/com/gitblit/servlet/PagesServlet.java
+++ b/src/main/java/com/gitblit/servlet/PagesServlet.java
@@ -15,42 +15,10 @@
  */

 package com.gitblit.servlet;

 

-import java.io.IOException;

-import java.text.MessageFormat;

-import java.text.ParseException;

-import java.util.ArrayList;

-import java.util.List;

-import java.util.Map;

-import java.util.TreeMap;

-

-import javax.servlet.ServletContext;

-import javax.servlet.ServletException;

 import javax.servlet.http.HttpServletRequest;

 import javax.servlet.http.HttpServletResponse;

 

-import org.eclipse.jgit.lib.FileMode;

-import org.eclipse.jgit.lib.Repository;

-import org.eclipse.jgit.revwalk.RevCommit;

-import org.eclipse.jgit.revwalk.RevTree;

-import org.slf4j.Logger;

-import org.slf4j.LoggerFactory;

-

 import com.gitblit.Constants;

-import com.gitblit.IStoredSettings;

-import com.gitblit.Keys;

-import com.gitblit.dagger.DaggerServlet;

-import com.gitblit.manager.IRepositoryManager;

-import com.gitblit.models.PathModel;

-import com.gitblit.models.RefModel;

-import com.gitblit.utils.ArrayUtils;

-import com.gitblit.utils.ByteFormat;

-import com.gitblit.utils.JGitUtils;

-import com.gitblit.utils.MarkdownUtils;

-import com.gitblit.utils.StringUtils;

-import com.gitblit.wicket.MarkupProcessor;

-import com.gitblit.wicket.MarkupProcessor.MarkupDocument;

-

-import dagger.ObjectGraph;

 

 /**

  * Serves the content of a gh-pages branch.

@@ -58,21 +26,10 @@ import dagger.ObjectGraph;
  * @author James Moger

  *

  */

-public class PagesServlet extends DaggerServlet {

+public class PagesServlet extends RawServlet {

 

 	private static final long serialVersionUID = 1L;

 

-	private transient Logger logger = LoggerFactory.getLogger(PagesServlet.class);

-

-	private IStoredSettings settings;

-

-	private IRepositoryManager repositoryManager;

-

-	@Override

-	protected void inject(ObjectGraph dagger) {

-		this.settings = dagger.get(IStoredSettings.class);

-		this.repositoryManager = dagger.get(IRepositoryManager.class);

-	}

 

 	/**

 	 * Returns an url to this servlet for the specified parameters.

@@ -89,248 +46,31 @@ public class PagesServlet extends DaggerServlet {
 		return baseURL + Constants.PAGES + repository + "/" + (path == null ? "" : ("/" + path));

 	}

 

-	/**

-	 * Retrieves the specified resource from the gh-pages branch of the

-	 * repository.

-	 *

-	 * @param request

-	 * @param response

-	 * @throws javax.servlet.ServletException

-	 * @throws java.io.IOException

-	 */

-	private void processRequest(HttpServletRequest request, HttpServletResponse response)

-			throws ServletException, IOException {

-		String path = request.getPathInfo();

-		if (path.toLowerCase().endsWith(".git")) {

-			// forward to url with trailing /

-			// this is important for relative pages links

-			response.sendRedirect(request.getServletPath() + path + "/");

-			return;

-		}

-		if (path.charAt(0) == '/') {

-			// strip leading /

-			path = path.substring(1);

-		}

+	@Override

+	protected String getBranch(String repository, HttpServletRequest request) {

+		return "gh-pages";

+	}

 

-		// determine repository and resource from url

-		String repository = "";

-		String resource = "";

-		Repository r = null;

-		int offset = 0;

-		while (r == null) {

-			int slash = path.indexOf('/', offset);

-			if (slash == -1) {

-				repository = path;

-			} else {

-				repository = path.substring(0, slash);

-			}

-			r = repositoryManager.getRepository(repository, false);

-			offset = slash + 1;

-			if (offset > 0) {

-				resource = path.substring(offset);

-			}

-			if (repository.equals(path)) {

-				// either only repository in url or no repository found

-				break;

-			}

+	@Override

+	protected String getPath(String repository, String branch, HttpServletRequest request) {

+		String pi = request.getPathInfo().substring(1);

+		if (pi.equals(repository)) {

+			return "";

 		}

-

-		ServletContext context = request.getSession().getServletContext();

-

-		try {

-			if (r == null) {

-				// repository not found!

-				String mkd = MessageFormat.format(

-						"# Error\nSorry, no valid **repository** specified in this url: {0}!",

-						repository);

-				error(response, mkd);

-				return;

-			}

-

-			// retrieve the content from the repository

-			RefModel pages = JGitUtils.getPagesBranch(r);

-			RevCommit commit = JGitUtils.getCommit(r, pages.getObjectId().getName());

-

-			if (commit == null) {

-				// branch not found!

-				String mkd = MessageFormat.format(

-						"# Error\nSorry, the repository {0} does not have a **gh-pages** branch!",

-						repository);

-				error(response, mkd);

-				return;

-			}

-

-			MarkupProcessor processor = new MarkupProcessor(settings);

-			String [] encodings = settings.getStrings(Keys.web.blobEncodings).toArray(new String[0]);

-

-			RevTree tree = commit.getTree();

-

-			String res = resource;

-			if (res.endsWith("/")) {

-				res = res.substring(0, res.length() - 1);

-			}

-

-			List<PathModel> pathEntries = JGitUtils.getFilesInPath(r, res, commit);

-

-			byte[] content = null;

-			if (pathEntries.isEmpty()) {

-				// not a path, a specific resource

-				try {

-					String contentType = context.getMimeType(res);

-					if (contentType == null) {

-						contentType = "text/plain";

-					}

-					if (contentType.startsWith("text")) {

-						content = JGitUtils.getStringContent(r, tree, res, encodings).getBytes(

-								Constants.ENCODING);

-					} else {

-						content = JGitUtils.getByteContent(r, tree, res, false);

-					}

-					response.setContentType(contentType);

-				} catch (Exception e) {

-				}

-			} else {

-				// path request

-				if (!request.getPathInfo().endsWith("/")) {

-					// redirect to trailing '/' url

-					response.sendRedirect(request.getServletPath() + request.getPathInfo() + "/");

-					return;

-				}

-

-				Map<String, String> names = new TreeMap<String, String>();

-				for (PathModel entry : pathEntries) {

-					names.put(entry.name.toLowerCase(), entry.name);

-				}

-

-				List<String> extensions = new ArrayList<String>();

-				extensions.add("html");

-				extensions.add("htm");

-				extensions.addAll(processor.getMarkupExtensions());

-				for (String ext : extensions) {

-					String key = "index." + ext;

-

-					if (names.containsKey(key)) {

-						String fileName = names.get(key);

-						String fullPath = fileName;

-						if (!res.isEmpty()) {

-							fullPath = res + "/" + fileName;

-						}

-						String stringContent = JGitUtils.getStringContent(r, tree, fullPath, encodings);

-						if (stringContent == null) {

-							continue;

-						}

-						content = stringContent.getBytes(Constants.ENCODING);

-						if (content != null) {

-							res = fullPath;

-							// assume text/html unless the servlet container

-							// overrides

-							response.setContentType("text/html; charset=" + Constants.ENCODING);

-							break;

-						}

-					}

-				}

-			}

-

-			// no content, document list or custom 404 page

-			if (ArrayUtils.isEmpty(content)) {

-				if (pathEntries.isEmpty()) {

-					// 404

-					String custom404 = JGitUtils.getStringContent(r, tree, "404.html", encodings);

-					if (!StringUtils.isEmpty(custom404)) {

-						content = custom404.getBytes(Constants.ENCODING);

-					}

-

-					// still no content

-					if (ArrayUtils.isEmpty(content)) {

-						String str = MessageFormat.format(

-								"# Error\nSorry, the requested resource **{0}** was not found.",

-								resource);

-						content = MarkdownUtils.transformMarkdown(str).getBytes(Constants.ENCODING);

-					}

-

-					try {

-						// output the content

-						logger.warn("Pages 404: " + resource);

-						response.setStatus(HttpServletResponse.SC_NOT_FOUND);

-						response.getOutputStream().write(content);

-						response.flushBuffer();

-					} catch (Throwable t) {

-						logger.error("Failed to write page to client", t);

-					}

-				} else {

-					// document list

-					response.setContentType("text/html");

-					response.getWriter().append("<style>table th, table td { min-width: 150px; text-align: left; }</style>");

-					response.getWriter().append("<table>");

-					response.getWriter().append("<thead><tr><th>path</th><th>mode</th><th>size</th></tr>");

-					response.getWriter().append("</thead>");

-					response.getWriter().append("<tbody>");

-					String pattern = "<tr><td><a href=\"{0}/{1}\">{1}</a></td><td>{2}</td><td>{3}</td></tr>";

-					final ByteFormat byteFormat = new ByteFormat();

-					if (!pathEntries.isEmpty()) {

-						if (pathEntries.get(0).path.indexOf('/') > -1) {

-							// we are in a subdirectory, add parent directory link

-							pathEntries.add(0, new PathModel("..", resource + "/..", 0, FileMode.TREE.getBits(), null, null));

-						}

-					}

-

-					String basePath = request.getServletPath() + request.getPathInfo();

-					if (basePath.charAt(basePath.length() - 1) == '/') {

-						// strip trailing slash

-						basePath = basePath.substring(0, basePath.length() - 1);

-					}

-					for (PathModel entry : pathEntries) {

-						response.getWriter().append(MessageFormat.format(pattern, basePath, entry.name,

-								JGitUtils.getPermissionsFromMode(entry.mode), byteFormat.format(entry.size)));

-					}

-					response.getWriter().append("</tbody>");

-					response.getWriter().append("</table>");

-				}

-				return;

-			}

-

-			// check to see if we should transform markup files

-			String ext = StringUtils.getFileExtension(resource);

-			if (processor.getMarkupExtensions().contains(ext)) {

-				String markup = new String(content, Constants.ENCODING);

-				MarkupDocument markupDoc = processor.parse(repository, commit.getName(), resource, markup);

-				content = markupDoc.html.getBytes("UTF-8");

-				response.setContentType("text/html; charset=" + Constants.ENCODING);

-			}

-

-			try {

-				// output the content

-				response.setHeader("Cache-Control", "public, max-age=3600, must-revalidate");

-				response.setDateHeader("Last-Modified", JGitUtils.getCommitDate(commit).getTime());

-				response.getOutputStream().write(content);

-				response.flushBuffer();

-			} catch (Throwable t) {

-				logger.error("Failed to write page to client", t);

-			}

-

-		} catch (Throwable t) {

-			logger.error("Failed to write page to client", t);

-		} finally {

-			r.close();

+		String path = pi.substring(pi.indexOf(repository) + repository.length() + 1);

+		if (path.endsWith("/")) {

+			path = path.substring(0, path.length() - 1);

 		}

-	}

-

-	private void error(HttpServletResponse response, String mkd) throws ServletException,

-			IOException, ParseException {

-		String content = MarkdownUtils.transformMarkdown(mkd);

-		response.setContentType("text/html; charset=" + Constants.ENCODING);

-		response.getWriter().write(content);

+		return path;

 	}

 

 	@Override

-	protected void doPost(HttpServletRequest request, HttpServletResponse response)

-			throws ServletException, IOException {

-		processRequest(request, response);

+	protected boolean renderIndex() {

+		return true;

 	}

 

 	@Override

-	protected void doGet(HttpServletRequest request, HttpServletResponse response)

-			throws ServletException, IOException {

-		processRequest(request, response);

+	protected void setContentType(HttpServletResponse response, String contentType) {

+		response.setContentType(contentType);;

 	}

 }

diff --git a/src/main/java/com/gitblit/servlet/ProxyFilter.java b/src/main/java/com/gitblit/servlet/ProxyFilter.java
new file mode 100644
index 00000000..46f59de9
--- /dev/null
+++ b/src/main/java/com/gitblit/servlet/ProxyFilter.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright 2014 gitblit.com.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.gitblit.servlet;
+
+import java.io.IOException;
+import java.util.Iterator;
+import java.util.List;
+
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+
+import ro.fortsoft.pf4j.PluginWrapper;
+
+import com.gitblit.dagger.DaggerFilter;
+import com.gitblit.extensions.HttpRequestFilter;
+import com.gitblit.manager.IPluginManager;
+import com.gitblit.manager.IRuntimeManager;
+
+import dagger.ObjectGraph;
+
+/**
+ * A request filter than allows registered extension request filters to access
+ * request data.  The intended purpose is for server monitoring plugins.
+ *
+ * @author David Ostrovsky
+ * @since 1.6.0
+ */
+public class ProxyFilter extends DaggerFilter {
+	private List<HttpRequestFilter> filters;
+
+	@Override
+	protected void inject(ObjectGraph dagger, FilterConfig filterConfig) throws ServletException {
+		IRuntimeManager runtimeManager = dagger.get(IRuntimeManager.class);
+		IPluginManager pluginManager = dagger.get(IPluginManager.class);
+
+		filters = pluginManager.getExtensions(HttpRequestFilter.class);
+		for (HttpRequestFilter f : filters) {
+			// wrap the filter config for Gitblit settings retrieval
+			PluginWrapper pluginWrapper = pluginManager.whichPlugin(f.getClass());
+			FilterConfig runtimeConfig = new FilterRuntimeConfig(runtimeManager,
+					pluginWrapper.getPluginId(), filterConfig);
+
+			f.init(runtimeConfig);
+		}
+	}
+
+	@Override
+	public void doFilter(ServletRequest req, ServletResponse res, final FilterChain last)
+			throws IOException, ServletException {
+		final Iterator<HttpRequestFilter> itr = filters.iterator();
+		new FilterChain() {
+			@Override
+			public void doFilter(ServletRequest req, ServletResponse res) throws IOException,
+					ServletException {
+				if (itr.hasNext()) {
+					itr.next().doFilter(req, res, this);
+				} else {
+					last.doFilter(req, res);
+				}
+			}
+		}.doFilter(req, res);
+	}
+
+	@Override
+	public void destroy() {
+		for (HttpRequestFilter f : filters) {
+			f.destroy();
+		}
+	}
+}
diff --git a/src/main/java/com/gitblit/servlet/RawFilter.java b/src/main/java/com/gitblit/servlet/RawFilter.java
new file mode 100644
index 00000000..34989c98
--- /dev/null
+++ b/src/main/java/com/gitblit/servlet/RawFilter.java
@@ -0,0 +1,126 @@
+/*

+ * Copyright 2012 gitblit.com.

+ *

+ * Licensed under the Apache License, Version 2.0 (the "License");

+ * you may not use this file except in compliance with the License.

+ * You may obtain a copy of the License at

+ *

+ *     http://www.apache.org/licenses/LICENSE-2.0

+ *

+ * Unless required by applicable law or agreed to in writing, software

+ * distributed under the License is distributed on an "AS IS" BASIS,

+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+ * See the License for the specific language governing permissions and

+ * limitations under the License.

+ */

+package com.gitblit.servlet;

+

+import org.eclipse.jgit.lib.Repository;

+

+import com.gitblit.Constants.AccessRestrictionType;

+import com.gitblit.models.RepositoryModel;

+import com.gitblit.models.UserModel;

+

+/**

+ * The RawFilter is an AccessRestrictionFilter which ensures http branch

+ * requests for a view-restricted repository are authenticated and authorized.

+ *

+ * @author James Moger

+ *

+ */

+public class RawFilter extends AccessRestrictionFilter {

+

+	/**

+	 * Extract the repository name from the url.

+	 *

+	 * @param url

+	 * @return repository name

+	 */

+	@Override

+	protected String extractRepositoryName(String url) {

+		// get the repository name from the url by finding a known url suffix

+		String repository = "";

+		Repository r = null;

+		int offset = 0;

+		while (r == null) {

+			int slash = url.indexOf('/', offset);

+			if (slash == -1) {

+				repository = url;

+			} else {

+				repository = url.substring(0, slash);

+			}

+			r = repositoryManager.getRepository(repository, false);

+			if (r == null) {

+				// try again

+				offset = slash + 1;

+			} else {

+				// close the repo

+				r.close();

+			}

+			if (repository.equals(url)) {

+				// either only repository in url or no repository found

+				break;

+			}

+		}

+		return repository;

+	}

+

+	/**

+	 * Analyze the url and returns the action of the request.

+	 *

+	 * @param cloneUrl

+	 * @return action of the request

+	 */

+	@Override

+	protected String getUrlRequestAction(String suffix) {

+		return "VIEW";

+	}

+

+	/**

+	 * Determine if a non-existing repository can be created using this filter.

+	 *

+	 * @return true if the filter allows repository creation

+	 */

+	@Override

+	protected boolean isCreationAllowed() {

+		return false;

+	}

+

+	/**

+	 * Determine if the action may be executed on the repository.

+	 *

+	 * @param repository

+	 * @param action

+	 * @return true if the action may be performed

+	 */

+	@Override

+	protected boolean isActionAllowed(RepositoryModel repository, String action) {

+		return true;

+	}

+

+	/**

+	 * Determine if the repository requires authentication.

+	 *

+	 * @param repository

+	 * @param action

+	 * @return true if authentication required

+	 */

+	@Override

+	protected boolean requiresAuthentication(RepositoryModel repository, String action) {

+		return repository.accessRestriction.atLeast(AccessRestrictionType.VIEW);

+	}

+

+	/**

+	 * Determine if the user can access the repository and perform the specified

+	 * action.

+	 *

+	 * @param repository

+	 * @param user

+	 * @param action

+	 * @return true if user may execute the action on the repository

+	 */

+	@Override

+	protected boolean canAccess(RepositoryModel repository, UserModel user, String action) {

+		return user.canView(repository);

+	}

+}

diff --git a/src/main/java/com/gitblit/servlet/RawServlet.java b/src/main/java/com/gitblit/servlet/RawServlet.java
new file mode 100644
index 00000000..15e036ea
--- /dev/null
+++ b/src/main/java/com/gitblit/servlet/RawServlet.java
@@ -0,0 +1,483 @@
+/*
+ * Copyright 2014 gitblit.com.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.gitblit.servlet;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.text.MessageFormat;
+import java.text.ParseException;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
+
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.tika.Tika;
+import org.eclipse.jgit.lib.FileMode;
+import org.eclipse.jgit.lib.MutableObjectId;
+import org.eclipse.jgit.lib.ObjectLoader;
+import org.eclipse.jgit.lib.ObjectReader;
+import org.eclipse.jgit.lib.Repository;
+import org.eclipse.jgit.revwalk.RevCommit;
+import org.eclipse.jgit.revwalk.RevWalk;
+import org.eclipse.jgit.treewalk.TreeWalk;
+import org.eclipse.jgit.treewalk.filter.PathFilter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.gitblit.Constants;
+import com.gitblit.Keys;
+import com.gitblit.dagger.DaggerServlet;
+import com.gitblit.manager.IRepositoryManager;
+import com.gitblit.manager.IRuntimeManager;
+import com.gitblit.models.PathModel;
+import com.gitblit.utils.ByteFormat;
+import com.gitblit.utils.JGitUtils;
+import com.gitblit.utils.MarkdownUtils;
+import com.gitblit.utils.StringUtils;
+
+import dagger.ObjectGraph;
+
+/**
+ * Serves the content of a branch.
+ *
+ * @author James Moger
+ *
+ */
+public class RawServlet extends DaggerServlet {
+
+	private static final long serialVersionUID = 1L;
+
+	private transient Logger logger = LoggerFactory.getLogger(RawServlet.class);
+
+	private IRuntimeManager runtimeManager;
+
+	private IRepositoryManager repositoryManager;
+
+	@Override
+	protected void inject(ObjectGraph dagger) {
+		this.runtimeManager = dagger.get(IRuntimeManager.class);
+		this.repositoryManager = dagger.get(IRepositoryManager.class);
+	}
+
+	/**
+	 * Returns an url to this servlet for the specified parameters.
+	 *
+	 * @param baseURL
+	 * @param repository
+	 * @param branch
+	 * @param path
+	 * @return an url
+	 */
+	public static String asLink(String baseURL, String repository, String branch, String path) {
+		if (baseURL.length() > 0 && baseURL.charAt(baseURL.length() - 1) == '/') {
+			baseURL = baseURL.substring(0, baseURL.length() - 1);
+		}
+
+		if (branch != null) {
+			char fsc = '!';
+			char c = GitblitContext.getManager(IRuntimeManager.class).getSettings().getChar(Keys.web.forwardSlashCharacter, '/');
+			if (c != '/') {
+				fsc = c;
+			}
+			branch = branch.replace('/', fsc);
+		}
+
+		String encodedPath = path == null ? "" : path.replace(' ', '-');
+		try {
+			encodedPath = URLEncoder.encode(encodedPath, "UTF-8");
+		} catch (UnsupportedEncodingException e) {
+		}
+		return baseURL + Constants.RAW_PATH + repository + "/" + (branch == null ? "" : (branch + "/" + (path == null ? "" : encodedPath)));
+	}
+
+	protected String getBranch(String repository, HttpServletRequest request) {
+		String pi = request.getPathInfo();
+		String branch = pi.substring(pi.indexOf(repository) + repository.length() + 1);
+		int fs = branch.indexOf('/');
+		if (fs > -1) {
+			branch = branch.substring(0, fs);
+		}
+		char c = runtimeManager.getSettings().getChar(Keys.web.forwardSlashCharacter, '/');
+		return branch.replace('!', '/').replace(c, '/');
+	}
+
+	protected String getPath(String repository, String branch, HttpServletRequest request) {
+		String base = repository + "/" + branch;
+		String pi = request.getPathInfo().substring(1);
+		if (pi.equals(base)) {
+			return "";
+		}
+		String path = pi.substring(pi.indexOf(base) + base.length() + 1);
+		if (path.endsWith("/")) {
+			path = path.substring(0, path.length() - 1);
+		}
+		return path;
+	}
+
+	protected boolean renderIndex() {
+		return false;
+	}
+
+	/**
+	 * Retrieves the specified resource from the specified branch of the
+	 * repository.
+	 *
+	 * @param request
+	 * @param response
+	 * @throws javax.servlet.ServletException
+	 * @throws java.io.IOException
+	 */
+	private void processRequest(HttpServletRequest request, HttpServletResponse response)
+			throws ServletException, IOException {
+		String path = request.getPathInfo();
+		if (path.toLowerCase().endsWith(".git")) {
+			// forward to url with trailing /
+			// this is important for relative pages links
+			response.sendRedirect(request.getServletPath() + path + "/");
+			return;
+		}
+		if (path.charAt(0) == '/') {
+			// strip leading /
+			path = path.substring(1);
+		}
+
+		// determine repository and resource from url
+		String repository = "";
+		Repository r = null;
+		int offset = 0;
+		while (r == null) {
+			int slash = path.indexOf('/', offset);
+			if (slash == -1) {
+				repository = path;
+			} else {
+				repository = path.substring(0, slash);
+			}
+			offset += slash;
+			r = repositoryManager.getRepository(repository, false);
+			if (repository.equals(path)) {
+				// either only repository in url or no repository found
+				break;
+			}
+		}
+
+		ServletContext context = request.getSession().getServletContext();
+
+		try {
+			if (r == null) {
+				// repository not found!
+				String mkd = MessageFormat.format(
+						"# Error\nSorry, no valid **repository** specified in this url: {0}!",
+						path);
+				error(response, mkd);
+				return;
+			}
+
+			// identify the branch
+			String branch = getBranch(repository, request);
+			if (StringUtils.isEmpty(branch)) {
+				branch = r.getBranch();
+				if (branch == null) {
+					// no branches found!  empty?
+					String mkd = MessageFormat.format(
+							"# Error\nSorry, no valid **branch** specified in this url: {0}!",
+							path);
+					error(response, mkd);
+				} else {
+					// redirect to default branch
+					String base = request.getRequestURI();
+					String url = base + branch + "/";
+					response.sendRedirect(url);
+				}
+				return;
+			}
+
+			// identify the requested path
+			String requestedPath = getPath(repository, branch, request);
+
+			// identify the commit
+			RevCommit commit = JGitUtils.getCommit(r, branch);
+			if (commit == null) {
+				// branch not found!
+				String mkd = MessageFormat.format(
+						"# Error\nSorry, the repository {0} does not have a **{1}** branch!",
+						repository, branch);
+				error(response, mkd);
+				return;
+			}
+
+
+			List<PathModel> pathEntries = JGitUtils.getFilesInPath(r, requestedPath, commit);
+			if (pathEntries.isEmpty()) {
+				// requested a specific resource
+				String file = StringUtils.getLastPathElement(requestedPath);
+				try {
+					// query Tika for the content type
+					Tika tika = new Tika();
+					String contentType = tika.detect(file);
+
+					if (contentType == null) {
+						// ask the container for the content type
+						contentType = context.getMimeType(requestedPath);
+
+						if (contentType == null) {
+							// still unknown content type, assume binary
+							contentType = "application/octet-stream";
+						}
+					}
+
+					setContentType(response, contentType);
+
+					if (isTextType(contentType)) {
+
+						// load, interpret, and serve text content as UTF-8
+						String [] encodings = runtimeManager.getSettings().getStrings(Keys.web.blobEncodings).toArray(new String[0]);
+						String content = JGitUtils.getStringContent(r, commit.getTree(), requestedPath, encodings);
+
+						byte [] bytes = content.getBytes(Constants.ENCODING);
+						response.setContentLength(bytes.length);
+						ByteArrayInputStream is = new ByteArrayInputStream(bytes);
+						sendContent(response, JGitUtils.getCommitDate(commit), is);
+
+					} else {
+						// serve binary content
+						String filename = StringUtils.getLastPathElement(requestedPath);
+						try {
+					    	String userAgent = request.getHeader("User-Agent");
+							if (userAgent != null && userAgent.indexOf("MSIE 5.5") > -1) {
+							      response.setHeader("Content-Disposition", "filename=\""
+							    		  +  URLEncoder.encode(filename, Constants.ENCODING) + "\"");
+							} else if (userAgent != null && userAgent.indexOf("MSIE") > -1) {
+							      response.setHeader("Content-Disposition", "attachment; filename=\""
+							    		  +  URLEncoder.encode(filename, Constants.ENCODING) + "\"");
+							} else {
+									response.setHeader("Content-Disposition", "attachment; filename=\""
+									      + new String(filename.getBytes(Constants.ENCODING), "latin1") + "\"");
+							}
+						}
+						catch (UnsupportedEncodingException e) {
+							response.setHeader("Content-Disposition", "attachment; filename=\"" + filename + "\"");
+						}
+
+						// stream binary content directly from the repository
+						streamFromRepo(response, r, commit, requestedPath);
+					}
+					return;
+				} catch (Exception e) {
+					logger.error(null, e);
+				}
+			} else {
+				// path request
+				if (!request.getPathInfo().endsWith("/")) {
+					// redirect to trailing '/' url
+					response.sendRedirect(request.getServletPath() + request.getPathInfo() + "/");
+					return;
+				}
+
+				if (renderIndex()) {
+					// locate and render an index file
+					Map<String, String> names = new TreeMap<String, String>();
+					for (PathModel entry : pathEntries) {
+						names.put(entry.name.toLowerCase(), entry.name);
+					}
+
+					List<String> extensions = new ArrayList<String>();
+					extensions.add("html");
+					extensions.add("htm");
+
+					String content = null;
+					for (String ext : extensions) {
+						String key = "index." + ext;
+
+						if (names.containsKey(key)) {
+							String fileName = names.get(key);
+							String fullPath = fileName;
+							if (!requestedPath.isEmpty()) {
+								fullPath = requestedPath + "/" + fileName;
+							}
+
+							String [] encodings = runtimeManager.getSettings().getStrings(Keys.web.blobEncodings).toArray(new String[0]);
+							String stringContent = JGitUtils.getStringContent(r, commit.getTree(), fullPath, encodings);
+							if (stringContent == null) {
+								continue;
+							}
+							content = stringContent;
+							requestedPath = fullPath;
+							break;
+						}
+					}
+
+					response.setContentType("text/html; charset=" + Constants.ENCODING);
+					byte [] bytes = content.getBytes(Constants.ENCODING);
+					response.setContentLength(bytes.length);
+
+					ByteArrayInputStream is = new ByteArrayInputStream(bytes);
+					sendContent(response, JGitUtils.getCommitDate(commit), is);
+					return;
+				}
+			}
+
+			// no content, document list or 404 page
+			if (pathEntries.isEmpty()) {
+				// default 404 page
+				String str = MessageFormat.format(
+						"# Error\nSorry, the requested resource **{0}** was not found.",
+						requestedPath);
+				response.setStatus(HttpServletResponse.SC_NOT_FOUND);
+				error(response, str);
+				return;
+			} else {
+				//
+				// directory list
+				//
+				response.setContentType("text/html");
+				response.getWriter().append("<style>table th, table td { min-width: 150px; text-align: left; }</style>");
+				response.getWriter().append("<table>");
+				response.getWriter().append("<thead><tr><th>path</th><th>mode</th><th>size</th></tr>");
+				response.getWriter().append("</thead>");
+				response.getWriter().append("<tbody>");
+				String pattern = "<tr><td><a href=\"{0}/{1}\">{1}</a></td><td>{2}</td><td>{3}</td></tr>";
+				final ByteFormat byteFormat = new ByteFormat();
+				if (!pathEntries.isEmpty()) {
+					if (pathEntries.get(0).path.indexOf('/') > -1) {
+						// we are in a subdirectory, add parent directory link
+						String pp = URLEncoder.encode(requestedPath, Constants.ENCODING);
+						pathEntries.add(0, new PathModel("..", pp + "/..", 0, FileMode.TREE.getBits(), null, null));
+					}
+				}
+
+				String basePath = request.getServletPath() + request.getPathInfo();
+				if (basePath.charAt(basePath.length() - 1) == '/') {
+					// strip trailing slash
+					basePath = basePath.substring(0, basePath.length() - 1);
+				}
+				for (PathModel entry : pathEntries) {
+					String pp = URLEncoder.encode(entry.name, Constants.ENCODING);
+					response.getWriter().append(MessageFormat.format(pattern, basePath, pp,
+							JGitUtils.getPermissionsFromMode(entry.mode),
+							entry.isFile() ? byteFormat.format(entry.size) : ""));
+				}
+				response.getWriter().append("</tbody>");
+				response.getWriter().append("</table>");
+			}
+		} catch (Throwable t) {
+			logger.error("Failed to write page to client", t);
+		} finally {
+			r.close();
+		}
+	}
+
+	protected boolean isTextType(String contentType) {
+		if (contentType.startsWith("text/")
+				|| "application/json".equals(contentType)
+				|| "application/xml".equals(contentType)) {
+			return true;
+		}
+		return false;
+	}
+
+	/**
+	 * Override all text types to be plain text.
+	 *
+	 * @param response
+	 * @param contentType
+	 */
+	protected void setContentType(HttpServletResponse response, String contentType) {
+		if (isTextType(contentType)) {
+			response.setContentType("text/plain");
+		} else {
+			response.setContentType(contentType);
+		}
+	}
+
+	private void streamFromRepo(HttpServletResponse response, Repository repository,
+			RevCommit commit, String requestedPath) throws IOException {
+
+		response.setDateHeader("Last-Modified", JGitUtils.getCommitDate(commit).getTime());
+		response.setHeader("Cache-Control", "public, max-age=3600, must-revalidate");
+
+		RevWalk rw = new RevWalk(repository);
+		TreeWalk tw = new TreeWalk(repository);
+		try {
+			tw.reset();
+			tw.addTree(commit.getTree());
+			PathFilter f = PathFilter.create(requestedPath);
+			tw.setFilter(f);
+			tw.setRecursive(true);
+			MutableObjectId id = new MutableObjectId();
+			ObjectReader reader = tw.getObjectReader();
+			while (tw.next()) {
+				FileMode mode = tw.getFileMode(0);
+				if (mode == FileMode.GITLINK || mode == FileMode.TREE) {
+					continue;
+				}
+				tw.getObjectId(id, 0);
+
+				long len = reader.getObjectSize(id, org.eclipse.jgit.lib.Constants.OBJ_BLOB);
+				response.setIntHeader("Content-Length", (int) len);
+				ObjectLoader ldr = repository.open(id);
+				ldr.copyTo(response.getOutputStream());
+			}
+		} finally {
+			tw.release();
+			rw.dispose();
+		}
+
+		response.flushBuffer();
+	}
+
+	private void sendContent(HttpServletResponse response, Date date, InputStream is) throws ServletException, IOException {
+		response.setDateHeader("Last-Modified", date.getTime());
+		response.setHeader("Cache-Control", "public, max-age=3600, must-revalidate");
+		try {
+			byte[] tmp = new byte[8192];
+			int len = 0;
+			while ((len = is.read(tmp)) > -1) {
+				response.getOutputStream().write(tmp, 0, len);
+			}
+		} finally {
+			is.close();
+		}
+		response.flushBuffer();
+	}
+
+	private void error(HttpServletResponse response, String mkd) throws ServletException,
+			IOException, ParseException {
+		String content = MarkdownUtils.transformMarkdown(mkd);
+		response.setContentType("text/html; charset=" + Constants.ENCODING);
+		response.getWriter().write(content);
+	}
+
+	@Override
+	protected void doPost(HttpServletRequest request, HttpServletResponse response)
+			throws ServletException, IOException {
+		processRequest(request, response);
+	}
+
+	@Override
+	protected void doGet(HttpServletRequest request, HttpServletResponse response)
+			throws ServletException, IOException {
+		processRequest(request, response);
+	}
+}
diff --git a/src/main/java/com/gitblit/servlet/RpcFilter.java b/src/main/java/com/gitblit/servlet/RpcFilter.java
index e0b1a233..23bf956e 100644
--- a/src/main/java/com/gitblit/servlet/RpcFilter.java
+++ b/src/main/java/com/gitblit/servlet/RpcFilter.java
@@ -19,6 +19,7 @@ import java.io.IOException;
 import java.text.MessageFormat;

 

 import javax.servlet.FilterChain;

+import javax.servlet.FilterConfig;

 import javax.servlet.ServletException;

 import javax.servlet.ServletRequest;

 import javax.servlet.ServletResponse;

@@ -53,8 +54,8 @@ public class RpcFilter extends AuthenticationFilter {
 	private IRuntimeManager runtimeManager;

 

 	@Override

-	protected void inject(ObjectGraph dagger) {

-		super.inject(dagger);

+	protected void inject(ObjectGraph dagger, FilterConfig filterConfig) {

+		super.inject(dagger, filterConfig);

 		this.settings = dagger.get(IStoredSettings.class);

 		this.runtimeManager = dagger.get(IRuntimeManager.class);

 	}

diff --git a/src/main/java/com/gitblit/servlet/RpcServlet.java b/src/main/java/com/gitblit/servlet/RpcServlet.java
index 2d59ebd7..b8cdfb04 100644
--- a/src/main/java/com/gitblit/servlet/RpcServlet.java
+++ b/src/main/java/com/gitblit/servlet/RpcServlet.java
@@ -53,13 +53,12 @@ import dagger.ObjectGraph;
  * Handles remote procedure calls.

  *

  * @author James Moger

- *

  */

 public class RpcServlet extends JsonServlet {

 

 	private static final long serialVersionUID = 1L;

 

-	public static final int PROTOCOL_VERSION = 7;

+	public static final int PROTOCOL_VERSION = 8;

 

 	private IStoredSettings settings;

 

@@ -80,12 +79,11 @@ public class RpcServlet extends JsonServlet {
 	 * @throws java.io.IOException

 	 */

 	@Override

-	protected void processRequest(HttpServletRequest request, HttpServletResponse response)

-			throws ServletException, IOException {

+	protected void processRequest(HttpServletRequest request, HttpServletResponse response) throws ServletException,

+			IOException {

 		RpcRequest reqType = RpcRequest.fromName(request.getParameter("req"));

 		String objectName = request.getParameter("name");

-		logger.info(MessageFormat.format("Rpc {0} request from {1}", reqType,

-				request.getRemoteAddr()));

+		logger.info(MessageFormat.format("Rpc {0} request from {1}", reqType, request.getRemoteAddr()));

 

 		UserModel user = (UserModel) request.getUserPrincipal();

 

@@ -130,7 +128,8 @@ public class RpcServlet extends JsonServlet {
 				}

 				if (model.isCollectingGarbage) {

 					// skip garbage collecting repository

-					logger.warn(MessageFormat.format("Temporarily excluding {0} from RPC, busy collecting garbage", model.name));

+					logger.warn(MessageFormat.format("Temporarily excluding {0} from RPC, busy collecting garbage",

+							model.name));

 					continue;

 				}

 				// get local branches

@@ -196,6 +195,33 @@ public class RpcServlet extends JsonServlet {
 			} catch (GitBlitException e) {

 				response.setStatus(failureCode);

 			}

+		} else if (RpcRequest.FORK_REPOSITORY.equals(reqType)) {

+			// fork repository

+			RepositoryModel origin = gitblit.getRepositoryModel(objectName);

+			if (origin == null) {

+				// failed to find repository, error is logged by the repository

+				// manager

+				response.setStatus(failureCode);

+			} else {

+				if (user == null || !user.canFork(origin)) {

+					logger.error("User {} is not permitted to fork '{}'!", user == null ? "anonymous" : user.username,

+							objectName);

+					response.setStatus(failureCode);

+				} else {

+					try {

+						// fork the origin

+						RepositoryModel fork = gitblit.fork(origin, user);

+						if (fork == null) {

+							logger.error("Failed to fork repository '{}'!", objectName);

+							response.setStatus(failureCode);

+						} else {

+							logger.info("User {} has forked '{}'!", user.username, objectName);

+						}

+					} catch (GitBlitException e) {

+						response.setStatus(failureCode);

+					}

+				}

+			}

 		} else if (RpcRequest.EDIT_REPOSITORY.equals(reqType)) {

 			// edit repository

 			RepositoryModel model = deserialize(request, response, RepositoryModel.class);

@@ -281,7 +307,8 @@ public class RpcServlet extends JsonServlet {
 		} else if (RpcRequest.SET_REPOSITORY_MEMBER_PERMISSIONS.equals(reqType)) {

 			// set the repository permissions for the specified users

 			RepositoryModel model = gitblit.getRepositoryModel(objectName);

-			Collection<RegistrantAccessPermission> permissions = deserialize(request, response, RpcUtils.REGISTRANT_PERMISSIONS_TYPE);

+			Collection<RegistrantAccessPermission> permissions = deserialize(request, response,

+					RpcUtils.REGISTRANT_PERMISSIONS_TYPE);

 			result = gitblit.setUserAccessPermissions(model, permissions);

 		} else if (RpcRequest.LIST_REPOSITORY_TEAMS.equals(reqType)) {

 			// get repository teams

@@ -297,7 +324,8 @@ public class RpcServlet extends JsonServlet {
 		} else if (RpcRequest.SET_REPOSITORY_TEAM_PERMISSIONS.equals(reqType)) {

 			// set the repository permissions for the specified teams

 			RepositoryModel model = gitblit.getRepositoryModel(objectName);

-			Collection<RegistrantAccessPermission> permissions = deserialize(request, response, RpcUtils.REGISTRANT_PERMISSIONS_TYPE);

+			Collection<RegistrantAccessPermission> permissions = deserialize(request, response,

+					RpcUtils.REGISTRANT_PERMISSIONS_TYPE);

 			result = gitblit.setTeamAccessPermissions(model, permissions);

 		} else if (RpcRequest.LIST_FEDERATION_REGISTRATIONS.equals(reqType)) {

 			// return the list of federation registrations

@@ -363,8 +391,7 @@ public class RpcServlet extends JsonServlet {
 		} else if (RpcRequest.EDIT_SETTINGS.equals(reqType)) {

 			// update settings on the server

 			if (allowAdmin) {

-				Map<String, String> map = deserialize(request, response,

-						RpcUtils.SETTINGS_TYPE);

+				Map<String, String> map = deserialize(request, response, RpcUtils.SETTINGS_TYPE);

 				gitblit.updateSettings(map);

 			} else {

 				response.sendError(notAllowedCode);

diff --git a/src/main/java/com/gitblit/servlet/SyndicationFilter.java b/src/main/java/com/gitblit/servlet/SyndicationFilter.java
index 67a845ea..78da47e9 100644
--- a/src/main/java/com/gitblit/servlet/SyndicationFilter.java
+++ b/src/main/java/com/gitblit/servlet/SyndicationFilter.java
@@ -19,6 +19,7 @@ import java.io.IOException;
 import java.text.MessageFormat;

 

 import javax.servlet.FilterChain;

+import javax.servlet.FilterConfig;

 import javax.servlet.ServletException;

 import javax.servlet.ServletRequest;

 import javax.servlet.ServletResponse;

@@ -50,8 +51,8 @@ public class SyndicationFilter extends AuthenticationFilter {
 	private IProjectManager projectManager;

 

 	@Override

-	protected void inject(ObjectGraph dagger) {

-		super.inject(dagger);

+	protected void inject(ObjectGraph dagger, FilterConfig filterConfig) {

+		super.inject(dagger, filterConfig);

 		this.runtimeManager = dagger.get(IRuntimeManager.class);

 		this.repositoryManager = dagger.get(IRepositoryManager.class);

 		this.projectManager = dagger.get(IProjectManager.class);

diff --git a/src/main/java/com/gitblit/servlet/SyndicationServlet.java b/src/main/java/com/gitblit/servlet/SyndicationServlet.java
index 24def995..631df781 100644
--- a/src/main/java/com/gitblit/servlet/SyndicationServlet.java
+++ b/src/main/java/com/gitblit/servlet/SyndicationServlet.java
@@ -163,6 +163,15 @@ public class SyndicationServlet extends DaggerServlet {
 				searchType = type;

 			}

 		}

+

+		Constants.FeedObjectType objectType = Constants.FeedObjectType.COMMIT;

+		if (!StringUtils.isEmpty(request.getParameter("ot"))) {

+			Constants.FeedObjectType type = Constants.FeedObjectType.forName(request.getParameter("ot"));

+			if (type != null) {

+				objectType = type;

+			}

+		}

+

 		int length = settings.getInteger(Keys.web.syndicationEntries, 25);

 		if (StringUtils.isEmpty(objectId)) {

 			objectId = org.eclipse.jgit.lib.Constants.HEAD;

@@ -214,14 +223,7 @@ public class SyndicationServlet extends DaggerServlet {
 

 

 		boolean mountParameters = settings.getBoolean(Keys.web.mountParameters, true);

-		String urlPattern;

-		if (mountParameters) {

-			// mounted parameters

-			urlPattern = "{0}/commit/{1}/{2}";

-		} else {

-			// parameterized parameters

-			urlPattern = "{0}/commit/?r={1}&h={2}";

-		}

+

 		String gitblitUrl = settings.getString(Keys.web.canonicalUrl, null);

 		if (StringUtils.isEmpty(gitblitUrl)) {

 			gitblitUrl = HttpUtils.getGitblitURL(request);

@@ -247,47 +249,92 @@ public class SyndicationServlet extends DaggerServlet {
 				feedDescription = model.description;

 			}

 

-			List<RevCommit> commits;

-			if (StringUtils.isEmpty(searchString)) {

-				// standard log/history lookup

-				commits = JGitUtils.getRevLog(repository, objectId, offset, length);

+			if (objectType == Constants.FeedObjectType.TAG) {

+

+				String urlPattern;

+				if (mountParameters) {

+					// mounted parameters

+					urlPattern = "{0}/tag/{1}/{2}";

+				} else {

+					// parameterized parameters

+					urlPattern = "{0}/tag/?r={1}&h={2}";

+				}

+

+				List<RefModel> tags = JGitUtils.getTags(repository, false, length, offset);

+

+				for (RefModel tag : tags) {

+					FeedEntryModel entry = new FeedEntryModel();

+					entry.title = tag.getName();

+					entry.author = tag.getAuthorIdent().getName();

+					entry.link = MessageFormat.format(urlPattern, gitblitUrl,

+							StringUtils.encodeURL(model.name.replace('/', fsc)), tag.getObjectId().getName());

+					entry.published = tag.getDate();

+					entry.contentType = "text/html";

+					entry.content = tag.getFullMessage();

+					entry.repository = model.name;

+					entry.branch = objectId;

+

+					entry.tags = new ArrayList<String>();

+

+					// add tag id and referenced commit id

+					entry.tags.add("tag:" + tag.getObjectId().getName());

+					entry.tags.add("commit:" + tag.getReferencedObjectId().getName());

+

+					entries.add(entry);

+				}

 			} else {

-				// repository search

-				commits = JGitUtils.searchRevlogs(repository, objectId, searchString, searchType,

-						offset, length);

-			}

-			Map<ObjectId, List<RefModel>> allRefs = JGitUtils.getAllRefs(repository, model.showRemoteBranches);

-			BugtraqProcessor processor = new BugtraqProcessor(settings);

-

-			// convert RevCommit to SyndicatedEntryModel

-			for (RevCommit commit : commits) {

-				FeedEntryModel entry = new FeedEntryModel();

-				entry.title = commit.getShortMessage();

-				entry.author = commit.getAuthorIdent().getName();

-				entry.link = MessageFormat.format(urlPattern, gitblitUrl,

-						StringUtils.encodeURL(model.name.replace('/', fsc)), commit.getName());

-				entry.published = commit.getCommitterIdent().getWhen();

-				entry.contentType = "text/html";

-				String message = processor.processCommitMessage(repository, model, commit.getFullMessage());

-				entry.content = message;

-				entry.repository = model.name;

-				entry.branch = objectId;

-				entry.tags = new ArrayList<String>();

-

-				// add commit id and parent commit ids

-				entry.tags.add("commit:" + commit.getName());

-				for (RevCommit parent : commit.getParents()) {

-					entry.tags.add("parent:" + parent.getName());

+

+				String urlPattern;

+				if (mountParameters) {

+					// mounted parameters

+					urlPattern = "{0}/commit/{1}/{2}";

+				} else {

+					// parameterized parameters

+					urlPattern = "{0}/commit/?r={1}&h={2}";

 				}

 

-				// add refs to tabs list

-				List<RefModel> refs = allRefs.get(commit.getId());

-				if (refs != null && refs.size() > 0) {

-					for (RefModel ref : refs) {

-						entry.tags.add("ref:" + ref.getName());

+				List<RevCommit> commits;

+				if (StringUtils.isEmpty(searchString)) {

+					// standard log/history lookup

+					commits = JGitUtils.getRevLog(repository, objectId, offset, length);

+				} else {

+					// repository search

+					commits = JGitUtils.searchRevlogs(repository, objectId, searchString, searchType,

+							offset, length);

+				}

+				Map<ObjectId, List<RefModel>> allRefs = JGitUtils.getAllRefs(repository, model.showRemoteBranches);

+				BugtraqProcessor processor = new BugtraqProcessor(settings);

+

+				// convert RevCommit to SyndicatedEntryModel

+				for (RevCommit commit : commits) {

+					FeedEntryModel entry = new FeedEntryModel();

+					entry.title = commit.getShortMessage();

+					entry.author = commit.getAuthorIdent().getName();

+					entry.link = MessageFormat.format(urlPattern, gitblitUrl,

+							StringUtils.encodeURL(model.name.replace('/', fsc)), commit.getName());

+					entry.published = commit.getCommitterIdent().getWhen();

+					entry.contentType = "text/html";

+					String message = processor.processCommitMessage(repository, model, commit.getFullMessage());

+					entry.content = message;

+					entry.repository = model.name;

+					entry.branch = objectId;

+					entry.tags = new ArrayList<String>();

+

+					// add commit id and parent commit ids

+					entry.tags.add("commit:" + commit.getName());

+					for (RevCommit parent : commit.getParents()) {

+						entry.tags.add("parent:" + parent.getName());

+					}

+

+					// add refs to tabs list

+					List<RefModel> refs = allRefs.get(commit.getId());

+					if (refs != null && refs.size() > 0) {

+						for (RefModel ref : refs) {

+							entry.tags.add("ref:" + ref.getName());

+						}

 					}

+					entries.add(entry);

 				}

-				entries.add(entry);

 			}

 		}