From 2263698a68215d48459bb33676788b13d1c3ce8f Mon Sep 17 00:00:00 2001
From: Justin Carter <justin@daemon.com.au>
Date: Fri, 21 Dec 2018 16:19:33 +1100
Subject: [PATCH 1/7] bump patch version

---
 patch.version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/patch.version b/patch.version
index 9d607966b..3cacc0b93 100755
--- a/patch.version
+++ b/patch.version
@@ -1 +1 @@
-11
\ No newline at end of file
+12
\ No newline at end of file

From 392d8e39b5730caf26b3b1ce4fdf47e98ae7c71c Mon Sep 17 00:00:00 2001
From: Jinzhao Wu <jinz@daemon.com.au>
Date: Mon, 7 Jan 2019 17:17:54 +1100
Subject: [PATCH 2/7] FC-3176 fix connection failure error on ioFileExists call

---
 packages/cdn/s3.cfc | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/packages/cdn/s3.cfc b/packages/cdn/s3.cfc
index 0c9e834b5..24bff3fdc 100644
--- a/packages/cdn/s3.cfc
+++ b/packages/cdn/s3.cfc
@@ -594,13 +594,19 @@
 		<cfset var path = "" />
 		<cfset var stDetail = structNew() />
 		<cfset var substituteValues = arrayNew(1) />
-		<cfset var urlPath = arguments.config.pathPrefix & arguments.file />
 		<cfset var timestamp = application.fapi.dateToISO8601(Now()) />
 		<cfset var stHeaders = {
 			"x-amz-content-sha256" = "UNSIGNED-PAYLOAD"
 		} />
 		<cfset var i = "" />
 
+		<cfset var urlPath = arguments.config.pathPrefix & arguments.file />
+		<cfif left(arguments.file,1) neq "/">
+			<cfset urlPath = arguments.config.pathPrefix & "/" & arguments.file />
+		<cfelse>
+			<cfset urlPath = arguments.config.pathPrefix & arguments.file />
+		</cfif>
+
 		<!--- create signature --->
 		<cfset var signature = getAWSAuthorization(
 			config=arguments.config,

From 0291149bd72b80e2b0b93b3a6f2c7dc65fa04248 Mon Sep 17 00:00:00 2001
From: Blair McKenzie <blair@daemon.com.au>
Date: Mon, 21 Jan 2019 16:44:19 +1100
Subject: [PATCH 3/7] FC-3177 update signature generation to account for custom
 domains

---
 packages/cdn/s3.cfc | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/packages/cdn/s3.cfc b/packages/cdn/s3.cfc
index 24bff3fdc..7d7fd8bbe 100644
--- a/packages/cdn/s3.cfc
+++ b/packages/cdn/s3.cfc
@@ -407,6 +407,7 @@
 		<cfargument name="headers" type="struct" required="false" default="#structNew()#" />
 		<cfargument name="payload" type="any" required="false" />
 		<cfargument name="unsignedPayload" type="boolean" required="false" />
+		<cfargument name="s3Path" type="boolean" required="false" default="false" />
 
 		<cfset var scope = left(arguments.timestamp, 8) & "/" & arguments.config.region & "/s3/aws4_request" />
 		<cfset var canonicalRequest = "" />
@@ -414,7 +415,11 @@
 		<cfset var signingKey = "" />
 		<cfset var signature = "" />
 
-		<cfset arguments.headers["host"] = "#arguments.config.apiEndpoint#" />
+		<cfif arguments.config.domainType eq "s3" or arguments.s3Path>
+			<cfset arguments.headers["host"] = arguments.config.apiEndpoint />
+		<cfelse>
+			<cfset arguments.headers["host"] = arguments.config.domain & ".s3.amazonaws.com" />
+		</cfif>
 
 		<cfset canonicalRequest = getCanonicalRequest(argumentCollection=arguments) />
 		<cfset stringToSign = getStringToSign(arguments.timestamp, scope, canonicalRequest) />
@@ -539,8 +544,9 @@
 					config=arguments.config,
 					timestamp=currentDate,
 					method=arguments.method,
-					path=arguments.config.apiEndpointPrefix & urlPath,
-					queryParams=queryParams
+					path=urlPath,
+					queryParams=queryParams,
+					s3Path=arguments.s3Path
 				) />
 
 				<cfset urlpath = urlpath & "?#structToQueryParams(queryParams)#&X-Amz-Signature=#signature#" />

