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

Sign CloudFront urls only in case querystring_auth is enabled #885

Merged
merged 2 commits into from
May 31, 2020
Merged

Sign CloudFront urls only in case querystring_auth is enabled #885

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b09bdbe
Sign CloudFront urls only in case querystring_auth is enabled
al-muammar May 29, 2020
274fddb
Fix test
al-muammar May 29, 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
2 changes: 1 addition & 1 deletion storages/backends/s3boto3.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -740,7 +740,7 @@ def url(self, name, parameters=None, expire=None, http_method=None):
url = "{}//{}/{}".format(
self.url_protocol, self.custom_domain, filepath_to_uri(name))

if self.cloudfront_signer:
if self.querystring_auth and self.cloudfront_signer:
expiration = datetime.utcnow() + timedelta(seconds=expire)

return self.cloudfront_signer.generate_presigned_url(url, date_less_than=expiration)
Expand Down
8 changes: 6 additions & 2 deletions tests/test_s3boto3.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -604,18 +604,22 @@ def test_storage_url_custom_domain_signed_urls(self):
-----END RSA PRIVATE KEY-----'''
).encode('ascii')

url = 'https://mock.cloudfront.net/file.txt?Expires=3600&Signature=DbqVgh3FHtttQxof214tSAVE8Nqn3Q4Ii7eR3iykbOqAPbV89HC3EB~0CWxarpLNtbfosS5LxiP5EutriM7E8uR4Gm~UVY-PFUjPcwqdnmAiKJF0EVs7koJcMR8MKDStuWfFKVUPJ8H7ORYTOrixyHBV2NOrpI6SN5UX6ctNM50_&Key-Pair-Id=test-key' # noqa
url = 'https://mock.cloudfront.net/file.txt'
signed_url = url + '?Expires=3600&Signature=DbqVgh3FHtttQxof214tSAVE8Nqn3Q4Ii7eR3iykbOqAPbV89HC3EB~0CWxarpLNtbfosS5LxiP5EutriM7E8uR4Gm~UVY-PFUjPcwqdnmAiKJF0EVs7koJcMR8MKDStuWfFKVUPJ8H7ORYTOrixyHBV2NOrpI6SN5UX6ctNM50_&Key-Pair-Id=test-key' # noqa

self.storage.custom_domain = "mock.cloudfront.net"

for pem_to_signer in (
s3boto3._use_cryptography_signer(),
s3boto3._use_rsa_signer()):
self.storage.cloudfront_signer = pem_to_signer(key_id, pem)
self.storage.querystring_auth = False
self.assertEqual(self.storage.url(filename), url)

self.storage.querystring_auth = True
with mock.patch('storages.backends.s3boto3.datetime') as mock_datetime:
mock_datetime.utcnow.return_value = datetime.utcfromtimestamp(0)
self.assertEqual(self.storage.url(filename), url)
self.assertEqual(self.storage.url(filename), signed_url)

def test_generated_url_is_encoded(self):
self.storage.custom_domain = "mock.cloudfront.net"
Expand Down