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

FEATURE: Add setting to controle the Expect header on S3 calls

Browse Source 
Some providers don't implement the Expect: 100-continue support,
which results in a mismatch in the object signature.

With this settings, users can disable the header and use such providers.
This commit is contained in:
Rafael dos Santos Silva
2020-04-29 19:04:59 -03:00
parent 45f704906d
commit 08e4af6636
3 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/discourse_defaults.conf
View File

@ -196,6 +196,7 @@ s3_secret_access_key =
s3_use_iam_profile = s3_use_iam_profile =
s3_cdn_url = s3_cdn_url =
s3_endpoint = s3_endpoint =
s3_http_continue_timeout =
### rate limits apply to all sites ### rate limits apply to all sites
max_user_api_reqs_per_minute = 20 max_user_api_reqs_per_minute = 20

3
config/site_settings.yml
View File

@ -1202,6 +1202,9 @@ files:
s3_endpoint: s3_endpoint:
default: "" default: ""
regex: '^https?:\/\/.+[^\/]$' regex: '^https?:\/\/.+[^\/]$'
s3_http_continue_timeout:
default: 1
hidden: true
s3_cdn_url: s3_cdn_url:
default: "" default: ""
regex: '^https?:\/\/.+[^\/]$' regex: '^https?:\/\/.+[^\/]$'

1
lib/s3_helper.rb
View File

@ -204,6 +204,7 @@ class S3Helper
} }
opts[:endpoint] = SiteSetting.s3_endpoint if SiteSetting.s3_endpoint.present? opts[:endpoint] = SiteSetting.s3_endpoint if SiteSetting.s3_endpoint.present?
opts[:http_continue_timeout] = SiteSetting.s3_http_continue_timeout
unless obj.s3_use_iam_profile unless obj.s3_use_iam_profile
opts[:access_key_id] = obj.s3_access_key_id opts[:access_key_id] = obj.s3_access_key_id