From 1e2d882601495c5cf803debabbbb70ce8c016fd8 Mon Sep 17 00:00:00 2001
From: Blair McKenzie <blair@daemon.com.au>
Date: Wed, 23 Jan 2019 15:08:09 +1100
Subject: [PATCH 4/7] FC-3177 fixes to other s3 ops related to custom domain
 support

---
 packages/cdn/s3.cfc | 67 ++++++++++++++++++++++++++++-----------------
 1 file changed, 42 insertions(+), 25 deletions(-)

diff --git a/packages/cdn/s3.cfc b/packages/cdn/s3.cfc
index 7d7fd8bbe..8794212eb 100644
--- a/packages/cdn/s3.cfc
+++ b/packages/cdn/s3.cfc
@@ -350,6 +350,7 @@
 		<cfargument name="headers" type="struct" required="false" default="#structNew()#" />
 		<cfargument name="payload" type="any" required="false" />
 		<cfargument name="unsignedPayload" type="boolean" required="false" />
+		<cfargument name="s3Path" type="boolean" required="false" default="false" />
 
 		<cfset var result = [
 			arguments.method,
@@ -362,6 +363,12 @@
 		<cfset var key = "" />
 		<cfset var intermed = [] />
 
+		<cfif arguments.config.domainType eq "s3" or arguments.s3Path>
+			<cfset arguments.headers["host"] = arguments.config.apiEndpoint />
+		<cfelse>
+			<cfset arguments.headers["host"] = arguments.config.domain & ".s3.amazonaws.com" />
+		</cfif>
+
 
 		<!--- Query parameters --->
 		<cfif isStruct(arguments.queryParams)>
@@ -415,12 +422,6 @@
 		<cfset var signingKey = "" />
 		<cfset var signature = "" />
 
-		<cfif arguments.config.domainType eq "s3" or arguments.s3Path>
-			<cfset arguments.headers["host"] = arguments.config.apiEndpoint />
-		<cfelse>
-			<cfset arguments.headers["host"] = arguments.config.domain & ".s3.amazonaws.com" />
-		</cfif>
-
 		<cfset canonicalRequest = getCanonicalRequest(argumentCollection=arguments) />
 		<cfset stringToSign = getStringToSign(arguments.timestamp, scope, canonicalRequest) />
 		<cfset signingKey = getSigningKey(arguments.config.awsSecretKey, left(arguments.timestamp, 8), arguments.config.region, "s3") />
@@ -438,6 +439,7 @@
 		<cfargument name="headers" type="struct" required="false" default="#structNew()#" />
 		<cfargument name="payload" type="any" required="false" />
 		<cfargument name="unsignedPayload" type="boolean" required="false" />
+		<cfargument name="s3Path" type="boolean" required="false" default="false" />
 
 		<cfset var signature = getAWSSignature(argumentCollection=arguments) />
 		<cfset var signedHeaders = listSort(structKeyList(arguments.headers, ';'), 'textnocase', 'asc', ';') />
@@ -605,6 +607,7 @@
 			"x-amz-content-sha256" = "UNSIGNED-PAYLOAD"
 		} />
 		<cfset var i = "" />
+		<cfset var authArgs = {} />
 
 		<cfset var urlPath = arguments.config.pathPrefix & arguments.file />
 		<cfif left(arguments.file,1) neq "/">
@@ -614,14 +617,16 @@
 		</cfif>
 
 		<!--- create signature --->
-		<cfset var signature = getAWSAuthorization(
+		<cfset var authArgs = {
 			config=arguments.config,
 			timestamp=timestamp,
 			method="HEAD",
 			path=arguments.config.apiEndpointPrefix & urlPath,
 			headers=stHeaders,
-			unsignedPayload=true
-		) />
+			unsignedPayload=true,
+			s3Path=true
+		} />
+		<cfset var signature = getAWSAuthorization(argumentCollection=authArgs) />
 
 		<!--- REST call --->
 		<cfhttp method="HEAD" url="https://#arguments.config.apiEndpoint##arguments.config.apiEndpointPrefix##urlPath#" charset="utf-8" result="stResponse" timeout="1800">
@@ -653,7 +658,9 @@
 					<cfset stDetail["result"] = results>
 					<cfset substituteValues = arrayNew(1)>
 					<cfset substituteValues[1] = results.error.message.XMLText>
