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

@@ -38,7 +38,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-v1/src/main/java/com/genexus/db/driver/ExternalProviderS3V1.java

@@ -225,10 +225,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-awss3-v2/src/main/java/com/genexus/db/driver/ExternalProviderS3V2.java

@@ -743,7 +743,7 @@ private String uploadWithoutACL(String externalFileName, InputStream input) {
 			PutObjectRequest.Builder putObjectRequestBuilder = PutObjectRequest.builder()
 				.bucket(bucket)
 				.key(externalFileName)
-				.contentType(externalFileName.endsWith(".tmp") ? "image/jpeg" : null);
+				.contentType((externalFileName.endsWith(".tmp") && "application/octet-stream".equals(streamInfo.detectedContentType)) ? "image/jpeg" : streamInfo.detectedContentType);
 			PutObjectRequest putObjectRequest = putObjectRequestBuilder.build();
 
 			PutObjectResponse response = client.putObject(putObjectRequest, RequestBody.fromInputStream(streamInfo.inputStream, streamInfo.contentLength));

gxcloudstorage-azureblob/src/main/java/com/genexus/db/driver/ExternalProviderAzureStorage.java

@@ -139,16 +139,16 @@ public String upload(String localFile, String externalFileName, ResourceAccessCo
 	}
 
 	public String upload(String externalFileName, InputStream input, ResourceAccessControlList acl) {
-
+		ExternalProviderHelper.InputStreamWithLength streamInfo = null;
 		try {
+			streamInfo = ExternalProviderHelper.getInputStreamContentLength(input);
+
 			CloudBlockBlob blob = getCloudBlockBlob(externalFileName, acl);
-			if (externalFileName.endsWith(".tmp")) {
-				blob.getProperties().setContentType("image/jpeg");
-			}
+			blob.getProperties().setContentType((externalFileName.endsWith(".tmp") && "application/octet-stream".equals(streamInfo.detectedContentType)) ? "image/jpeg" : streamInfo.detectedContentType);
 			try (BlobOutputStream blobOutputStream = blob.openOutputStream()) {
 				byte[] buffer = new byte[8192];
 				int bytesRead;
-				while ((bytesRead = input.read(buffer)) != -1) {
+				while ((bytesRead = streamInfo.inputStream.read(buffer)) != -1) {
 					blobOutputStream.write(buffer, 0, bytesRead);
 				}
 			}
@@ -163,6 +163,15 @@ public String upload(String externalFileName, InputStream input, ResourceAccessC
 			logger.error("Error uploading file", ex);
 			return "";
 		}
+		finally {
+			if (streamInfo != null && streamInfo.tempFile != null && streamInfo.tempFile.exists()) {
+				try {
+					streamInfo.tempFile.delete();
+				} catch (Exception e) {
+					logger.warn("Could not delete temporary file: " + streamInfo.tempFile.getAbsolutePath(), e);
+				}
+			}
+		}
 	}
 
 	public String get(String externalFileName, ResourceAccessControlList acl, int expirationMinutes) {

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;
 		}
 	}
 }

gxcloudstorage-ibmcos/src/main/java/com/genexus/db/driver/ExternalProviderIBM.java

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

java/pom.xml

@@ -59,11 +59,6 @@
 			<artifactId>javax.jms</artifactId>
 			<version>3.1.2.2</version>
 		</dependency>
-		<dependency>
-			<groupId>commons-io</groupId>
-			<artifactId>commons-io</artifactId>
-			<version>2.11.0</version>
-		</dependency>
 		<dependency>
 			<groupId>commons-net</groupId>
 			<artifactId>commons-net</artifactId>

wrappercommon/pom.xml

@@ -29,11 +29,6 @@
             <artifactId>log4j-core</artifactId>
             <version>${log4j.version}</version>
         </dependency>
-		<dependency>
-			<groupId>commons-io</groupId>
-			<artifactId>commons-io</artifactId>
-			<version>2.11.0</version>
-		</dependency>
 		<dependency>
 			<groupId>org.apache.ws.security</groupId>
 			<artifactId>wss4j</artifactId>