issue #535 Honor the key_prefix when making requests using cloudfront.

andrewmadden · andrewmadden · commit 04c3aeb99b20 · 2023-01-17T02:07:13.000+11:00
diff --git a/classes/local/store/s3/client.php b/classes/local/store/s3/client.php
@@ -543,7 +543,13 @@ private function generate_presigned_url_cloudfront($contenthash, array $headers
                 $key .= '';
             }
         }
-        $resource = $this->config->cloudfrontresourcedomain . '/' . $key;
+
+        if (!empty($this->bucketkeyprefix)) {
+            $resource = $this->config->cloudfrontresourcedomain . '/' . $this->bucketkeyprefix . $key;
+        } else {
+            $resource = $this->config->cloudfrontresourcedomain . '/' . $key;
+        }
+
         // This is the id of the Cloudfront key pair you generated.
         $keypairid = $this->config->cloudfrontkeypairid;
 

Original file line number	Diff line number	Diff line change
`@@ -543,7 +543,13 @@ private function generate_presigned_url_cloudfront($contenthash, array $headers`
`543`	`543`	`$key .= '';`
`544`	`544`	`}`
`545`	`545`	`}`
`546`		`- $resource = $this->config->cloudfrontresourcedomain . '/' . $key;`
	`546`	`+`
	`547`	`+ if (!empty($this->bucketkeyprefix)) {`
	`548`	`+ $resource = $this->config->cloudfrontresourcedomain . '/' . $this->bucketkeyprefix . $key;`
	`549`	`+ } else {`
	`550`	`+ $resource = $this->config->cloudfrontresourcedomain . '/' . $key;`
	`551`	`+ }`
	`552`	`+`
`547`	`553`	`// This is the id of the Cloudfront key pair you generated.`
`548`	`554`	`$keypairid = $this->config->cloudfrontkeypairid;`
`549`	`555`