-					<cfset application.fapi.throw(message="Error accessing S3 API: {1}",type="s3error",detail=serializeJSON(stDetail),substituteValues=substituteValues) />
+					<cfset substituteValues[2] = getCanonicalRequest(argumentCollection=authArgs)>
+					<cfset substituteValues[3] = signature>
+					<cfset application.fapi.throw(message="Error accessing S3 API: {1} [canonical request={2}, signature={3}]",type="s3error",detail=serializeJSON(stDetail),substituteValues=substituteValues) />
 				</cfif>
 			<cfelseif NOT listFindNoCase("200,204",listfirst(stResponse.statuscode," "))>
 				<cfset substituteValues = arrayNew(1)>
@@ -1072,6 +1079,7 @@
 		<cfset var path = "" />
 		<cfset var stDetail = structNew() />
 		<cfset var substituteValues = arrayNew(1) />
+		<cfset var authArgs = {} />
 
 
 		<cfif structkeyexists(arguments,"localfile")>
@@ -1116,14 +1124,16 @@
 		<cfset stHeaders["x-amz-content-sha256"] = "UNSIGNED-PAYLOAD" />
 
 		<!--- create signature --->
-		<cfset signature = getAWSAuthorization(
+		<cfset authArgs = {
 			config=arguments.config,
 			timestamp=timestamp,
 			method="PUT",
 			path=arguments.config.apiEndpointPrefix & path,
 			headers=stHeaders,
-			unsignedPayload=true
-		) />
+			unsignedPayload=true,
+			s3Path=true
+		} />
+		<cfset signature = getAWSAuthorization(argumentCollection=authArgs) />
 
 		<!--- REST call --->
 		<cfhttp method="PUT" url="https://#arguments.config.apiEndpoint##arguments.config.apiEndpointPrefix##path#" charset="utf-8" result="cfhttp" timeout="1800">
@@ -1152,8 +1162,9 @@
 				<cfset stDetail["result"] = results>
 				<cfset substituteValues = arrayNew(1)>
 				<cfset substituteValues[1] = results.error.message.XMLText>
-				<cfset substituteValues[2] = signature>
-				<cfset application.fapi.throw(message="Error accessing S3 API: {1} [signature={2}]",type="s3error",detail=serializeJSON(stDetail),substituteValues=substituteValues) />
+				<cfset substituteValues[2] = getCanonicalRequest(argumentCollection=authArgs)>
+				<cfset substituteValues[3] = signature>
+				<cfset application.fapi.throw(message="Error accessing S3 API: {1} [canonical request={2}, signature={3}]",type="s3error",detail=serializeJSON(stDetail),substituteValues=substituteValues) />
 			</cfif>
 		<cfelseif NOT listFindNoCase("200,204",listfirst(cfhttp.statuscode," "))>
 			<cfset substituteValues = arrayNew(1)>
@@ -1179,6 +1190,7 @@
 		<cfset var stDetail = structNew() />
 		<cfset var substituteValues = arrayNew(1) />
 		<cfset var header = "" />
+		<cfset var authArgs = {} />
 
 		<cfif left(arguments.file,1) neq "/">
 			<cfset path = arguments.config.pathPrefix & "/" & arguments.file />
@@ -1210,7 +1222,7 @@
 		<cfset stHeaders["x-amz-content-sha256"] = "UNSIGNED-PAYLOAD" />
 
 		<!--- create signature --->
-		<cfset signature = getAWSAuthorization(
+		<cfset authArgs = {
 			config=arguments.config,
 			timestamp=timestamp,
 			method="PUT",
@@ -1219,8 +1231,10 @@
 				"acl"=""
 			},
 			headers=stHeaders,
-			unsignedPayload=true
-		) />
+			unsignedPayload=true,
+			s3Path=true
+		} />
+		<cfset signature = getAWSAuthorization(argumentCollection=authArgs) />
 
 		<!--- REST call --->
 		<cfhttp method="PUT" url="https://#arguments.config.apiEndpoint##arguments.config.apiEndpointPrefix##path#?acl" charset="utf-8" result="cfhttp" timeout="1800">
@@ -1246,8 +1260,9 @@
 				<cfset stDetail["result"] = results>
 				<cfset substituteValues = arrayNew(1)>
 				<cfset substituteValues[1] = results.error.message.XMLText>
