Skip to content

Potential fix for URL parsing bugs in BlobClient.from_blob_url() #12567

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

Closed
chrisyeh96 wants to merge 1 commit into from
Closed

Potential fix for URL parsing bugs in BlobClient.from_blob_url() #12567

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
26 changes: 12 additions & 14 deletions sdk/storage/azure-storage-blob/azure/storage/blob/_blob_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
TYPE_CHECKING
)
try:
from urllib.parse import urlparse, quote, unquote
from urllib.parse import urlsplit, quote, unquote
except ImportError:
from urlparse import urlparse # type: ignore
from urlparse import urlsplit # type: ignore
from urllib2 import quote, unquote # type: ignore

import six
Expand Down Expand Up @@ -142,7 +142,7 @@ def __init__(
account_url = "https://" + account_url
except AttributeError:
raise ValueError("Account URL must be a string.")
parsed_url = urlparse(account_url.rstrip('/'))
parsed_url = urlsplit(account_url.rstrip('/'))

if not (container_name and blob_name):
raise ValueError("Please specify a container name and blob name.")
Expand Down Expand Up @@ -204,23 +204,21 @@ def from_blob_url(cls, blob_url, credential=None, snapshot=None, **kwargs):
blob_url = "https://" + blob_url
except AttributeError:
raise ValueError("Blob URL must be a string.")
parsed_url = urlparse(blob_url.rstrip('/'))
parsed_url = urlsplit(blob_url.rstrip('/'))

if not parsed_url.netloc:
raise ValueError("Invalid URL: {}".format(blob_url))

path_blob = parsed_url.path.lstrip('/').split('/')
account_path = ""
if len(path_blob) > 2:
account_path = "/" + "/".join(path_blob[:-2])
account_url = "{}://{}{}?{}".format(
account_url = "{}://{}/".format(
parsed_url.scheme,
parsed_url.netloc.rstrip('/'),
account_path,
parsed_url.query)
container_name, blob_name = unquote(path_blob[-2]), unquote(path_blob[-1])
if not container_name or not blob_name:
parsed_url.netloc)
if parsed_url.query:
account_url += "?{}".format(parsed_url.query)

path_blob = parsed_url.path.lstrip('/').split('/', maxsplit=1)
if len(path_blob) < 2 or path_blob[1] == '':
raise ValueError("Invalid URL. Provide a blob_url with a valid blob and container name.")
container_name, blob_name = unquote(path_blob[0]), unquote(path_blob[1])

path_snapshot, _ = parse_query(parsed_url.query)
if snapshot:
Expand Down