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

Fix handshake for when querystring is needed

Browse source
This commit is contained in:
Ori Bar 2011-09-26 15:01:16 +02:00
parent d0f711a61d
commit 3715df5bd4
1 changed files with 19 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/cowboy_http_websocket.erl
View file

@ -144,8 +144,8 @@ upgrade_error(Req=#http_req{socket=Socket, transport=Transport}) ->
-spec websocket_handshake(#state{}, #http_req{}, any()) -> ok. -spec websocket_handshake(#state{}, #http_req{}, any()) -> ok.
websocket_handshake(State=#state{version=0, origin=Origin, websocket_handshake(State=#state{version=0, origin=Origin,
challenge=Challenge}, Req=#http_req{transport=Transport, challenge=Challenge}, Req=#http_req{transport=Transport,
raw_host=Host, port=Port, raw_path=Path}, HandlerState) -> raw_host=Host, port=Port, raw_path=Path, raw_qs=QS}, HandlerState) ->
Location = hixie76_location(Transport:name(), Host, Port, Path), Location = hixie76_location(Transport:name(), Host, Port, Path, QS),
{ok, Req2} = cowboy_http_req:reply( {ok, Req2} = cowboy_http_req:reply(
<<"101 WebSocket Protocol Handshake">>, <<"101 WebSocket Protocol Handshake">>,
[{<<"Connection">>, <<"Upgrade">>}, [{<<"Connection">>, <<"Upgrade">>},
@ -417,11 +417,14 @@ hixie76_key_to_integer(Key) ->
Spaces = length([C || << C >> <= Key, C =:= 32]), Spaces = length([C || << C >> <= Key, C =:= 32]),
Number div Spaces. Number div Spaces.
-spec hixie76_location(atom(), binary(), inet:ip_port(), binary()) -spec hixie76_location(atom(), binary(), inet:ip_port(), binary(), binary())
-> binary(). -> binary().
hixie76_location(Protocol, Host, Port, Path) -> hixie76_location(Protocol, Host, Port, Path, <<>>) ->
<< (hixie76_location_protocol(Protocol))/binary, "://", Host/binary, << (hixie76_location_protocol(Protocol))/binary, "://", Host/binary,
(hixie76_location_port(ssl, Port))/binary, Path/binary >>. (hixie76_location_port(ssl, Port))/binary, Path/binary>>;
hixie76_location(Protocol, Host, Port, Path, QS) ->
<< (hixie76_location_protocol(Protocol))/binary, "://", Host/binary,
(hixie76_location_port(ssl, Port))/binary, Path/binary, "?", QS/binary >>.
-spec hixie76_location_protocol(atom()) -> binary(). -spec hixie76_location_protocol(atom()) -> binary().
hixie76_location_protocol(ssl) -> <<"wss">>; hixie76_location_protocol(ssl) -> <<"wss">>;
@ -429,9 +432,9 @@ hixie76_location_protocol(_) -> <<"ws">>.
-spec hixie76_location_port(atom(), inet:ip_port()) -> binary(). -spec hixie76_location_port(atom(), inet:ip_port()) -> binary().
hixie76_location_port(ssl, 443) -> hixie76_location_port(ssl, 443) ->
<<"">>; <<>>;
hixie76_location_port(_, 80) -> hixie76_location_port(_, 80) ->
<<"">>; <<>>;
hixie76_location_port(_, Port) -> hixie76_location_port(_, Port) ->
<<":", (list_to_binary(integer_to_list(Port)))/binary>>. <<":", (list_to_binary(integer_to_list(Port)))/binary>>.
@ -457,13 +460,17 @@ hybi_payload_length(N) ->
hixie76_location_test() -> hixie76_location_test() ->
?assertEqual(<<"ws://localhost/path">>, ?assertEqual(<<"ws://localhost/path">>,
hixie76_location(other, <<"localhost">>, 80, <<"/path">>)), hixie76_location(other, <<"localhost">>, 80, <<"/path">>, <<>>)),
?assertEqual(<<"ws://localhost:8080/path">>, ?assertEqual(<<"ws://localhost:8080/path">>,
hixie76_location(other, <<"localhost">>, 8080, <<"/path">>)), hixie76_location(other, <<"localhost">>, 8080, <<"/path">>, <<>>)),
?assertEqual(<<"ws://localhost:8080/path?dummy=2785">>,
hixie76_location(other, <<"localhost">>, 8080, <<"/path">>, <<"dummy=2785">>)),
?assertEqual(<<"wss://localhost/path">>, ?assertEqual(<<"wss://localhost/path">>,
hixie76_location(ssl, <<"localhost">>, 443, <<"/path">>)), hixie76_location(ssl, <<"localhost">>, 443, <<"/path">>, <<>>)),
?assertEqual(<<"wss://localhost:8443/path">>, ?assertEqual(<<"wss://localhost:8443/path">>,
hixie76_location(ssl, <<"localhost">>, 8443, <<"/path">>)), hixie76_location(ssl, <<"localhost">>, 8443, <<"/path">>, <<>>)),
?assertEqual(<<"wss://localhost:8443/path?dummy=2785">>,
hixie76_location(ssl, <<"localhost">>, 8443, <<"/path">>, <<"dummy=2785">>)),
ok. ok.
-endif. -endif.