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

Jump to bottom

Storage: ensure that 'method' for 'Blob.generate_signed_url' is uppercase. #6110

Merged
merged 1 commit into from
Sep 26, 2018
Merged

Storage: ensure that 'method' for 'Blob.generate_signed_url' is uppercase. #6110

Show file tree
Hide file tree
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
6 changes: 4 additions & 2 deletions storage/google/cloud/storage/blob.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,9 +345,11 @@ def generate_signed_url(self, expiration, method='GET',
credentials = client._credentials

return generate_signed_url(
credentials, resource=resource,
credentials,
resource=resource,
api_access_endpoint=_API_ACCESS_ENDPOINT,
expiration=expiration, method=method,
expiration=expiration,
method=method.upper(),
content_type=content_type,
response_type=response_type,
response_disposition=response_disposition,
Expand Down
10 changes: 10 additions & 0 deletions storage/tests/system.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -727,6 +727,16 @@ def test_create_signed_read_url(self):
self.assertEqual(response.status_code, 200)
self.assertEqual(response.content, self.LOCAL_FILE)

def test_create_signed_read_url_lowercase_method(self):
blob = self.bucket.blob('LogoToSign.jpg')
expiration = int(time.time() + 10)
signed_url = blob.generate_signed_url(expiration, method='get',
client=Config.CLIENT)

response = requests.get(signed_url)
self.assertEqual(response.status_code, 200)
self.assertEqual(response.content, self.LOCAL_FILE)

def test_create_signed_read_url_w_non_ascii_name(self):
blob = self.bucket.blob(u'Caf\xe9.txt')
payload = b'Test signed URL for blob w/ non-ASCII name'
Expand Down
30 changes: 30 additions & 0 deletions storage/tests/unit/test_blob.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -383,6 +383,36 @@ def test_generate_signed_url_w_credentials(self):
credentials = object()
self._basic_generate_signed_url_helper(credentials=credentials)

def test_generate_signed_url_lowercase_method(self):
BLOB_NAME = 'blob-name'
EXPIRATION = '2014-10-16T20:34:37.000Z'
connection = _Connection()
client = _Client(connection)
bucket = _Bucket(client)
blob = self._make_one(BLOB_NAME, bucket=bucket)
URI = (u'http://example.com/abucket/a-blob-name?Signature=DEADBEEF'
u'&Expiration=2014-10-16T20:34:37.000Z')

SIGNER = _Signer()
with mock.patch('google.cloud.storage.blob.generate_signed_url',
new=SIGNER):
signed_url = blob.generate_signed_url(EXPIRATION, method='get')
self.assertEqual(signed_url, URI)

PATH = '/name/%s' % (BLOB_NAME,)
EXPECTED_ARGS = (_Connection.credentials,)
EXPECTED_KWARGS = {
'api_access_endpoint': 'https://storage.googleapis.com',
'expiration': EXPIRATION,
'method': 'GET',
'resource': PATH,
'content_type': None,
'response_type': None,
'response_disposition': None,
'generation': None,
}
self.assertEqual(SIGNER._signed, [(EXPECTED_ARGS, EXPECTED_KWARGS)])

def test_generate_signed_url_non_ascii(self):
BLOB_NAME = u'\u0410\u043a\u043a\u043e\u0440\u0434\u044b.txt'
EXPIRATION = '2014-10-16T20:34:37.000Z'
Expand Down