Fixing CORS issue with S3 and canvas (resize/crop), canvas complains …

…about using "tainted" files if using S3, because of cross origin. Have to use AWS S3 console, and set a CORS policy on your bucket.

plugins/fabrik_element/fileupload/adaptors/amazons3sdkstorage.php

@@ -15,6 +15,7 @@
 
 use Aws\Exception\AwsException;
 use Aws\S3\Exception\S3Exception;
+use GuzzleHttp\Psr7;
 
 
 /**
@@ -207,6 +208,7 @@ private function bucketExists()
 	public function upload($tmpFile, $filepath)
 	{
 		$filepath = str_replace("\\", '/', $filepath);
+		$mimeType = GuzzleHttp\Psr7\mimetype_from_filename($filepath);
 
 		if (!$this->bucketExists())
 		{
@@ -240,7 +242,8 @@ public function upload($tmpFile, $filepath)
 				'SourceFile' => $tmpFile,
 				'Bucket' => $this->getBucketName(),
 				'Key' => $this->urlToKey($filepath),
-				'ACL' => $this->getAcl()
+				'ACL' => $this->getAcl(),
+				'ContentType' => $mimeType
 			];
 
 			if ($this->isEncrypted())
@@ -724,6 +727,11 @@ public function getFullPath($filepath)
 
 	public function preRenderPath($filepath)
 	{
+		if (empty($filepath))
+		{
+			return '';
+		}
+
 		$params = $this->getParams();
 		static $presigned = array();
 
@@ -735,7 +743,8 @@ public function preRenderPath($filepath)
 				{
 					$cmd                  = $this->s3->getCommand('GetObject', [
 						'Bucket' => $this->getBucketName(),
-						'Key'    => $this->urlToKey($filepath)
+						'Key'    => $this->urlToKey($filepath),
+						'ResponseCacheControl' => "no-cache"
 					]);
 					$request              = $this->s3->createPresignedRequest($cmd, '+' . $lifetime . ' seconds');
 					$presigned[$filepath] = (string) $request->getUri();