@@ -47,6 +47,10 @@ defmodule Mint.HTTP1 do
4747
4848 * `:invalid_status_line` - when the HTTP/1 status line is invalid.
4949
50+ * `{:response_line_too_long, size, max_size}` - when a response status line,
51+ chunk-size line, or chunk-extension line exceeds the configured size limit.
52+ `size` is the number of bytes received and `max_size` is the configured maximum.
53+
5054 * `{:invalid_request_target, target}` - when the request target is invalid.
5155
5256 * `{:invalid_request_method, method}` - when the request method is invalid.
@@ -148,8 +152,9 @@ defmodule Mint.HTTP1 do
148152 This is only available for HTTP/1.1 connections. *Available since v1.8.0*.
149153
150154 * `:max_header_list_size` - (`t:pos_integer/0` or `:infinity`) the maximum number of
151- bytes allowed in a response header section or chunked trailer section. This includes
152- header names, values, and line delimiters. Defaults to 256 KiB. *Available since 1.9.2*.
155+ bytes allowed in a response status line, chunk-size line, chunk-extension line,
156+ header section, or chunked trailer section. This includes header names, values,
157+ and line delimiters. Defaults to 256 KiB. *Available since 1.9.2*.
153158
154159 * `:stream_headers` - (`t:boolean/0`) if set to `true`, response headers and trailer headers
155160 will be emitted as they are parsed, rather than buffered until the complete header section
@@ -727,8 +732,7 @@ defmodule Mint.HTTP1 do
727732 decode ( :headers , conn , rest , responses )
728733
729734 :more ->
730- conn = put_in ( conn . buffer , data )
731- { :ok , conn , responses }
735+ buffer_response_line ( conn , data , responses )
732736
733737 :error ->
734738 { :error , conn , wrap_error ( :invalid_status_line ) , responses }
@@ -874,9 +878,7 @@ defmodule Mint.HTTP1 do
874878 defp decode_body ( { :chunked , nil } , conn , data , request_ref , responses ) do
875879 case Parse . chunk_size ( data ) do
876880 :more ->
877- conn = put_in ( conn . buffer , data )
878- conn = put_in ( conn . request . body , { :chunked , nil } )
879- { :ok , conn , responses }
881+ buffer_response_line ( conn , data , responses , { :chunked , nil } )
880882
881883 { :ok , 0 , rest } ->
882884 # Manually collapse the body buffer since we're done with the body
@@ -897,9 +899,7 @@ defmodule Mint.HTTP1 do
897899 decode_body ( { :chunked , size } , conn , rest , request_ref , responses )
898900
899901 :more ->
900- conn = put_in ( conn . buffer , data )
901- conn = put_in ( conn . request . body , { :chunked , :metadata , size } )
902- { :ok , conn , responses }
902+ buffer_response_line ( conn , data , responses , { :chunked , :metadata , size } )
903903 end
904904 end
905905
@@ -1075,6 +1075,34 @@ defmodule Mint.HTTP1 do
10751075 end
10761076 end
10771077
1078+ defp buffer_response_line ( conn , data , responses , body_state \\ nil ) do
1079+ case check_response_line_size ( conn , byte_size ( data ) ) do
1080+ :ok ->
1081+ conn = put_in ( conn . buffer , data )
1082+
1083+ conn =
1084+ if body_state == nil do
1085+ conn
1086+ else
1087+ put_in ( conn . request . body , body_state )
1088+ end
1089+
1090+ { :ok , conn , responses }
1091+
1092+ { :error , reason } ->
1093+ { :error , conn , wrap_error ( reason ) , responses }
1094+ end
1095+ end
1096+
1097+ defp check_response_line_size ( % { max_header_list_size: :infinity } , _size ) , do: :ok
1098+
1099+ defp check_response_line_size ( % { max_header_list_size: max_size } , size )
1100+ when size <= max_size ,
1101+ do: :ok
1102+
1103+ defp check_response_line_size ( % { max_header_list_size: max_size } , size ) ,
1104+ do: { :error , { :response_line_too_long , size , max_size } }
1105+
10781106 defp store_header ( % { content_length: nil } = request , "content-length" , value ) do
10791107 with { :ok , content_length } <- Parse . content_length_header ( value ) ,
10801108 do: { :ok , % { request | content_length: content_length } }
@@ -1312,6 +1340,10 @@ defmodule Mint.HTTP1 do
13121340 "invalid status line"
13131341 end
13141342
1343+ def format_error ( { :response_line_too_long , size , max_size } ) do
1344+ "the response line (#{ size } bytes) exceeds the maximum allowed size of #{ max_size } bytes"
1345+ end
1346+
13151347 def format_error ( :invalid_header ) do
13161348 "invalid header"
13171349 end
0 commit comments