@@ -69,20 +69,32 @@ def __init__(
6969 self .max_fields = max_fields
7070 self .max_part_size = max_part_size
7171 self .messages : list [tuple [FormMessage , bytes ]] = []
72+ self ._current_field_size = 0
73+ self ._current_fields = 0
7274
7375 def on_field_start (self ) -> None :
76+ self ._current_field_size = 0
7477 message = (FormMessage .FIELD_START , b"" )
7578 self .messages .append (message )
7679
7780 def on_field_name (self , data : bytes , start : int , end : int ) -> None :
81+ self ._current_field_size += end - start
82+ if self ._current_field_size > self .max_part_size :
83+ raise MultiPartException (f"Field exceeded maximum size of { int (self .max_part_size / 1024 )} KB." )
7884 message = (FormMessage .FIELD_NAME , data [start :end ])
7985 self .messages .append (message )
8086
8187 def on_field_data (self , data : bytes , start : int , end : int ) -> None :
88+ self ._current_field_size += end - start
89+ if self ._current_field_size > self .max_part_size :
90+ raise MultiPartException (f"Field exceeded maximum size of { int (self .max_part_size / 1024 )} KB." )
8291 message = (FormMessage .FIELD_DATA , data [start :end ])
8392 self .messages .append (message )
8493
8594 def on_field_end (self ) -> None :
95+ self ._current_fields += 1
96+ if self ._current_fields > self .max_fields :
97+ raise MultiPartException (f"Too many fields. Maximum number of fields is { self .max_fields } ." )
8698 message = (FormMessage .FIELD_END , b"" )
8799 self .messages .append (message )
88100
@@ -106,7 +118,6 @@ async def parse(self) -> FormData:
106118 field_value = bytearray ()
107119
108120 items : list [tuple [str , str | UploadFile ]] = []
109- field_count = 0
110121
111122 # Feed the parser with data from the request.
112123 async for chunk in self .stream :
@@ -121,17 +132,10 @@ async def parse(self) -> FormData:
121132 field_name = bytearray ()
122133 field_value = bytearray ()
123134 elif message_type == FormMessage .FIELD_NAME :
124- if len (field_name ) + len (field_value ) + len (message_bytes ) > self .max_part_size :
125- raise MultiPartException (f"Field exceeded maximum size of { int (self .max_part_size / 1024 )} KB." )
126135 field_name .extend (message_bytes )
127136 elif message_type == FormMessage .FIELD_DATA :
128- if len (field_name ) + len (field_value ) + len (message_bytes ) > self .max_part_size :
129- raise MultiPartException (f"Field exceeded maximum size of { int (self .max_part_size / 1024 )} KB." )
130137 field_value .extend (message_bytes )
131138 elif message_type == FormMessage .FIELD_END :
132- field_count += 1
133- if field_count > self .max_fields :
134- raise MultiPartException (f"Too many fields. Maximum number of fields is { self .max_fields } ." )
135139 name = unquote_plus (field_name .decode ("latin-1" ))
136140 value = unquote_plus (field_value .decode ("latin-1" ))
137141 items .append ((name , value ))
0 commit comments