From 671c19d3695a165687d621690fdb52ac453070b9 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 25 Jul 2011 16:47:22 -0400
Subject: [PATCH] Cleanup imports and formatting.
---
src/com/gitblit/DownloadZipServlet.java | 77 +++++++++++++++++++++++++++++---------
1 files changed, 59 insertions(+), 18 deletions(-)
diff --git a/src/com/gitblit/DownloadZipServlet.java b/src/com/gitblit/DownloadZipServlet.java
index caa0a35..5f2a2a4 100644
--- a/src/com/gitblit/DownloadZipServlet.java
+++ b/src/com/gitblit/DownloadZipServlet.java
@@ -26,36 +26,63 @@
import org.slf4j.LoggerFactory;
import com.gitblit.Constants.AccessRestrictionType;
+import com.gitblit.models.RepositoryModel;
import com.gitblit.utils.JGitUtils;
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.
+ *
+ * Unlike the GitServlet and the SyndicationServlet, this servlet is not
+ * protected by an AccessRestrictionFilter. It performs its own authorization
+ * check, but it does not perform any authentication. The assumption is that
+ * requests to this servlet are made via the web ui and not by direct url
+ * access. Unauthorized requests fail with a standard 403 (FORBIDDEN) code.
+ *
+ * @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)) {
+ /**
+ * Performs the authorization and zip streaming of the specified elements.
+ *
+ * @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;
@@ -95,8 +122,8 @@
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");
@@ -112,4 +139,18 @@
logger.error("Failed to write attachment to client", t);
}
}
+
+ @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