Merge branch 'master' into cors-from-client-cfg

Author: ggallotti

java/src/main/java/com/genexus/internet/HttpResponse.java

@@ -11,6 +11,7 @@
 import com.genexus.com.IHttpResponse;
 import com.genexus.webpanels.FileItemCollection;
 import com.genexus.webpanels.HttpContextWeb;
+import com.genexus.webpanels.WebUtils;
 
 /**
 * Esta clase esta disponible en los webprocs para grabar informacion en el response
@@ -41,7 +42,7 @@ public void addHeader(String name, String value)
 	{
 		if(name.equalsIgnoreCase("Content-Disposition"))
 		{
-		  value = getEncodedContentDisposition(value);
+		  value = WebUtils.getEncodedContentDisposition(value, httpContext.getBrowserType());
 		}
 
 		httpContext.setHeader(name, value);
@@ -56,21 +57,6 @@ else if	(name.equalsIgnoreCase("Content-length"))
 			httpContext.getResponse().setContentLength((int) CommonUtil.val(value));
 		}
 	}
-        
-	private String getEncodedContentDisposition(String value)
-	{
-		int filenameIdx = value.toLowerCase().indexOf("filename");
-		if(filenameIdx != -1)
-		{
-			int eqIdx = value.toLowerCase().indexOf("=", filenameIdx);
-			if (eqIdx != -1)
-			{
-				String filename = value.substring(eqIdx + 1).trim();
-				value = value.substring(0, eqIdx + 1) + PrivateUtilities.URLEncode(filename, "UTF8");
-			}
-		}
-		return value;
-	}
 
 	public boolean isText()
 	{

java/src/main/java/com/genexus/webpanels/WebUtils.java

@@ -321,6 +321,21 @@ private static void htmlDecode(String str, StringBuffer buffer)
 		}
 	}
 
+	public static String getEncodedContentDisposition(String value, int browserType)
+	{
+		int filenameIdx = value.toLowerCase().indexOf("filename");
+		int eqIdx = value.toLowerCase().indexOf("=", filenameIdx);
+
+		if(filenameIdx == -1 || eqIdx == -1 || browserType == HttpContext.BROWSER_SAFARI) { //Safari does not support ContentDisposition Header encoded
+			return value;
+		}
+		
+		String filename = value.substring(eqIdx + 1).trim();
+		value = value.substring(0, filenameIdx) + String.format("filename*=UTF-8''%1$s; filename=\"%1$s\"", PrivateUtilities.URLEncode(filename, "UTF8"));
+
+		return value;
+	}
+
 	public static GXWebComponent getWebComponent(Class caller, String name, int remoteHandle, com.genexus.ModelContext context)
 	{
 		try
@@ -562,4 +577,6 @@ public static Class processRestService(XMLReader reader) {
 			return null;
 		}
 	}
+
+
 }

java/src/test/java/com/genexus/webpanels/TestWebUtils.java

@@ -0,0 +1,69 @@
+package com.genexus.webpanels;
+
+import com.genexus.specific.java.Connect;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+public class TestWebUtils {
+
+	@Before
+	public void setUp() throws Exception {
+		Connect.init();
+	}
+
+	@Test
+	public void TestContentDispositionHeaderEncoding1() {
+		String contentDisposition = "attachment; filename=file.pdf";
+		String expectedContentDisposition = "attachment; filename*=UTF-8''file.pdf; filename=\"file.pdf\"";
+		doTest(contentDisposition, expectedContentDisposition);
+	}
+
+	@Test
+	public void TestContentDispositionHeaderEncoding2() {
+		String contentDisposition = "attachment; filename=file.pdf";
+		String expectedContentDisposition = contentDisposition;
+		doTest(contentDisposition, expectedContentDisposition, HttpContextWeb.BROWSER_SAFARI);
+	}
+
+	@Test
+	public void TestContentDispositionHeaderEncoding3() {
+		String contentDisposition = "attachment; filename=注文詳細.xlsx";
+		String expectedContentDisposition = "attachment; filename*=UTF-8''%E6%B3%A8%E6%96%87%E8%A9%B3%E7%B4%B0.xlsx; filename=\"%E6%B3%A8%E6%96%87%E8%A9%B3%E7%B4%B0.xlsx\"";
+		doTest(contentDisposition, expectedContentDisposition);
+	}
+
+	@Test
+	public void TestContentDispositionHeaderEncoding4() {
+		String contentDisposition = "attachment; filename=注文詳細.xlsx";
+		String expectedContentDisposition = contentDisposition;
+		//Safari does not support rfc5987
+		doTest(contentDisposition, expectedContentDisposition, HttpContextWeb.BROWSER_SAFARI);
+	}
+
+	@Test
+	public void TestContentDispositionHeaderEncoding5() {
+		String contentDisposition = "form-data; filename=file.pdf";
+		String expectedContentDisposition = "form-data; filename*=UTF-8''file.pdf; filename=\"file.pdf\"";
+		doTest(contentDisposition, expectedContentDisposition);
+	}
+
+	@Test
+	public void TestContentDispositionHeaderEncoding6() {
+		String contentDisposition = "ATTACHMENT; FILEname=注文詳細.xlsx";
+		String expectedContentDisposition = "ATTACHMENT; filename*=UTF-8''%E6%B3%A8%E6%96%87%E8%A9%B3%E7%B4%B0.xlsx; filename=\"%E6%B3%A8%E6%96%87%E8%A9%B3%E7%B4%B0.xlsx\"";
+		doTest(contentDisposition, expectedContentDisposition);
+	}
+
+
+	private void doTest(String contentDisposition, String expectedContentDisposition) {
+		doTest(contentDisposition, expectedContentDisposition, HttpContextWeb.BROWSER_CHROME);
+	}
+
+	private void doTest(String contentDisposition, String expectedContentDisposition, int browserType) {
+		String encodedValue = WebUtils.getEncodedContentDisposition(contentDisposition, browserType);
+		Assert.assertEquals(expectedContentDisposition, encodedValue);
+	}
+}
+
+

pom.xml

@@ -14,7 +14,7 @@
 	<url>https://github.com/genexuslabs/JavaClasses</url>
 
 	<properties>
-		<revision>2.7</revision>
+		<revision>2.8</revision>
 		<changelist>-SNAPSHOT</changelist>
 		<sha1/>