Skip to content

REST: Allow disabling remote signing with an empty s3.signer #4134

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
Ankitraj-builds wants to merge 1 commit into
base: main
Choose a base branch
from
+45 −0
Open

REST: Allow disabling remote signing with an empty s3.signer #4134

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
5 changes: 5 additions & 0 deletions pyiceberg/catalog/rest/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@
AWS_REGION,
AWS_SECRET_ACCESS_KEY,
AWS_SESSION_TOKEN,
S3_SIGNER,
FileIO,
load_file_io,
)
Expand Down Expand Up @@ -645,6 +646,10 @@ def _load_file_io(
table_properties: Properties = EMPTY_DICT,
) -> FileIO:
merged_properties = {**table_properties, **self.properties, **properties}
# An explicitly empty s3.signer in the catalog config opts out of remote signing,
# even when the server config or vended credentials set a signer.
if self.properties.get(S3_SIGNER) == "":
merged_properties[S3_SIGNER] = ""
if self._auth_manager:
merged_properties[AUTH_MANAGER] = self._auth_manager
return load_file_io(merged_properties, location)
Expand Down
40 changes: 40 additions & 0 deletions tests/catalog/test_rest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3481,6 +3481,46 @@ def test_load_table_catalog_config_outranks_table_properties(
assert table.io.properties["s3.proxy-uri"] == "http://table-only-proxy"


def test_load_table_empty_catalog_signer_disables_remote_signing(
rest_mock: Mocker, example_table_metadata_with_snapshot_v1: dict[str, Any]
) -> None:
metadata_location = "s3://warehouse/database/table/metadata/00001.metadata.json"
rest_mock.get(
f"{TEST_URI}v1/namespaces/fokko/tables/table",
json={
"metadata-location": metadata_location,
"metadata": example_table_metadata_with_snapshot_v1,
"config": {"s3.signer": "S3V4RestSigner", "s3.signer.uri": "http://signer"},
},
status_code=200,
request_headers=TEST_HEADERS,
)
catalog = RestCatalog("rest", uri=TEST_URI, token=TEST_TOKEN, **{"s3.signer": ""})
table = catalog.load_table(("fokko", "table"))

assert table.io.properties["s3.signer"] == ""


def test_load_table_server_signer_kept_without_catalog_override(
rest_mock: Mocker, example_table_metadata_with_snapshot_v1: dict[str, Any]
) -> None:
metadata_location = "s3://warehouse/database/table/metadata/00001.metadata.json"
rest_mock.get(
f"{TEST_URI}v1/namespaces/fokko/tables/table",
json={
"metadata-location": metadata_location,
"metadata": example_table_metadata_with_snapshot_v1,
"config": {"s3.signer": "S3V4RestSigner", "s3.signer.uri": "http://signer"},
},
status_code=200,
request_headers=TEST_HEADERS,
)
catalog = RestCatalog("rest", uri=TEST_URI, token=TEST_TOKEN)
table = catalog.load_table(("fokko", "table"))

assert table.io.properties["s3.signer"] == "S3V4RestSigner"


def test_load_credentials_with_longest_prefix(rest_mock: Mocker) -> None:
rest_mock.get(
f"{TEST_URI}v1/namespaces/fokko/tables/table/credentials",
Expand Down
Loading