umgeher/cowboy
0
Fork 0
mirror of https://github.com/ninenines/cowboy.git synced 2025-07-14 20:30:23 +00:00
Code Issues Wiki Activity

Reject WINDOW_UPDATE frames sent after an RST_STREAM

Browse source
This commit is contained in:
Loïc Hoguin 2018-04-27 20:45:34 +02:00
parent 5d5a00c863
commit 3d6bb01d5f
No known key found for this signature in database
GPG key ID: 8A9DF795F6FED764
1 changed files with 26 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

32
src/cowboy_http2.erl
View file

@ -117,10 +117,16 @@
%% by the client or by the server through PUSH_PROMISE frames.
streams = [] :: [stream()],
%% HTTP/2 streams that have been reset recently. We are expected
%% to keep receiving additional frames after sending an RST_STREAM.
%% HTTP/2 streams that have been reset recently by the server.
%% We are expected to keep receiving additional frames after
%% sending an RST_STREAM.
lingering_streams = [] :: [cowboy_stream:streamid()],
%% HTTP/2 streams that have been reset recently by the client.
%% We keep a few of these around in order to reject subsequent
%% frames on these streams.
rst_lingering_streams = [] :: [cowboy_stream:streamid()],
%% Streams can spawn zero or more children which are then managed
%% by this module if operating as a supervisor.
children = cowboy_children:init() :: cowboy_children:children(),
@ -445,7 +451,8 @@ frame(State=#state{client_streamid=LastStreamID}, {rst_stream, StreamID, _})
terminate(State, {connection_error, protocol_error,
'RST_STREAM frame received on a stream in idle state. (RFC7540 5.1)'});
frame(State, {rst_stream, StreamID, Reason}) ->
stream_terminate(State, StreamID, {stream_error, Reason, 'Stream reset requested by client.'});
stream_terminate(stream_rst_linger(State, StreamID), StreamID,
{stream_error, Reason, 'Stream reset requested by client.'});
%% SETTINGS frame.
frame(State0=#state{socket=Socket, transport=Transport, opts=Opts,
remote_settings=Settings0}, {settings, Settings}) ->
@ -504,7 +511,8 @@ frame(State=#state{client_streamid=LastStreamID}, {window_update, StreamID, _})
when StreamID > LastStreamID ->
terminate(State, {connection_error, protocol_error,
'WINDOW_UPDATE frame received on a stream in idle state. (RFC7540 5.1)'});
frame(State0=#state{streams=Streams0}, {window_update, StreamID, Increment}) ->
frame(State0=#state{streams=Streams0, rst_lingering_streams=RstLingering},
{window_update, StreamID, Increment}) ->
case lists:keyfind(StreamID, #stream.id, Streams0) of
#stream{local_window=StreamWindow} when StreamWindow + Increment > 16#7fffffff ->
stream_reset(State0, StreamID, {stream_error, flow_control_error,
@ -514,11 +522,14 @@ frame(State0=#state{streams=Streams0}, {window_update, StreamID, Increment}) ->
Stream0#stream{local_window=StreamWindow + Increment}),
Streams = lists:keystore(StreamID, #stream.id, Streams0, Stream),
State#state{streams=Streams};
%% @todo We must reject WINDOW_UPDATE frames on RST_STREAM closed streams.
false ->
%% WINDOW_UPDATE frames may be received for a short period of time
%% after a stream is closed. They must be ignored.
State0
case lists:member(StreamID, RstLingering) of
false -> State0;
true -> stream_closed(State0, StreamID, {stream_error, stream_closed,
'WINDOW_UPDATE frame received after the stream was reset. (RFC7540 5.1)'})
end
end;
%% Unexpected CONTINUATION frame.
frame(State, {continuation, _, _, _}) ->
@ -1092,6 +1103,10 @@ stream_req_init(State=#state{ref=Ref, peer=Peer, sock=Sock, cert=Cert},
'The :authority pseudo-header is invalid. (RFC7540 8.1.2.3)')
end.
stream_closed(State=#state{socket=Socket, transport=Transport}, StreamID, _) ->
Transport:send(Socket, cow_http2:rst_stream(StreamID, stream_closed)),
State.
stream_malformed(State=#state{socket=Socket, transport=Transport}, StreamID, _) ->
Transport:send(Socket, cow_http2:rst_stream(StreamID, protocol_error)),
State.
@ -1172,6 +1187,11 @@ stream_linger(State=#state{lingering_streams=Lingering0}, StreamID) ->
Lingering = [StreamID|lists:sublist(Lingering0, 100 - 1)],
State#state{lingering_streams=Lingering}.
%% We only keep up to 10 streams in this state. @todo Make it configurable?
stream_rst_linger(State=#state{rst_lingering_streams=Lingering0}, StreamID) ->
Lingering = [StreamID|lists:sublist(Lingering0, 10 - 1)],
State#state{rst_lingering_streams=Lingering}.
stream_terminate(State0=#state{streams=Streams0, children=Children0}, StreamID, Reason) ->
case lists:keytake(StreamID, #stream.id, Streams0) of
%% When the stream terminates normally (without sending RST_STREAM)