AI/open-webui
1
0
Fork 1
mirror of https://git.mirrors.martin98.com/https://github.com/open-webui/open-webui synced 2025-08-14 19:35:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14228 from suleimanelkhoury/s3-tags-allowed-characters

Browse Source 
fix: S3 allowed characters in Tags.
This commit is contained in:
Tim Jaeryang Baek 2025-05-26 22:43:21 +04:00 committed by GitHub
commit 6062174602
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
backend/open_webui/storage/provider.py
View File

@ -2,6 +2,7 @@ import os
import shutil import shutil
import json import json
import logging import logging
import re
from abc import ABC, abstractmethod from abc import ABC, abstractmethod
from typing import BinaryIO, Tuple, Dict from typing import BinaryIO, Tuple, Dict
@ -136,6 +137,11 @@ class S3StorageProvider(StorageProvider):
self.bucket_name = S3_BUCKET_NAME self.bucket_name = S3_BUCKET_NAME
self.key_prefix = S3_KEY_PREFIX if S3_KEY_PREFIX else "" self.key_prefix = S3_KEY_PREFIX if S3_KEY_PREFIX else ""
@staticmethod
def sanitize_tag_value(s: str) -> str:
"""Only include S3 allowed characters."""
return re.sub(r"[^a-zA-Z0-9 äöüÄÖÜß\+\-=\._:/@]", "", s)
def upload_file( def upload_file(
self, file: BinaryIO, filename: str, tags: Dict[str, str] self, file: BinaryIO, filename: str, tags: Dict[str, str]
) -> Tuple[bytes, str]: ) -> Tuple[bytes, str]:
@ -145,7 +151,15 @@ class S3StorageProvider(StorageProvider):
try: try:
self.s3_client.upload_file(file_path, self.bucket_name, s3_key) self.s3_client.upload_file(file_path, self.bucket_name, s3_key)
if S3_ENABLE_TAGGING and tags: if S3_ENABLE_TAGGING and tags:
tagging = {"TagSet": [{"Key": k, "Value": v} for k, v in tags.items()]} sanitized_tags = {
self.sanitize_tag_value(k): self.sanitize_tag_value(v)
for k, v in tags.items()
}
tagging = {
"TagSet": [
{"Key": k, "Value": v} for k, v in sanitized_tags.items()
]
}
self.s3_client.put_object_tagging( self.s3_client.put_object_tagging(
Bucket=self.bucket_name, Bucket=self.bucket_name,
Key=s3_key, Key=s3_key,