mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-06-05 11:39:13 +00:00
Code Issues 32 Releases Wiki Activity

Refs #33697 -- Made MultiPartParser use django.utils.http.parse_header_parameters() for parsing Content-Type header.

Browse Source
This commit is contained in:
Mehrdad 2022-06-03 01:30:24 -04:00 committed by Mariusz Felisiak
parent aaf00450d2
commit 49b470b918
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
django/http/multipartparser.py
View File

@ -19,6 +19,7 @@ from django.core.exceptions import (
from django.core.files.uploadhandler import SkipFile, StopFutureHandlers, StopUpload from django.core.files.uploadhandler import SkipFile, StopFutureHandlers, StopUpload
from django.utils.datastructures import MultiValueDict from django.utils.datastructures import MultiValueDict
from django.utils.encoding import force_str from django.utils.encoding import force_str
from django.utils.http import parse_header_parameters
from django.utils.regex_helper import _lazy_re_compile from django.utils.regex_helper import _lazy_re_compile
__all__ = ("MultiPartParser", "MultiPartParserError", "InputStreamExhausted") __all__ = ("MultiPartParser", "MultiPartParserError", "InputStreamExhausted")
@ -49,7 +50,7 @@ class MultiPartParser:
and returns a tuple of ``(MultiValueDict(POST), MultiValueDict(FILES))``. and returns a tuple of ``(MultiValueDict(POST), MultiValueDict(FILES))``.
""" """
boundary_re = _lazy_re_compile(rb"[ -~]{0,200}[!-~]") boundary_re = _lazy_re_compile(r"[ -~]{0,200}[!-~]")
def __init__(self, META, input_data, upload_handlers, encoding=None): def __init__(self, META, input_data, upload_handlers, encoding=None):
""" """
@ -70,14 +71,16 @@ class MultiPartParser:
if not content_type.startswith("multipart/"): if not content_type.startswith("multipart/"):
raise MultiPartParserError("Invalid Content-Type: %s" % content_type) raise MultiPartParserError("Invalid Content-Type: %s" % content_type)
# Parse the header to get the boundary to split the parts.
try: try:
ctypes, opts = parse_header(content_type.encode("ascii")) content_type.encode("ascii")
except UnicodeEncodeError: except UnicodeEncodeError:
raise MultiPartParserError( raise MultiPartParserError(
"Invalid non-ASCII Content-Type in multipart: %s" "Invalid non-ASCII Content-Type in multipart: %s"
% force_str(content_type) % force_str(content_type)
) )
# Parse the header to get the boundary to split the parts.
_, opts = parse_header_parameters(content_type)
boundary = opts.get("boundary") boundary = opts.get("boundary")
if not boundary or not self.boundary_re.fullmatch(boundary): if not boundary or not self.boundary_re.fullmatch(boundary):
raise MultiPartParserError( raise MultiPartParserError(
@ -95,9 +98,7 @@ class MultiPartParser:
# This means we shouldn't continue...raise an error. # This means we shouldn't continue...raise an error.
raise MultiPartParserError("Invalid content length: %r" % content_length) raise MultiPartParserError("Invalid content length: %r" % content_length)
if isinstance(boundary, str): self._boundary = boundary.encode("ascii")
boundary = boundary.encode("ascii")
self._boundary = boundary
self._input_data = input_data self._input_data = input_data
# For compatibility with low-level network APIs (with 32-bit integers), # For compatibility with low-level network APIs (with 32-bit integers),