Handle boundaries in multipart request (#927)

(cherry picked from commit 74e9a8d)

Author: tomas-sexenian

common/src/main/java/com/genexus/CommonUtil.java

@@ -9,6 +9,9 @@
 import java.math.BigDecimal;
 import java.io.*;
 import java.net.URLEncoder;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.text.*;
 import java.util.*;
 
@@ -176,6 +179,62 @@ public Object initialValue()
 			throw new ExceptionInInitializerError("GXUtil static constructor error: " + e.getMessage());
 		}
 	}
+
+	public static String getContentType(String fileName) {
+		Path path = Paths.get(fileName);
+		String defaultContentType = "application/octet-stream";
+
+		try {
+			String probedContentType = Files.probeContentType(path);
+			if (probedContentType == null || probedContentType.equals(defaultContentType))
+				return findContentTypeByExtension(fileName);
+			return probedContentType;
+		} catch (IOException ioe) {
+			return findContentTypeByExtension(fileName);
+		}
+	}
+
+	private static String findContentTypeByExtension(String fileName) {
+		String fileExtension = fileName.substring(fileName.lastIndexOf(".") + 1).toLowerCase();
+		String contentType = contentTypes.get(fileExtension);
+		return contentType != null ? contentTypes.get(fileExtension) : "application/octet-stream";
+	}
+
+	private static Map<String, String> contentTypes  = new HashMap<String, String>() {{
+		put("txt" 	, "text/plain");
+		put("rtx" 	, "text/richtext");
+		put("htm" 	, "text/html");
+		put("html" , "text/html");
+		put("xml" 	, "text/xml");
+		put("aif"	, "audio/x-aiff");
+		put("au"	, "audio/basic");
+		put("wav"	, "audio/wav");
+		put("bmp"	, "image/bmp");
+		put("gif"	, "image/gif");
+		put("jpe"	, "image/jpeg");
+		put("jpeg"	, "image/jpeg");
+		put("jpg"	, "image/jpeg");
+		put("jfif"	, "image/pjpeg");
+		put("tif"	, "image/tiff");
+		put("tiff"	, "image/tiff");
+		put("png"	, "image/x-png");
+		put("3gp"	, "video/3gpp");
+		put("3g2"	, "video/3gpp2");
+		put("mpg"	, "video/mpeg");
+		put("mpeg"	, "video/mpeg");
+		put("mov"	, "video/quicktime");
+		put("qt"	, "video/quicktime");
+		put("avi"	, "video/x-msvideo");
+		put("exe"	, "application/octet-stream");
+		put("dll"	, "application/x-msdownload");
+		put("ps"	, "application/postscript");
+		put("pdf"	, "application/pdf");
+		put("svg"	, "image/svg+xml");
+		put("tgz"	, "application/x-compressed");
+		put("zip"	, "application/x-zip-compressed");
+		put("gz"	, "application/x-gzip");
+		put("json"	, "application/json");
+	}};
 
 	public static String removeAllQuotes(String fileName)
 	{

common/src/main/java/com/genexus/internet/GXHttpClient.java

@@ -568,74 +568,81 @@ protected String setPathUrl(String url) {
 		return url;
 	}
 
+
+	protected File fileToPost;
+	protected String fileToPostName;
+
 	@SuppressWarnings("unchecked")
 	protected byte[] getData()
 	{
 		byte[] out = new byte[0];
 
-		for (Object key: getVariablesToSend().keySet())
+		for (Object key : getVariablesToSend().keySet())
 		{
-			String value = getMultipartTemplate().getFormDataTemplate((String)key, (String)getVariablesToSend().get(key));
-			getContentToSend().add(0, value); //Variables al principio
+			String value = getMultipartTemplate().getFormDataTemplate((String) key, (String) getVariablesToSend().get(key));
+			getContentToSend().add(0, value); // Variables al principio
 		}
 
 		for (int idx = 0; idx < getContentToSend().size(); idx++)
 		{
 			Object curr = getContentToSend().elementAt(idx);
 
-			if	(curr instanceof String)
+			if (curr instanceof String)
 			{
 				try
 				{
-					if(contentEncoding != null)
+					if (contentEncoding != null)
 					{
-						out = addToArray(out, ((String)curr).getBytes(contentEncoding));
-					}else
+						out = addToArray(out, ((String) curr).getBytes(contentEncoding));
+					} else
 					{
 						out = addToArray(out, (String) curr);
 					}
-				}catch(UnsupportedEncodingException e)
+				} catch (UnsupportedEncodingException e)
 				{
 					System.err.println(e.toString());
 					out = addToArray(out, (String) curr);
 				}
 			}
-			else if	(curr instanceof Object[])
+			else if (curr instanceof Object[])
 			{
-				StringWriter writer = (StringWriter)((Object[])curr)[0];
-				StringBuffer encoding = (StringBuffer)((Object[])curr)[1];
+				StringWriter writer = (StringWriter) ((Object[]) curr)[0];
+				StringBuffer encoding = (StringBuffer) ((Object[]) curr)[1];
 
-				if(encoding == null || encoding.length() == 0)
+				if (encoding == null || encoding.length() == 0)
 				{
 					encoding = new StringBuffer("UTF-8");
 				}
 				try
 				{
 					out = addToArray(out, writer.toString().getBytes(encoding.toString()));
 				}
-				catch(UnsupportedEncodingException e)
+				catch (UnsupportedEncodingException e)
 				{
 					out = addToArray(out, writer.toString());
 				}
 			}
-			else if	(curr instanceof byte[])
+			else if (curr instanceof byte[])
 			{
 				out = addToArray(out, (byte[]) curr);
 			}
-			else //File or FormFile
+			else // File or FormFile
 			{
 				File file;
 				if (curr instanceof FormFile)
 				{
-					FormFile formFile = (FormFile)curr;
+					FormFile formFile = (FormFile) curr;
 					out = startMultipartFile(out, formFile.name, formFile.file);
 					file = new File(formFile.file);
+					fileToPostName = formFile.name;
 				}
 				else
 				{
 					file = (File) curr;
 				}
-				try (BufferedInputStream bis = new java.io.BufferedInputStream(new FileInputStream(file)))
+				fileToPost = file;
+
+				try (BufferedInputStream bis = new BufferedInputStream(new FileInputStream(file)))
 				{
 					out = addToArray(out, CommonUtil.readToByteArray(bis));
 				}