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

Allow using AWS_QUERYSTRING_AUTH & AWS_S3_CUSTOM_DOMAIN at the same time #839

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Allow using AWS_QUERYSTRING_AUTH & AWS_S3_CUSTOM_DOMAIN at the same time #839

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8beec5a
Allow using AWS_QUERYSTRING_AUTH & AWS_S3_CUSTOM_DOMAIN at the same time
chris-elgato Feb 14, 2020
10dfd8e
Try to fix merge conflicts for #839
chris-elgato Jul 6, 2020
3fb689f
Merge branch 'master' into master
cpoetter Jul 6, 2020
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
13 changes: 13 additions & 0 deletions storages/backends/s3boto3.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -573,6 +573,19 @@ def url(self, name, parameters=None, expire=None, http_method=None):
params['Key'] = name
url = self.bucket.meta.client.generate_presigned_url('get_object', Params=params,
ExpiresIn=expire, HttpMethod=http_method)

if self.custom_domain:
# Key parameter can't be empty. Use "/" and remove it later.
params['Key'] = '/'
root_url_signed = self.bucket.meta.client.generate_presigned_url('get_object',
Params=params,
ExpiresIn=expire)
# Remove signing parameter and previouly added key "/".
root_url = self._strip_signing_parameters(root_url_signed)[:-1]
# Replace bucket domain with custom domain.
custom_url = "{}//{}/".format(self.url_protocol, self.custom_domain)
url = url.replace(root_url, custom_url)

if self.querystring_auth:
return url
return self._strip_signing_parameters(url)
Expand Down