From fe7c01a8bd76dff240e74bb770212911e227ba59 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 03 Feb 2012 17:24:51 -0500
Subject: [PATCH] Return to Users page after add/edit team
---
src/com/gitblit/DownloadZipServlet.java | 110 +++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 78 insertions(+), 32 deletions(-)
diff --git a/src/com/gitblit/DownloadZipServlet.java b/src/com/gitblit/DownloadZipServlet.java
index caa0a35..209272f 100644
--- a/src/com/gitblit/DownloadZipServlet.java
+++ b/src/com/gitblit/DownloadZipServlet.java
@@ -15,8 +15,12 @@
*/
package com.gitblit;
+import java.io.IOException;
+import java.text.MessageFormat;
+import java.text.ParseException;
import java.util.Date;
+import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletResponse;
@@ -25,42 +29,62 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.gitblit.Constants.AccessRestrictionType;
import com.gitblit.utils.JGitUtils;
+import com.gitblit.utils.MarkdownUtils;
import com.gitblit.utils.StringUtils;
-import com.gitblit.wicket.models.RepositoryModel;
+/**
+ * Streams out a zip file from the specified repository for any tree path at any
+ * revision.
+ *
+ * @author James Moger
+ *
+ */
public class DownloadZipServlet extends HttpServlet {
-
- public static String asLink(String baseURL, String repository, String objectId, String path) {
- return baseURL + (baseURL.endsWith("/") ? "" : "/") + "zip?r=" + repository + (path == null ? "" : ("&p=" + path)) + (objectId == null ? "" : ("&h=" + objectId));
- }
private static final long serialVersionUID = 1L;
- private final static Logger logger = LoggerFactory.getLogger(DownloadZipServlet.class);
+ private transient Logger logger = LoggerFactory.getLogger(DownloadZipServlet.class);
public DownloadZipServlet() {
super();
}
- @Override
- protected void doPost(javax.servlet.http.HttpServletRequest request, javax.servlet.http.HttpServletResponse response) throws javax.servlet.ServletException, java.io.IOException {
- processRequest(request, response);
+ /**
+ * Returns an url to this servlet for the specified parameters.
+ *
+ * @param baseURL
+ * @param repository
+ * @param objectId
+ * @param path
+ * @return an url
+ */
+ public static String asLink(String baseURL, String repository, String objectId, String path) {
+ if (baseURL.length() > 0 && baseURL.charAt(baseURL.length() - 1) == '/') {
+ baseURL = baseURL.substring(0, baseURL.length() - 1);
+ }
+ return baseURL + Constants.ZIP_PATH + "?r=" + repository
+ + (path == null ? "" : ("&p=" + path))
+ + (objectId == null ? "" : ("&h=" + objectId));
}
- @Override
- protected void doGet(javax.servlet.http.HttpServletRequest request, javax.servlet.http.HttpServletResponse response) throws javax.servlet.ServletException, java.io.IOException {
- processRequest(request, response);
- }
-
- private void processRequest(javax.servlet.http.HttpServletRequest request, javax.servlet.http.HttpServletResponse response) throws javax.servlet.ServletException, java.io.IOException {
- if (!GitBlit.self().settings().getBoolean(Keys.web.allowZipDownloads, true)) {
+ /**
+ * Creates a zip stream from the repository of the requested data.
+ *
+ * @param request
+ * @param response
+ * @throws javax.servlet.ServletException
+ * @throws java.io.IOException
+ */
+ private void processRequest(javax.servlet.http.HttpServletRequest request,
+ javax.servlet.http.HttpServletResponse response) throws javax.servlet.ServletException,
+ java.io.IOException {
+ if (!GitBlit.getBoolean(Keys.web.allowZipDownloads, true)) {
logger.warn("Zip downloads are disabled");
response.sendError(HttpServletResponse.SC_FORBIDDEN);
return;
-
}
+
String repository = request.getParameter("r");
String basePath = request.getParameter("p");
String objectId = request.getParameter("h");
@@ -71,18 +95,6 @@
name = name.substring(name.lastIndexOf('/') + 1);
}
- // check roles first
- boolean authorized = request.isUserInRole(Constants.ADMIN_ROLE);
- authorized |= request.isUserInRole(repository);
-
- if (!authorized) {
- RepositoryModel model = GitBlit.self().getRepositoryModel(repository);
- if (model.accessRestriction.atLeast(AccessRestrictionType.VIEW)) {
- logger.warn("Unauthorized access via zip servlet for " + model.name);
- response.sendError(HttpServletResponse.SC_FORBIDDEN);
- return;
- }
- }
if (!StringUtils.isEmpty(basePath)) {
name += "-" + basePath.replace('/', '_');
}
@@ -91,12 +103,22 @@
}
Repository r = GitBlit.self().getRepository(repository);
+ if (r == null) {
+ error(response, MessageFormat.format("# Error\nFailed to find repository {0}", repository));
+ return;
+ }
RevCommit commit = JGitUtils.getCommit(r, objectId);
+ if (commit == null) {
+ error(response, MessageFormat.format("# Error\nFailed to find commit {0}", objectId));
+ r.close();
+ return;
+ }
Date date = JGitUtils.getCommitDate(commit);
+
String contentType = "application/octet-stream";
response.setContentType(contentType + "; charset=" + response.getCharacterEncoding());
- // response.setContentLength(attachment.getFileSize());
- response.setHeader("Content-Disposition", "attachment; filename=\"" + name + ".zip" + "\"");
+ response.setHeader("Content-Disposition", "attachment; filename=\"" + name + ".zip"
+ + "\"");
response.setDateHeader("Last-Modified", date.getTime());
response.setHeader("Cache-Control", "no-cache");
response.setHeader("Pragma", "no-cache");
@@ -108,8 +130,32 @@
} catch (Throwable t) {
logger.error("Failed to write attachment to client", t);
}
+
+ // close the repository
+ r.close();
} catch (Throwable t) {
logger.error("Failed to write attachment to client", t);
}
}
+
+ 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(javax.servlet.http.HttpServletRequest request,
+ javax.servlet.http.HttpServletResponse response) throws javax.servlet.ServletException,
+ java.io.IOException {
+ processRequest(request, response);
+ }
+
+ @Override
+ protected void doGet(javax.servlet.http.HttpServletRequest request,
+ javax.servlet.http.HttpServletResponse response) throws javax.servlet.ServletException,
+ java.io.IOException {
+ processRequest(request, response);
+ }
}
--
Gitblit v1.9.1