Tries to determine the content-type of files uploaded to external storage. Previously, if the file extension was .tmp, it was always set to image/jpeg, which caused issues—such as when uploading a PDF: upon downloading it, the file couldn't be opened properly.

Author: iroqueta

common/pom.xml

@@ -32,7 +32,7 @@
 		<dependency>
 			<groupId>commons-io</groupId>
 			<artifactId>commons-io</artifactId>
-			<version>2.11.0</version>
+			<version>2.12.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.bouncycastle</groupId>

gxcloudstorage-awss3/src/main/java/com/genexus/db/driver/ExternalProviderS3.java

@@ -215,10 +215,8 @@ public String upload(String externalFileName, InputStream input, ResourceAccessC
 
 			ObjectMetadata metadata = new ObjectMetadata();
 			metadata.setContentLength(streamInfo.contentLength);
+			metadata.setContentType((externalFileName.endsWith(".tmp") && "application/octet-stream".equals(streamInfo.detectedContentType)) ? "image/jpeg" : streamInfo.detectedContentType);
 
-			if (externalFileName.endsWith(".tmp")) {
-				metadata.setContentType("image/jpeg");
-			}
 			String upload = "";
 			client.putObject(new PutObjectRequest(bucket, externalFileName, streamInfo.inputStream, metadata).withCannedAcl(internalToAWSACL(acl)));
 			upload = getResourceUrl(externalFileName, acl, defaultExpirationMinutes);

gxcloudstorage-common/pom.xml

@@ -34,6 +34,11 @@
             <artifactId>log4j-api</artifactId>
             <version>${log4j.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.tika</groupId>
+            <artifactId>tika-core</artifactId>
+            <version>3.2.0</version>
+        </dependency>
     </dependencies>
 
 </project>

gxcloudstorage-common/src/main/java/com/genexus/db/driver/ExternalProviderHelper.java

@@ -4,6 +4,7 @@
 import com.genexus.util.GXService;
 
 import java.io.*;
+import org.apache.tika.Tika;
 
 public class ExternalProviderHelper {
 
@@ -36,19 +37,25 @@ public static InputStreamWithLength getInputStreamContentLength(InputStream inpu
 			}
 		}
 		long size = tempFile.length();
-		InputStream newInput = new FileInputStream(tempFile);
-		return new InputStreamWithLength(newInput, size, tempFile);
+		InputStream bufferedInput = new BufferedInputStream(new FileInputStream(tempFile));
+		bufferedInput.mark(128 * 1024);
+		Tika tika = new Tika();
+		String detectedContentType = tika.detect(bufferedInput);
+		bufferedInput.reset();
+		return new InputStreamWithLength(bufferedInput, size, tempFile, detectedContentType);
 	}
 
 	public static class InputStreamWithLength {
 		public final InputStream inputStream;
 		public final long contentLength;
 		public final File tempFile; // nullable
+		public final String detectedContentType;
 
-		public InputStreamWithLength(InputStream inputStream, long contentLength, File tempFile) {
+		public InputStreamWithLength(InputStream inputStream, long contentLength, File tempFile, String detectedContentType) {
 			this.inputStream = inputStream;
 			this.contentLength = contentLength;
 			this.tempFile = tempFile;
+			this.detectedContentType = detectedContentType;
 		}
 	}
 }