Skip to content

Make VSIFOpenL() to fail on a /vsis3/.../some_dir_with.ext and … #14725

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
rouault wants to merge 1 commit into
base: master
Choose a base branch
from
+211 −173
Open

Make VSIFOpenL() to fail on a /vsis3/.../some_dir_with.ext and … #14725

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
58 changes: 36 additions & 22 deletions autotest/gcore/vsiaz.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2397,29 +2397,25 @@ def test_vsiaz_imds_authentication_expiration():
):

handler = webserver.SequentialHandler()
handler.add(
"GET",
"/metadata/identity/oauth2/token?api-version=2018-02-01&resource=https%3A%2F%2Fstorage.azure.com%2F",
200,
{},
"""{
"access_token": "my_bearer",
"expires_on": "1000",
}""",
expected_headers={"Metadata": "true"},
)

def add_get_token():
handler.add(
"GET",
"/metadata/identity/oauth2/token?api-version=2018-02-01&resource=https%3A%2F%2Fstorage.azure.com%2F",
200,
{},
"""{
"access_token": "my_bearer",
"expires_on": "1000",
}""",
expected_headers={"Metadata": "true"},
)

add_get_token()
# Credentials requested again since they are expired
handler.add(
"GET",
"/metadata/identity/oauth2/token?api-version=2018-02-01&resource=https%3A%2F%2Fstorage.azure.com%2F",
200,
{},
"""{
"access_token": "my_bearer",
"expires_on": "1000",
}""",
expected_headers={"Metadata": "true"},
)
add_get_token()
add_get_token()
add_get_token()
handler.add(
"GET",
"/azure/blob/myaccount/az_fake_bucket/resource",
Expand Down Expand Up @@ -2723,6 +2719,24 @@ def test_vsiaz_workload_identity_managed_authentication_expiration():
expected_headers={"Content-Type": "application/x-www-form-urlencoded"},
expected_body=b"client_assertion=content_of_AZURE_FEDERATED_TOKEN_FILE&client_assertion_type=urn:ietf:params:oauth:client-assertion-type:jwt-bearer&client_id=client_id_value&grant_type=client_credentials&scope=https://storage.azure.com/.default",
)
handler.add(
"POST",
"/tenant_id/oauth2/v2.0/token",
200,
{},
"""{"access_token": "my_bearer2", "expires_in": "10"}""",
expected_headers={"Content-Type": "application/x-www-form-urlencoded"},
expected_body=b"client_assertion=content_of_AZURE_FEDERATED_TOKEN_FILE&client_assertion_type=urn:ietf:params:oauth:client-assertion-type:jwt-bearer&client_id=client_id_value&grant_type=client_credentials&scope=https://storage.azure.com/.default",
)
handler.add(
"POST",
"/tenant_id/oauth2/v2.0/token",
200,
{},
"""{"access_token": "my_bearer2", "expires_in": "10"}""",
expected_headers={"Content-Type": "application/x-www-form-urlencoded"},
expected_body=b"client_assertion=content_of_AZURE_FEDERATED_TOKEN_FILE&client_assertion_type=urn:ietf:params:oauth:client-assertion-type:jwt-bearer&client_id=client_id_value&grant_type=client_credentials&scope=https://storage.azure.com/.default",
)

handler.add(
"GET",
Expand Down
43 changes: 20 additions & 23 deletions autotest/gcore/vsigs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1786,30 +1786,27 @@ def method(request):
request.wfile.write("""foo""".encode("ascii"))

handler = webserver.SequentialHandler()

def add_get_token():
handler.add(
"GET",
"/computeMetadata/v1/instance/service-accounts/default/token",
200,
{},
"""{
"access_token" : "ACCESS_TOKEN",
"token_type" : "Bearer",
"expires_in" : 0,
}""",
)

# First time is used when trying to establish if GCE authentication is available
handler.add(
"GET",
"/computeMetadata/v1/instance/service-accounts/default/token",
200,
{},
"""{
"access_token" : "ACCESS_TOKEN",
"token_type" : "Bearer",
"expires_in" : 0,
}""",
)
# Second time is needed because f the access to th file
handler.add(
"GET",
"/computeMetadata/v1/instance/service-accounts/default/token",
200,
{},
"""{
"access_token" : "ACCESS_TOKEN",
"token_type" : "Bearer",
"expires_in" : 0,
}""",
)
add_get_token()
# Second time is needed because of the access to the file
add_get_token()
# A couple more because VSICurlFilesystemHandlerBase::Open() use GetURLFromFilename()
add_get_token()
add_get_token()
handler.add("GET", "/gs_fake_bucket/resource", custom_method=method)
with webserver.install_http_handler(handler):
f = open_for_read("/vsigs/gs_fake_bucket/resource")
Expand Down
Loading
Loading