diff options
| author | Loïc Hoguin <[email protected]> | 2011-10-10 09:09:15 +0200 |
|---|---|---|
| committer | Loïc Hoguin <[email protected]> | 2011-10-10 09:09:15 +0200 |
| commit | 25ae2028d6a9ce516b01f0ec126abeab00eb329d (patch) | |
| tree | dc9b58ebc4ffda954c20a8320a6525e0afda61bf /src/cowboy_http_websocket.erl | |
| parent | 7774e64923edd070c5371b2f613f8c60c1877f9c (diff) | |
| download | cowboy-25ae2028d6a9ce516b01f0ec126abeab00eb329d.tar.gz cowboy-25ae2028d6a9ce516b01f0ec126abeab00eb329d.tar.bz2 cowboy-25ae2028d6a9ce516b01f0ec126abeab00eb329d.zip | |
Add {shutdown, Req} to websocket_init/3 to fail a websocket upgrade
This change allows application developers to refuse websocket upgrades
by returning {shutdown, Req}. The application can also send a reply
with a custom error before returning from websocket_init/3, otherwise
an error 400 is sent.
Note that right now Cowboy closes the connection immediately. Also note
that neither terminate/3 nor websocket_terminate/3 will be called when
the connection is shutdown by websocket_init/3.
Diffstat (limited to 'src/cowboy_http_websocket.erl')
| -rw-r--r-- | src/cowboy_http_websocket.erl | 26 |
1 files changed, 23 insertions, 3 deletions
diff --git a/src/cowboy_http_websocket.erl b/src/cowboy_http_websocket.erl index 61917b4..039e2b6 100644 --- a/src/cowboy_http_websocket.erl +++ b/src/cowboy_http_websocket.erl @@ -124,7 +124,9 @@ handler_init(State=#state{handler=Handler, opts=Opts}, Req2, HandlerState); {ok, Req2, HandlerState, Timeout, hibernate} -> websocket_handshake(State#state{timeout=Timeout, - hibernate=true}, Req2, HandlerState) + hibernate=true}, Req2, HandlerState); + {shutdown, Req2} -> + upgrade_denied(Req2) catch Class:Reason -> upgrade_error(Req), error_logger:error_msg( @@ -135,9 +137,27 @@ handler_init(State=#state{handler=Handler, opts=Opts}, end. -spec upgrade_error(#http_req{}) -> ok. -upgrade_error(Req=#http_req{socket=Socket, transport=Transport}) -> - {ok, _Req} = cowboy_http_req:reply(400, [], [], +upgrade_error(Req) -> + {ok, Req2} = cowboy_http_req:reply(400, [], [], Req#http_req{resp_state=waiting}), + upgrade_terminate(Req2). + +%% @see cowboy_http_protocol:ensure_response/1 +-spec upgrade_denied(#http_req{}) -> ok. +upgrade_denied(Req=#http_req{resp_state=done}) -> + upgrade_terminate(Req); +upgrade_denied(Req=#http_req{resp_state=waiting}) -> + {ok, Req2} = cowboy_http_req:reply(400, [], [], Req), + upgrade_terminate(Req2); +upgrade_denied(Req=#http_req{method='HEAD', resp_state=chunks}) -> + upgrade_terminate(Req); +upgrade_denied(Req=#http_req{socket=Socket, transport=Transport, + resp_state=chunks}) -> + Transport:send(Socket, <<"0\r\n\r\n">>), + upgrade_terminate(Req). + +-spec upgrade_terminate(#http_req{}) -> ok. +upgrade_terminate(#http_req{socket=Socket, transport=Transport}) -> Transport:close(Socket). -spec websocket_handshake(#state{}, #http_req{}, any()) -> ok. |