Skip to content

[stable32] Encode s3 metadata as base64 if needed #56573

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

Draft
wants to merge 2 commits into
base: stable32
Choose a base branch
from
Draft

[stable32] Encode s3 metadata as base64 if needed #56573

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
d2b176f
fix: encode s3 metadata as base64 if needed
icewind1991 Nov 18, 2025
a65a7cd
Revert "fix(ObjectStoreStorage): Encode original-path in writeStream …
icewind1991 Nov 18, 2025
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: 3 additions & 0 deletions lib/private/Files/ObjectStore/S3.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,9 @@ private function parseS3Metadata(array $metadata): array {
$result = [];
foreach ($metadata as $key => $value) {
if (str_starts_with($key, 'x-amz-meta-')) {
if (str_starts_with($value, 'base64:')) {
$value = base64_decode(substr($value, 7));
}
$result[substr($key, strlen('x-amz-meta-'))] = $value;
}
}
Expand Down
6 changes: 5 additions & 1 deletion lib/private/Files/ObjectStore/S3ObjectTrait.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,11 @@ public function readObject($urn) {
private function buildS3Metadata(array $metadata): array {
$result = [];
foreach ($metadata as $key => $value) {
$result['x-amz-meta-' . $key] = $value;
if (mb_check_encoding($value, 'ASCII')) {
$result['x-amz-meta-' . $key] = $value;
} else {
$result['x-amz-meta-' . $key] = 'base64:' . base64_encode($value);
}
}
return $result;
}
Expand Down
Loading