From d80588d99511fac16495f8eaafa50e01a6b98995 Mon Sep 17 00:00:00 2001 From: guriguri Date: Thu, 1 Aug 2013 00:20:49 +0900 Subject: apply PageParameters(final Map parameterMap), encode filename of Content-Disposition --- src/main/java/com/gitblit/wicket/WicketUtils.java | 154 +++++++++++++++------ .../java/com/gitblit/wicket/pages/RawPage.java | 26 +++- 2 files changed, 135 insertions(+), 45 deletions(-) (limited to 'src/main/java/com/gitblit') diff --git a/src/main/java/com/gitblit/wicket/WicketUtils.java b/src/main/java/com/gitblit/wicket/WicketUtils.java index 87f2f3ff..aa86686c 100644 --- a/src/main/java/com/gitblit/wicket/WicketUtils.java +++ b/src/main/java/com/gitblit/wicket/WicketUtils.java @@ -20,7 +20,9 @@ import java.text.MessageFormat; import java.text.SimpleDateFormat; import java.util.Collection; import java.util.Date; +import java.util.HashMap; import java.util.List; +import java.util.Map; import java.util.TimeZone; import javax.servlet.http.HttpServletRequest; @@ -190,7 +192,7 @@ public class WicketUtils { return newImage(wicketId, "file_excel_16x16.png"); } else if (filename.endsWith(".doc") || filename.endsWith(".docx")) { return newImage(wicketId, "file_doc_16x16.png"); - } else if (filename.endsWith(".ppt")) { + } else if (filename.endsWith(".ppt") || filename.endsWith(".pptx")) { return newImage(wicketId, "file_ppt_16x16.png"); } else if (filename.endsWith(".zip")) { return newImage(wicketId, "file_zip_16x16.png"); @@ -285,104 +287,170 @@ public class WicketUtils { } public static PageParameters newTokenParameter(String token) { - return new PageParameters("t=" + token); + Map parameterMap = new HashMap(); + parameterMap.put("t", token); + return new PageParameters(parameterMap); } - public static PageParameters newRegistrationParameter(String url, String name) { - return new PageParameters("u=" + url + ",n=" + name); + public static PageParameters newRegistrationParameter(String url, + String name) { + Map parameterMap = new HashMap(); + parameterMap.put("u", url); + parameterMap.put("n", name); + return new PageParameters(parameterMap); } public static PageParameters newUsernameParameter(String username) { - return new PageParameters("user=" + username); + Map parameterMap = new HashMap(); + parameterMap.put("user", username); + return new PageParameters(parameterMap); } public static PageParameters newTeamnameParameter(String teamname) { - return new PageParameters("team=" + teamname); + Map parameterMap = new HashMap(); + parameterMap.put("team", teamname); + return new PageParameters(parameterMap); } public static PageParameters newProjectParameter(String projectName) { - return new PageParameters("p=" + projectName); + Map parameterMap = new HashMap(); + parameterMap.put("p", projectName); + return new PageParameters(parameterMap); } public static PageParameters newRepositoryParameter(String repositoryName) { - return new PageParameters("r=" + repositoryName); + Map parameterMap = new HashMap(); + parameterMap.put("r", repositoryName); + return new PageParameters(parameterMap); } public static PageParameters newObjectParameter(String objectId) { - return new PageParameters("h=" + objectId); + Map parameterMap = new HashMap(); + parameterMap.put("h", objectId); + return new PageParameters(parameterMap); } - public static PageParameters newObjectParameter(String repositoryName, String objectId) { + public static PageParameters newObjectParameter(String repositoryName, + String objectId) { + Map parameterMap = new HashMap(); if (StringUtils.isEmpty(objectId)) { return newRepositoryParameter(repositoryName); } - return new PageParameters("r=" + repositoryName + ",h=" + objectId); + parameterMap.put("r", repositoryName); + parameterMap.put("h", objectId); + return new PageParameters(parameterMap); } - public static PageParameters newRangeParameter(String repositoryName, String startRange, String endRange) { - return new PageParameters("r=" + repositoryName + ",h=" + startRange + ".." + endRange); + public static PageParameters newRangeParameter(String repositoryName, + String startRange, String endRange) { + Map parameterMap = new HashMap(); + parameterMap.put("r", repositoryName); + parameterMap.put("h", startRange + ".." + endRange); + return new PageParameters(parameterMap); } - public static PageParameters newPathParameter(String repositoryName, String objectId, - String path) { + public static PageParameters newPathParameter(String repositoryName, + String objectId, String path) { + Map parameterMap = new HashMap(); if (StringUtils.isEmpty(path)) { return newObjectParameter(repositoryName, objectId); } if (StringUtils.isEmpty(objectId)) { - return new PageParameters("r=" + repositoryName + ",f=" + path); + parameterMap.put("r", repositoryName); + parameterMap.put("f", path); + return new PageParameters(parameterMap); } - return new PageParameters("r=" + repositoryName + ",h=" + objectId + ",f=" + path); + parameterMap.put("r", repositoryName); + parameterMap.put("h", objectId); + parameterMap.put("f", path); + return new PageParameters(parameterMap); } - public static PageParameters newLogPageParameter(String repositoryName, String objectId, - int pageNumber) { + public static PageParameters newLogPageParameter(String repositoryName, + String objectId, int pageNumber) { + Map parameterMap = new HashMap(); if (pageNumber <= 1) { return newObjectParameter(repositoryName, objectId); } if (StringUtils.isEmpty(objectId)) { - return new PageParameters("r=" + repositoryName + ",pg=" + pageNumber); + parameterMap.put("r", repositoryName); + parameterMap.put("pg", String.valueOf(pageNumber)); + return new PageParameters(parameterMap); } - return new PageParameters("r=" + repositoryName + ",h=" + objectId + ",pg=" + pageNumber); + parameterMap.put("r", repositoryName); + parameterMap.put("h", objectId); + parameterMap.put("pg", String.valueOf(pageNumber)); + return new PageParameters(parameterMap); } - public static PageParameters newHistoryPageParameter(String repositoryName, String objectId, - String path, int pageNumber) { + public static PageParameters newHistoryPageParameter(String repositoryName, + String objectId, String path, int pageNumber) { + Map parameterMap = new HashMap(); if (pageNumber <= 1) { return newObjectParameter(repositoryName, objectId); } if (StringUtils.isEmpty(objectId)) { - return new PageParameters("r=" + repositoryName + ",f=" + path + ",pg=" + pageNumber); + parameterMap.put("r", repositoryName); + parameterMap.put("f", path); + parameterMap.put("pg", String.valueOf(pageNumber)); + return new PageParameters(parameterMap); } - return new PageParameters("r=" + repositoryName + ",h=" + objectId + ",f=" + path + ",pg=" - + pageNumber); + parameterMap.put("r", repositoryName); + parameterMap.put("h", objectId); + parameterMap.put("f", path); + parameterMap.put("pg", String.valueOf(pageNumber)); + return new PageParameters(parameterMap); } - public static PageParameters newBlobDiffParameter(String repositoryName, String baseCommitId, - String commitId, String path) { + public static PageParameters newBlobDiffParameter(String repositoryName, + String baseCommitId, String commitId, String path) { + Map parameterMap = new HashMap(); if (StringUtils.isEmpty(commitId)) { - return new PageParameters("r=" + repositoryName + ",f=" + path + ",hb=" + baseCommitId); + parameterMap.put("r", repositoryName); + parameterMap.put("f", path); + parameterMap.put("hb", baseCommitId); + return new PageParameters(parameterMap); } - return new PageParameters("r=" + repositoryName + ",h=" + commitId + ",f=" + path + ",hb=" - + baseCommitId); + parameterMap.put("r", repositoryName); + parameterMap.put("h", commitId); + parameterMap.put("f", path); + parameterMap.put("hb", baseCommitId); + return new PageParameters(parameterMap); } - public static PageParameters newSearchParameter(String repositoryName, String commitId, - String search, Constants.SearchType type) { + public static PageParameters newSearchParameter(String repositoryName, + String commitId, String search, Constants.SearchType type) { + Map parameterMap = new HashMap(); if (StringUtils.isEmpty(commitId)) { - return new PageParameters("r=" + repositoryName + ",s=" + search + ",st=" + type.name()); + parameterMap.put("r", repositoryName); + parameterMap.put("s", search); + parameterMap.put("st", type.name()); + return new PageParameters(parameterMap); } - return new PageParameters("r=" + repositoryName + ",h=" + commitId + ",s=" + search - + ",st=" + type.name()); + parameterMap.put("r", repositoryName); + parameterMap.put("h", commitId); + parameterMap.put("s", search); + parameterMap.put("st", type.name()); + return new PageParameters(parameterMap); } - public static PageParameters newSearchParameter(String repositoryName, String commitId, - String search, Constants.SearchType type, int pageNumber) { + public static PageParameters newSearchParameter(String repositoryName, + String commitId, String search, Constants.SearchType type, + int pageNumber) { + Map parameterMap = new HashMap(); if (StringUtils.isEmpty(commitId)) { - return new PageParameters("r=" + repositoryName + ",s=" + search + ",st=" + type.name() - + ",pg=" + pageNumber); - } - return new PageParameters("r=" + repositoryName + ",h=" + commitId + ",s=" + search - + ",st=" + type.name() + ",pg=" + pageNumber); + parameterMap.put("r", repositoryName); + parameterMap.put("s", search); + parameterMap.put("st", type.name()); + parameterMap.put("pg", String.valueOf(pageNumber)); + return new PageParameters(parameterMap); + } + parameterMap.put("r", repositoryName); + parameterMap.put("h", commitId); + parameterMap.put("s", search); + parameterMap.put("st", type.name()); + parameterMap.put("pg", String.valueOf(pageNumber)); + return new PageParameters(parameterMap); } public static String getProjectName(PageParameters params) { diff --git a/src/main/java/com/gitblit/wicket/pages/RawPage.java b/src/main/java/com/gitblit/wicket/pages/RawPage.java index 27a01f96..d322e955 100644 --- a/src/main/java/com/gitblit/wicket/pages/RawPage.java +++ b/src/main/java/com/gitblit/wicket/pages/RawPage.java @@ -16,12 +16,15 @@ package com.gitblit.wicket.pages; import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URLEncoder; import java.util.HashMap; import java.util.Map; import org.apache.wicket.IRequestTarget; import org.apache.wicket.PageParameters; import org.apache.wicket.RequestCycle; +import org.apache.wicket.protocol.http.WebRequest; import org.apache.wicket.protocol.http.WebResponse; import org.eclipse.jgit.lib.Repository; import org.eclipse.jgit.revwalk.RevCommit; @@ -134,8 +137,27 @@ public class RawPage extends SessionPage { // binary blobs (download) byte[] binary = JGitUtils.getByteContent(r, commit.getTree(), blobPath, true); response.setContentLength(binary.length); - response.setContentType("application/octet-stream"); - response.setHeader("Content-Disposition", "attachment; filename=\"" + filename + "\""); + response.setContentType("application/octet-stream; charset=UTF-8"); + + try { + WebRequest request = (WebRequest) requestCycle.getRequest(); + String userAgent = request.getHttpServletRequest().getHeader("User-Agent"); + + if (userAgent != null && userAgent.indexOf("MSIE 5.5") > -1) { + response.setHeader("Content-Disposition", "filename=\"" + + URLEncoder.encode(filename, "UTF-8") + "\""); + } else if (userAgent != null && userAgent.indexOf("MSIE") > -1) { + response.setHeader("Content-Disposition", "attachment; filename=\"" + + URLEncoder.encode(filename, "UTF-8") + "\""); + } else { + response.setHeader("Content-Disposition", "attachment; filename=\"" + + new String(filename.getBytes("UTF-8"), "latin1") + "\""); + } + } + catch (UnsupportedEncodingException e) { + response.setHeader("Content-Disposition", "attachment; filename=\"" + filename + "\""); + } + try { response.getOutputStream().write(binary); } catch (IOException e) { -- cgit v1.2.3