Skip to content

Antalya 26.3 Backport of #100283 - Validate Iceberg metadata file path for null bytes #1775

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
mkmkme wants to merge 1 commit into
base: antalya-26.3
Choose a base branch
from
+4 −2
Open

Antalya 26.3 Backport of #100283 - Validate Iceberg metadata file path for null bytes #1775

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
2 changes: 2 additions & 0 deletions src/Storages/ObjectStorage/DataLakes/Iceberg/Utils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1158,6 +1158,8 @@ MetadataFileWithInfo getLatestOrExplicitMetadataFileAndVersion(
if (data_lake_settings[DataLakeStorageSetting::iceberg_metadata_file_path].changed)
{
auto explicit_metadata_path = data_lake_settings[DataLakeStorageSetting::iceberg_metadata_file_path].value;
if (explicit_metadata_path.find('\0') != String::npos)
throw Exception(ErrorCodes::BAD_ARGUMENTS, "Iceberg metadata file path contains a null byte");
LOG_TEST(log, "Explicit metadata file path is specified {}, will read from this metadata file", explicit_metadata_path);
std::filesystem::path p(explicit_metadata_path);
auto it = p.begin();
Expand Down
4 changes: 2 additions & 2 deletions tests/integration/test_storage_iceberg_with_spark/test_metadata_file_path_security.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ def test_metadata_file_path_security(started_cluster_iceberg_with_spark):
)

# Test 2: Null byte injection should be rejected
with pytest.raises(Exception, match = "ICEBERG_SPECIFICATION_VIOLATION"):
with pytest.raises(Exception, match = "BAD_ARGUMENTS"):
create_iceberg_table(
"local",
instance,
Expand All @@ -60,7 +60,7 @@ def test_metadata_file_path_security(started_cluster_iceberg_with_spark):
)

# Test 3: Null byte in middle of path should be rejected
with pytest.raises(Exception, match = "PATH_ACCESS_DENIED"):
with pytest.raises(Exception, match = "BAD_ARGUMENTS"):
create_iceberg_table(
"local",
instance,
Expand Down
Loading