-				<cfset substituteValues[2] = signature>
-				<cfset application.fapi.throw(message="Error accessing S3 API: {1} [signature={2}]",type="s3error",detail=serializeJSON(stDetail),substituteValues=substituteValues) />
+				<cfset substituteValues[2] = getCanonicalRequest(argumentCollection=authArgs)>
+				<cfset substituteValues[3] = signature>
+				<cfset application.fapi.throw(message="Error accessing S3 API: {1} [canonical request: {2}, signature={3}]",type="s3error",detail=serializeJSON(stDetail),substituteValues=substituteValues) />
 			</cfif>
 		<cfelseif NOT listFindNoCase("200,204",listfirst(cfhttp.statuscode," "))>
 			<cfset substituteValues = arrayNew(1)>
@@ -1273,6 +1288,7 @@
 		<cfset var stHeaders = {
 			"x-amz-content-sha256" = "UNSIGNED-PAYLOAD"
 		} />
+		<cfset var authArgs = {} />
 
 		<cfif left(arguments.file,1) neq "/">
 			<cfset path = arguments.config.pathPrefix & "/" & arguments.file />
@@ -1281,14 +1297,15 @@
 		</cfif>
 
 		<!--- create signature --->
-		<cfset signature = getAWSAuthorization(
+		<cfset authArgs = {
 			config=arguments.config,
 			timestamp=timestamp,
 			method="DELETE",
 			path=arguments.config.apiEndpointPrefix & path,
 			headers=stHeaders,
 			unsignedPayload=true
-		) />
+		} />
+		<cfset signature = getAWSAuthorization(argumentCollection=authArgs) />
 
 		<!--- REST call --->
 		<cfhttp method="DELETE" url="https://#arguments.config.apiEndpoint##arguments.config.apiEndpointPrefix##path#" result="cfhttp" timeout="1800">
@@ -1313,9 +1330,9 @@
 				<cfset stDetail["signature"] = replace(signature, chr(10), "\n", "ALL")>
 				<cfset stDetail["result"] = results>
 				<cfset substituteValues = arrayNew(1)>
-				<cfset substituteValues[1] = results.error.message.XMLText>
-				<cfset substituteValues[2] = signature>
-				<cfset application.fapi.throw(message="Error accessing S3 API: {1} [signature={2}]",type="s3error",detail=serializeJSON(stDetail),substituteValues=substituteValues) />
+				<cfset substituteValues[2] = getCanonicalRequest(argumentCollection=authArgs)>
+				<cfset substituteValues[3] = signature>
+				<cfset application.fapi.throw(message="Error accessing S3 API: {1} [canonical request: {2}, signature={3}]",type="s3error",detail=serializeJSON(stDetail),substituteValues=substituteValues) />
 			</cfif>
 		<cfelseif NOT listFindNoCase("200,204",listfirst(cfhttp.statuscode," "))>
 			<cfset substituteValues = arrayNew(1)>

From c90f8207f7cb7bfdff6c40d92d1c079ac9d497dc Mon Sep 17 00:00:00 2001
From: Fabio Pilotti <fabio@daemon.com.au>
Date: Thu, 24 Jan 2019 16:10:57 +1100
Subject: [PATCH 5/7] FC-3178 Error auto generating pad image: Invalid argument
 to native writeImage

---
 packages/formtools/image.cfc | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/formtools/image.cfc b/packages/formtools/image.cfc
index 67e2346b3..84814f24e 100644
--- a/packages/formtools/image.cfc
+++ b/packages/formtools/image.cfc
@@ -1324,7 +1324,7 @@
 				<!--- Check if either the new height or new width is smaller than the arugments width and height. If yes, then padding is needed --->
 				<cfif newImage.height lt arguments.Height or newImage.width lt arguments.Width>
 					<!--- Create a temp image with background color = PadColor --->
