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

[Storage] az storage blob generate-sas: Fix#11643 to support encoding blob url #12632

Merged
merged 2 commits into from
Mar 20, 2020
Merged

[Storage] az storage blob generate-sas: Fix#11643 to support encoding blob url #12632

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
ccc4da6
add transformer for the command
Juliehzl Mar 18, 2020
6abb744
add test
Juliehzl Mar 18, 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
3 changes: 2 additions & 1 deletion src/azure-cli/azure/cli/command_modules/storage/operations/blob.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -455,7 +455,8 @@ def generate_sas_blob_uri(client, container_name, blob_name, permission=None,
protocol=protocol, cache_control=cache_control, content_disposition=content_disposition,
content_encoding=content_encoding, content_language=content_language, content_type=content_type)
if full_uri:
return client.make_blob_url(container_name, blob_name, protocol=protocol, sas_token=sas_token)
from ..url_quote_util import encode_url_path
return encode_url_path(client.make_blob_url(container_name, blob_name, protocol=protocol, sas_token=sas_token))
return sas_token


Expand Down
25 changes: 16 additions & 9 deletions ...li/azure/cli/command_modules/storage/tests/latest/test_storage_sas_tokan_url_scenarios.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,23 +47,30 @@ def test_storage_blob_url_sas_token_scenario(self, resource_group, storage_accou
account_info = self.get_account_info(resource_group, storage_account)
container = self.create_container(account_info)
source_file = self.create_temp_file(128, full_random=False)
blob = "blob"
blob = "blob 1"
expiry = (datetime.utcnow() + timedelta(hours=1)).strftime('%Y-%m-%dT%H:%MZ')

self.storage_cmd('storage container exists -n {}', account_info, container) \
.assert_with_checks(JMESPathCheck('exists', True))

self.storage_cmd('storage blob upload -c {} -f "{}" -n {}', account_info,
self.storage_cmd('storage blob upload -c {} -f "{}" -n "{}"', account_info,
container, source_file, blob)
self.storage_cmd('storage blob exists -c {} -n {}', account_info, container, blob) \
self.storage_cmd('storage blob exists -c {} -n "{}"', account_info, container, blob) \
.assert_with_checks(JMESPathCheck('exists', True))

sas_token = self.cmd(
'storage blob generate-sas -c {} -n {} --permissions rw --https-only --expiry {} --account-name {} -otsv'.format(
container, blob, expiry, storage_account)).output.strip()
sas_token = self.storage_cmd(
'storage blob generate-sas -c {} -n "{}" --permissions rw --https-only --expiry {} --account-name {} -otsv',
account_info, container, blob, expiry, storage_account).output.strip()
# print(sas_token
blob_url = self.cmd(
'storage blob url -c {} -n {} --account-name {} --sas-token "{}" -otsv'.format(
container, blob, storage_account, sas_token)).output.strip()
blob_url = self.storage_cmd(
'storage blob url -c {} -n "{}" --account-name {} --sas-token "{}" -otsv', account_info,
container, blob, storage_account, sas_token).output.strip()
self.assertIn('?' + sas_token, blob_url)
self.assertEqual(requests.get(blob_url).status_code, 200)

sas_token_uri = self.storage_cmd(
'storage blob generate-sas -c {} -n "{}" --permissions rw --https-only --expiry {} --account-name {} --full-uri -otsv',
account_info, container, blob, expiry, storage_account).output.strip()

self.assertIn("blob%201", sas_token_uri)
self.assertEqual(sas_token_uri, blob_url)