Skip to content

fix: sanitize mime_type and filename to prevent HTTP header injection in resumable upload #2371

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
uchia6861-tech wants to merge 1 commit into
base: main
Choose a base branch
from
+8 −3
Open

fix: sanitize mime_type and filename to prevent HTTP header injection in resumable upload #2371

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
11 changes: 8 additions & 3 deletions google/genai/_extra_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,11 @@
McpClientSession = None
McpTool = None

def _sanitize_header_value(value: str) -> str:
"""Strips CR and LF characters to prevent HTTP header injection."""
return value.replace('\r', '').replace('\n', '')


_DEFAULT_MAX_REMOTE_CALLS_AFC = 10

logger = logging.getLogger('google_genai.models')
Expand Down Expand Up @@ -659,7 +664,7 @@ def prepare_resumable_upload(
'X-Goog-Upload-Protocol': 'resumable',
'X-Goog-Upload-Command': 'start',
'X-Goog-Upload-Header-Content-Length': f'{size_bytes}',
'X-Goog-Upload-Header-Content-Type': f'{mime_type}',
'X-Goog-Upload-Header-Content-Type': _sanitize_header_value(mime_type),
}
else:
http_options = types.HttpOptions(
Expand All @@ -669,11 +674,11 @@ def prepare_resumable_upload(
'X-Goog-Upload-Protocol': 'resumable',
'X-Goog-Upload-Command': 'start',
'X-Goog-Upload-Header-Content-Length': f'{size_bytes}',
'X-Goog-Upload-Header-Content-Type': f'{mime_type}',
'X-Goog-Upload-Header-Content-Type': _sanitize_header_value(mime_type),
},
)
if isinstance(file, (str, os.PathLike)):
if http_options.headers is None:
http_options.headers = {}
http_options.headers['X-Goog-Upload-File-Name'] = os.path.basename(file)
http_options.headers['X-Goog-Upload-File-Name'] = _sanitize_header_value(os.path.basename(str(file)))
return http_options, size_bytes, mime_type