Skip to content

Allow querystring_auth to be overridden on a per-call basis #1536

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Allow querystring_auth to be overridden on a per-call basis #1536

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 5 additions & 3 deletions storages/backends/s3.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -665,12 +665,14 @@ def get_modified_time(self, name):
else:
return make_naive(entry.last_modified)

def url(self, name, parameters=None, expire=None, http_method=None):
def url(self, name, parameters=None, expire=None, http_method=None, querystring_auth=None):
# Preserve the trailing slash after normalizing the path.
name = self._normalize_name(clean_name(name))
params = parameters.copy() if parameters else {}
if expire is None:
expire = self.querystring_expire
if querystring_auth is None:
querystring_auth = self.querystring_auth

if self.custom_domain:
url = "{}//{}/{}{}".format(
Expand All @@ -680,7 +682,7 @@ def url(self, name, parameters=None, expire=None, http_method=None):
"?{}".format(urlencode(params)) if params else "",
)

if self.querystring_auth and self.cloudfront_signer:
if 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 All @@ -692,7 +694,7 @@ def url(self, name, parameters=None, expire=None, http_method=None):
params["Key"] = name

connection = (
self.connection if self.querystring_auth else self.unsigned_connection
self.connection if querystring_auth else self.unsigned_connection
)
url = connection.meta.client.generate_presigned_url(
"get_object", Params=params, ExpiresIn=expire, HttpMethod=http_method
Expand Down
Loading