Browse Source

Plugged some repository use count leaks in the zip servlet

tags/v0.8.0
James Moger 12 years ago
parent
commit
6d874a0cb2
2 changed files with 31 additions and 2 deletions
  1. 5
    1
      src/com/gitblit/Constants.java
  2. 26
    1
      src/com/gitblit/DownloadZipServlet.java

+ 5
- 1
src/com/gitblit/Constants.java View File

@@ -54,13 +54,17 @@ public class Constants {
public static final String FEDERATION_PATH = "/federation/";
public static final String RPC_PATH = "/rpc/";
public static final String PAGES= "/pages/";
public static final String BORDER = "***********************************************************";
public static final String FEDERATION_USER = "$gitblit";
public static final String PROPOSAL_EXT = ".json";
public static final String ENCODING = "UTF-8";
public static String getGitBlitVersion() {
return NAME + " v" + VERSION;
}

+ 26
- 1
src/com/gitblit/DownloadZipServlet.java View File

@@ -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;
@@ -26,6 +30,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.gitblit.utils.JGitUtils;
import com.gitblit.utils.MarkdownUtils;
import com.gitblit.utils.StringUtils;
/**
@@ -79,7 +84,7 @@ public class DownloadZipServlet extends HttpServlet {
response.sendError(HttpServletResponse.SC_FORBIDDEN);
return;
}
String repository = request.getParameter("r");
String basePath = request.getParameter("p");
String objectId = request.getParameter("h");
@@ -98,8 +103,18 @@ public class DownloadZipServlet extends HttpServlet {
}
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.setHeader("Content-Disposition", "attachment; filename=\"" + name + ".zip"
@@ -115,11 +130,21 @@ public class DownloadZipServlet extends HttpServlet {
} 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,

Loading…
Cancel
Save