-					<cfset padImage = ImageNew("",arguments.Width,arguments.Height,"argb",arguments.PadColor) />
+					<cfset padImage = ImageNew("",arguments.Width,arguments.Height,"rgb",arguments.PadColor) />
 					<!--- Because ImageScaleToFit doesn't always work correctly (it may make the width or height it used to scale by smaller than it should have been... usually by 1 pixel) we need to account for that becfore we paste --->
 					<!--- Either use ceiling() or fix() depending on which side you want the extra pixeled padding on (This won't be a problem if Adobe fixes the bug in ImageScaleToFit in a future version of ColdFusion) --->
 					<cfset XCoordinate = ceiling((arguments.Width - newImage.Width)/2) />
@@ -1544,7 +1544,7 @@
 		<cfargument name="backgroundColor" type="string" required="false" default="white" hint="background color of image." />
 		
 		<cfset var imgInfo = imageInfo(arguments.oImage)/>
-		<cfset var myImage = imageNew("", imgInfo.width, imgInfo.height, "argb", arguments.backgroundColor) />
+		<cfset var myImage = imageNew("", imgInfo.width, imgInfo.height, "rgb", arguments.backgroundColor) />
 		<cfset imagePaste(myImage, arguments.oImage, 0, 0) />
 		
 		<cfreturn myImage />
@@ -1571,8 +1571,8 @@
 			<cfreturn /><!--- No file attached --->
 		</cfif>
 
-		<cfif (not structkeyexists(arguments.stObject,"versionID") or not len(arguments.stObject.versionID)) and application.fc.lib.cdn.ioFileExists(location="images",file="#arguments.stObject[arguments.stMetadata.name]#")>
-			<cfset application.fc.lib.cdn.ioDeleteFile(location="images",file="#arguments.stObject[arguments.stMetadata.name]#") />
+		<cfif (not structkeyexists(arguments.stObject,"versionID") or not len(arguments.stObject.versionID)) and application.fc.lib.cdn.ioFileExists(location="images",file="/#arguments.stObject[arguments.stMetadata.name]#")>
+			<cfset application.fc.lib.cdn.ioDeleteFile(location="images",file="/#arguments.stObject[arguments.stMetadata.name]#") />
 		<cfelse>
 			<cfreturn /><!--- File doesn't actually exist --->
 		</cfif>

From 9bb98b53bb0152f0e0e0cbcb989011dc7b8de3ca Mon Sep 17 00:00:00 2001
From: Andrew Mercer <andrew@daemon.com.au>
Date: Fri, 25 Jan 2019 10:02:30 +1100
Subject: [PATCH 6/7] FC3177 - fix for s3 deleteObject()

---
 packages/cdn/s3.cfc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/cdn/s3.cfc b/packages/cdn/s3.cfc
index 8794212eb..53730622d 100644
--- a/packages/cdn/s3.cfc
+++ b/packages/cdn/s3.cfc
@@ -1303,7 +1303,8 @@
 			method="DELETE",
 			path=arguments.config.apiEndpointPrefix & path,
 			headers=stHeaders,
-			unsignedPayload=true
+			unsignedPayload=true,
+			s3Path=true
 		} />
 		<cfset signature = getAWSAuthorization(argumentCollection=authArgs) />
 

From 3bc00e9a05149591f490611b044e6c307a8dac6a Mon Sep 17 00:00:00 2001
From: Justin Carter <justin@daemon.com.au>
Date: Tue, 29 Jan 2019 09:39:57 +1100
Subject: [PATCH 7/7] FC-3178 reverse change prefixing "/" on onDelete

---
 packages/formtools/image.cfc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/formtools/image.cfc b/packages/formtools/image.cfc
index 84814f24e..8ccbd54dc 100644
--- a/packages/formtools/image.cfc
+++ b/packages/formtools/image.cfc
@@ -1571,8 +1571,8 @@
 			<cfreturn /><!--- No file attached --->
 		</cfif>
 
-		<cfif (not structkeyexists(arguments.stObject,"versionID") or not len(arguments.stObject.versionID)) and application.fc.lib.cdn.ioFileExists(location="images",file="/#arguments.stObject[arguments.stMetadata.name]#")>
-			<cfset application.fc.lib.cdn.ioDeleteFile(location="images",file="/#arguments.stObject[arguments.stMetadata.name]#") />
+		<cfif (not structkeyexists(arguments.stObject,"versionID") or not len(arguments.stObject.versionID)) and application.fc.lib.cdn.ioFileExists(location="images",file="#arguments.stObject[arguments.stMetadata.name]#")>
+			<cfset application.fc.lib.cdn.ioDeleteFile(location="images",file="#arguments.stObject[arguments.stMetadata.name]#") />
 		<cfelse>
 			<cfreturn /><!--- File doesn't actually exist --->
 		</cfif>