github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-06-05 14:07:30 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FEATURE: Make S3 presigned GET URL expiry configurable (#16912)

Browse Source 
Previously we hardcoded the DOWNLOAD_URL_EXPIRES_AFTER_SECONDS const
inside S3Helper to be 5 minutes (300 seconds). For various reasons,
some hosted sites may need this to be longer for other integrations.

The maximum expiry time for presigned URLs is 1 week (which is
604800 seconds), so that has been added as a validation on the
setting as well. The setting is hidden because 99% of the time
it should not be changed.
This commit is contained in:
Martin Brennan
2022-05-26 09:53:01 +10:00
committed by GitHub
parent 08cd7a3849
commit 641c4e0b7a
9 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spec/lib/file_store/s3_store_spec.rb
View File

@ -448,7 +448,7 @@ describe FileStore::S3Store do
s3_helper.expects(:s3_bucket).returns(s3_bucket).at_least_once
s3_bucket.expects(:object).with(regexp_matches(%r{original/\d+X.*/#{upload.sha1}\.png})).returns(s3_object)
opts = {
expires_in: S3Helper::DOWNLOAD_URL_EXPIRES_AFTER_SECONDS,
expires_in: SiteSetting.s3_presigned_get_url_expires_after_seconds,
response_content_disposition: %Q|attachment; filename="#{upload.original_filename}"; filename*=UTF-8''#{upload.original_filename}|
}
@ -463,7 +463,7 @@ describe FileStore::S3Store do
s3_helper.expects(:s3_bucket).returns(s3_bucket).at_least_once
s3_bucket.expects(:object).with("special/optimized/file.png").returns(s3_object)
opts = {
expires_in: S3Helper::DOWNLOAD_URL_EXPIRES_AFTER_SECONDS
expires_in: SiteSetting.s3_presigned_get_url_expires_after_seconds
}
s3_object.expects(:presigned_url).with(:get, opts)