test/cuba
1
0
Fork 0
mirror of https://gitee.com/jmix/cuba.git synced 2024-12-03 03:38:33 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

File download: unescaped commas and brackets in filename #PL-1948

Browse Source
This commit is contained in:
Yuriy Artamonov 2013-04-16 11:10:11 +00:00
parent 4c7e2815d2
commit fbc1e546cc
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
modules/web/src/com/haulmont/cuba/web/toolkit/ui/CubaFileDownloader.java
View File

@ -10,6 +10,7 @@ import com.haulmont.cuba.web.toolkit.ui.client.downloader.CubaFileDownloaderClie
import com.vaadin.server.*;
import com.vaadin.ui.AbstractComponent;
import javax.mail.internet.MimeUtility;
import java.io.IOException;
import java.net.URLEncoder;
import java.util.Iterator;
@ -91,12 +92,18 @@ public class CubaFileDownloader extends AbstractComponent {
WebBrowser browser = Page.getCurrent().getWebBrowser();
boolean isFirefox = browser.isFirefox();
boolean isChrome = browser.isChrome();
try {
if (resource instanceof ConnectorResource) {
DownloadStream stream = ((ConnectorResource) resource).getStream();
String fileName = URLEncoder.encode(stream.getFileName(), "UTF-8").replaceAll("\\+", "%20");
String fileName;
if (isChrome)
fileName = MimeUtility.encodeWord(stream.getFileName(), "UTF-8", "Q");
else
fileName = URLEncoder.encode(stream.getFileName(), "UTF-8").replaceAll("\\+", "%20");
if (stream.getParameter("Content-Disposition") == null) {
// Content-Disposition: attachment generally forces download