Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Aws endpoint #13

Open
wants to merge 2 commits into
base: 5.x
Choose a base branch
from
Open

Aws endpoint #13

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
feecd0e
Fortrabbit/S3-Alike support
Jul 3, 2024
2de23e0
Revert the formatting, to minimise PR
Jul 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions src/services/SignUrl.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
use Craft;
use craft\base\Component;
use craft\elements\Asset;
use fortrabbit\ObjectStorage\Fs as FortrabbitFs;
use kennethormandy\s3securedownloads\events\SignUrlEvent;
use kennethormandy\s3securedownloads\S3SecureDownloads;
use yii\base\Exception;
Expand Down Expand Up @@ -37,6 +38,10 @@ public function getSignedUrl($asset_uid, $options = [])

$region = Craft::parseEnv($volume->region);

// If we have a Fortrabbit Filesystem, pass-through the server endpoint to the AWS S3Client
// Null values for this setting are acceptable/the default (vendor/aws/aws-sdk-php/src/S3/S3Client.php @ line 423)
$volumeEndpoint = $volume instanceof FortrabbitFs ? Craft::parseEnv($volume->endpoint) : null;

// TODO Use craftcms/aws-s3 helper function
$client = new S3Client([
'credentials' => [
Expand All @@ -45,6 +50,7 @@ public function getSignedUrl($asset_uid, $options = [])
],
'region' => $region,
'version' => 'latest',
'endpoint' => $volumeEndpoint
]);

// TODO Right now the setting uses the old format (86400ms)
Expand Down