diff options
Diffstat (limited to 'test')
24 files changed, 1241 insertions, 1419 deletions
diff --git a/test/autobahn_SUITE.erl b/test/autobahn_SUITE.erl deleted file mode 100644 index da56667..0000000 --- a/test/autobahn_SUITE.erl +++ /dev/null @@ -1,100 +0,0 @@ -%% Copyright (c) 2011, Magnus Klaar <[email protected]> -%% -%% Permission to use, copy, modify, and/or distribute this software for any -%% purpose with or without fee is hereby granted, provided that the above -%% copyright notice and this permission notice appear in all copies. -%% -%% THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES -%% WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF -%% MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR -%% ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -%% WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -%% ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF -%% OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - --module(autobahn_SUITE). - -%% This CT suite reuses the websocket server test suite from the Autobahn -%% project. The Autobahn project is a websocket implementation for Python. -%% Given that we don't expect to find the packages and tools to properly -%% set up and run such a test on a system used primarily for Erlang devlopment -%% this test suite is not included in the default 'ct' target in the makefile. - --include_lib("common_test/include/ct.hrl"). - --export([all/0, groups/0, init_per_suite/1, end_per_suite/1, - init_per_group/2, end_per_group/2]). %% ct. --export([run_tests/1]). %% autobahn. - -%% ct. - -all() -> - [{group, autobahn}]. - -groups() -> - BaseTests = [run_tests], - [{autobahn, [], BaseTests}]. - -init_per_suite(Config) -> - application:start(crypto), - application:start(cowlib), - application:start(ranch), - application:start(cowboy), - %% /tmp must be used as the parent directory for the virtualenv because - %% the directory names used in CT are so long that the interpreter path - %% in the scripts generated by virtualenv get so long that the system - %% refuses to execute them. - EnvPath = "/tmp/cowboy_autobahn_env", - os:putenv("AB_TESTS_ENV", EnvPath), - os:putenv("AB_TESTS_PRIV", ?config(priv_dir, Config)), - BinPath = filename:join(?config(data_dir, Config), "test.py"), - Stdout = os:cmd(BinPath ++ " setup"), - ct:log("~s~n", [Stdout]), - case string:str(Stdout, "AB-TESTS-SETUP-OK") of - 0 -> erlang:error(failed); - _ -> [{env_path, EnvPath},{bin_path,BinPath}|Config] - end. - -end_per_suite(_Config) -> - os:cmd("deactivate"), - application:stop(cowboy), - application:stop(ranch), - application:stop(cowlib), - application:stop(crypto), - ok. - -init_per_group(autobahn, Config) -> - Port = 33080, - cowboy:start_http(autobahn, 100, [{port, Port}], [ - {env, [{dispatch, init_dispatch()}]} - ]), - [{port, Port}|Config]. - -end_per_group(Listener, _Config) -> - cowboy:stop_listener(Listener), - ok. - -%% Dispatch configuration. - -init_dispatch() -> - cowboy_router:compile([{"localhost", [ - {"/echo", autobahn_echo, []}]}]). - -%% autobahn cases - -run_tests(Config) -> - PrivDir = ?config(priv_dir, Config), - IndexFile = filename:join([PrivDir, "reports", "servers", "index.html"]), - ct:log("<h2><a href=\"~s\">Full Test Results Report</a></h2>~n", [IndexFile]), - BinPath = ?config(bin_path, Config), - Stdout = os:cmd(BinPath ++ " test"), - ct:log("~s~n", [Stdout]), - case string:str(Stdout, "AB-TESTS-TEST-OK") of - 0 -> erlang:error(failed); - _ -> ok - end, - {ok, IndexHTML} = file:read_file(IndexFile), - case length(binary:matches(IndexHTML, <<"case_failed">>)) > 2 of - true -> erlang:error(failed); - false -> ok - end. diff --git a/test/autobahn_SUITE_data/autobahn_echo.erl b/test/autobahn_SUITE_data/autobahn_echo.erl deleted file mode 100644 index 07f7fd9..0000000 --- a/test/autobahn_SUITE_data/autobahn_echo.erl +++ /dev/null @@ -1,26 +0,0 @@ -%% Feel free to use, reuse and abuse the code in this file. - --module(autobahn_echo). --behaviour(cowboy_websocket_handler). --export([init/3]). --export([websocket_init/3, websocket_handle/3, - websocket_info/3, websocket_terminate/3]). - -init(_Any, _Req, _Opts) -> - {upgrade, protocol, cowboy_websocket}. - -websocket_init(_TransportName, Req, _Opts) -> - {ok, Req, undefined}. - -websocket_handle({text, Data}, Req, State) -> - {reply, {text, Data}, Req, State}; -websocket_handle({binary, Data}, Req, State) -> - {reply, {binary, Data}, Req, State}; -websocket_handle(_Frame, Req, State) -> - {ok, Req, State}. - -websocket_info(_Info, Req, State) -> - {ok, Req, State}. - -websocket_terminate(_Reason, _Req, _State) -> - ok. diff --git a/test/autobahn_SUITE_data/test.py b/test/autobahn_SUITE_data/test.py deleted file mode 100755 index f142683..0000000 --- a/test/autobahn_SUITE_data/test.py +++ /dev/null @@ -1,73 +0,0 @@ -#!/usr/bin/env python -import os -import os.path -import sys -import subprocess - - -AB_TESTS_ENV = os.getenv("AB_TESTS_ENV") -AB_TESTS_PRIV = os.getenv("AB_TESTS_PRIV") - -VIRTUALENV_URL = 'https://raw.github.com/pypa/virtualenv/master/virtualenv.py' -VIRTUALENV_BIN = os.path.join(AB_TESTS_ENV, "virtualenv.py") -INSTALL_BIN = os.path.join(AB_TESTS_ENV, "bin", "easy_install") - - -def activate_env(env): - """ - See 'Using Virtualenv without bin/python' at http://www.virtualenv.org - """ - activate_this = os.path.join(env, 'bin', 'activate_this.py') - exec(compile(open(activate_this).read(), activate_this, 'exec'), - dict(__file__=activate_this)) - -def install_env(env): - """ - Install a new virtualenv at a path and also install the Autobahn package. - """ - os.makedirs(env) if not os.path.isdir(env) else None - subprocess.check_call(["curl", "-sS", VIRTUALENV_URL, "-o", VIRTUALENV_BIN]) - subprocess.check_call(["python", VIRTUALENV_BIN, env]) - activate_env(env) - subprocess.check_call([INSTALL_BIN, "http://pypi.python.org/packages/2.7/a/autobahntestsuite/autobahntestsuite-0.5.3-py2.7.egg"]) - -def client_config(): - """ - See comment on SUPPORTED_SPEC_VERSIONS in Autobahn/.../websocket.py - """ - base = { - 'options': {'failByDrop': False}, - 'enable-ssl': False, - 'servers': [{ - 'agent': 'Cowboy', - 'url': 'ws://localhost:33080/echo', - 'options': {'version': 18} # RFC6455 - }], - 'cases': ['*'], - 'exclude-cases': [] } - return base - -def run_test(env, config): - activate_env(env) - from twisted.python import log - from twisted.internet import reactor - from autobahntestsuite.fuzzing import FuzzingClientFactory - os.chdir(AB_TESTS_PRIV) - log.startLogging(sys.stdout) - fuzzer = FuzzingClientFactory(config) - return reactor.run() - - -def main(): - cmd = sys.argv[1] - if cmd == 'setup': - install_env(AB_TESTS_ENV) - print('AB-TESTS-SETUP-OK') - elif cmd == 'test': - run_test(AB_TESTS_ENV, client_config()) - print('AB-TESTS-TEST-OK') - else: - return 1 - -if __name__ == '__main__': - main() diff --git a/test/cowboy_ct_hook.erl b/test/cowboy_ct_hook.erl new file mode 100644 index 0000000..1586412 --- /dev/null +++ b/test/cowboy_ct_hook.erl @@ -0,0 +1,23 @@ +%% Copyright (c) 2014, Loïc Hoguin <[email protected]> +%% +%% Permission to use, copy, modify, and/or distribute this software for any +%% purpose with or without fee is hereby granted, provided that the above +%% copyright notice and this permission notice appear in all copies. +%% +%% THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +%% WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +%% MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +%% ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +%% WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +%% ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF +%% OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + +-module(cowboy_ct_hook). + +-export([init/2]). + +init(_, _) -> + cowboy_test:start([cowboy, gun]), + cowboy_test:make_certs(), + error_logger:add_report_handler(cowboy_error_h), + {ok, undefined}. diff --git a/test/cowboy_error_h.erl b/test/cowboy_error_h.erl new file mode 100644 index 0000000..b4ae78f --- /dev/null +++ b/test/cowboy_error_h.erl @@ -0,0 +1,145 @@ +%% Copyright (c) 2014, Loïc Hoguin <[email protected]> +%% +%% Permission to use, copy, modify, and/or distribute this software for any +%% purpose with or without fee is hereby granted, provided that the above +%% copyright notice and this permission notice appear in all copies. +%% +%% THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +%% WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +%% MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +%% ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +%% WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +%% ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF +%% OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + +-module(cowboy_error_h). +-behaviour(gen_event). + +%% Public interface. +-export([ignore/3]). + +%% gen_event. +-export([init/1]). +-export([handle_event/2]). +-export([handle_call/2]). +-export([handle_info/2]). +-export([terminate/2]). +-export([code_change/3]). + +%% Public interface. + +%% Ignore crashes from Pid occuring in M:F/A. +ignore(M, F, A) -> + gen_event:call(error_logger, ?MODULE, {expect, {self(), M, F, A}}). + +%% gen_event. + +init(_) -> + spawn(fun() -> error_logger:tty(false) end), + {ok, []}. + +%% Ignore supervisor and progress reports. +handle_event({info_report, _, {_, progress, _}}, State) -> + {ok, State}; +handle_event({info_report, _, {_, std_info, _}}, State) -> + {ok, State}; +handle_event({error_report, _, {_, supervisor_report, _}}, State) -> + {ok, State}; +%% Ignore gun retry failures. +handle_event({error_report, _, {_, crash_report, + [[{initial_call, {gun, init, _}}, _, _, + {error_info, {error, gone, _}}|_]|_]}}, + State) -> + {ok, State}; +%% Ignore emulator reports that are a duplicate of what Ranch gives us. +%% +%% The emulator always sends strings for errors, which makes it very +%% difficult to extract the information we need, hence the regexps. +handle_event(Event = {error, GL, {emulator, _, Msg}}, State) + when node(GL) =:= node() -> + Result = re:run(Msg, + "Error in process ([^\s]+).+? with exit value: " + ".+?{stacktrace,\\[{([^,]+),([^,]+),(.+)", + [{capture, all_but_first, list}]), + case Result of + nomatch -> + write_event(Event), + {ok, State}; + {match, [PidStr, MStr, FStr, Rest]} -> + A = case Rest of + "[]" ++ _ -> + 0; + "[" ++ Rest2 -> + count_args(Rest2, 1, 0); + _ -> + {match, [AStr]} = re:run(Rest, "([^,]+).+", + [{capture, all_but_first, list}]), + list_to_integer(AStr) + end, + Crash = {list_to_pid(PidStr), list_to_existing_atom(MStr), + list_to_existing_atom(FStr), A}, + case lists:member(Crash, State) of + true -> + {ok, lists:delete(Crash, State)}; + false -> + write_event(Event), + {ok, State} + end + end; +handle_event(Event = {error, GL, + {_, "Ranch listener" ++ _, [_, _, Pid, {[_, _, + {stacktrace, [{M, F, A, _}|_]}|_], _}]}}, + State) when node(GL) =:= node() -> + A2 = if is_list(A) -> length(A); true -> A end, + Crash = {Pid, M, F, A2}, + case lists:member(Crash, State) of + true -> + {ok, lists:delete(Crash, State)}; + false -> + write_event(Event), + {ok, State} + end; +handle_event(Event = {_, GL, _}, State) when node(GL) =:= node() -> + write_event(Event), + {ok, State}; +handle_event(_, State) -> + {ok, State}. + +handle_call({expect, Crash}, State) -> + {ok, ok, [Crash, Crash|State]}; +handle_call(_, State) -> + {ok, {error, bad_query}, State}. + +handle_info(_, State) -> + {ok, State}. + +terminate(_, _) -> + spawn(fun() -> error_logger:tty(true) end), + ok. + +code_change(_, State, _) -> + {ok, State}. + +%% Internal. + +write_event(Event) -> + error_logger_tty_h:write_event( + {erlang:universaltime(), Event}, + io). + +count_args("]" ++ _, N, 0) -> + N; +count_args("]" ++ Tail, N, Levels) -> + count_args(Tail, N, Levels - 1); +count_args("[" ++ Tail, N, Levels) -> + count_args(Tail, N, Levels + 1); +count_args("}" ++ Tail, N, Levels) -> + count_args(Tail, N, Levels - 1); +count_args("{" ++ Tail, N, Levels) -> + count_args(Tail, N, Levels + 1); +count_args("," ++ Tail, N, Levels = 0) -> + count_args(Tail, N + 1, Levels); +count_args("," ++ Tail, N, Levels) -> + count_args(Tail, N, Levels); +count_args([_|Tail], N, Levels) -> + count_args(Tail, N, Levels). diff --git a/test/cowboy_test.erl b/test/cowboy_test.erl new file mode 100644 index 0000000..f4a5706 --- /dev/null +++ b/test/cowboy_test.erl @@ -0,0 +1,200 @@ +%% Copyright (c) 2014, Loïc Hoguin <[email protected]> +%% +%% Permission to use, copy, modify, and/or distribute this software for any +%% purpose with or without fee is hereby granted, provided that the above +%% copyright notice and this permission notice appear in all copies. +%% +%% THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +%% WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +%% MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +%% ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +%% WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +%% ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF +%% OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + +-module(cowboy_test). +-compile(export_all). + +%% Start and stop applications and their dependencies. + +start(Apps) -> + _ = [do_start(App) || App <- Apps], + ok. + +do_start(App) -> + case application:start(App) of + ok -> + ok; + {error, {not_started, Dep}} -> + do_start(Dep), + do_start(App) + end. + +%% SSL certificate creation and safekeeping. + +make_certs() -> + {_, Cert, Key} = ct_helper:make_certs(), + CertOpts = [{cert, Cert}, {key, Key}], + Pid = spawn(fun() -> receive after infinity -> ok end end), + ?MODULE = ets:new(?MODULE, [ordered_set, public, named_table, + {heir, Pid, undefined}]), + ets:insert(?MODULE, {cert_opts, CertOpts}), + ok. + +get_certs() -> + ets:lookup_element(?MODULE, cert_opts, 2). + +%% Quick configuration value retrieval. + +config(Key, Config) -> + {_, Value} = lists:keyfind(Key, 1, Config), + Value. + +%% Test case description. + +doc(String) -> + ct:comment(String), + ct:log(String). + +%% List of all test cases in the suite. + +all(Suite) -> + lists:usort([F || {F, 1} <- Suite:module_info(exports), + F =/= module_info, + F =/= test, %% This is leftover from the eunit parse_transform... + F =/= all, + F =/= groups, + string:substr(atom_to_list(F), 1, 5) =/= "init_", + string:substr(atom_to_list(F), 1, 4) =/= "end_", + string:substr(atom_to_list(F), 1, 3) =/= "do_" + ]). + +%% Listeners initialization. + +init_http(Ref, ProtoOpts, Config) -> + {ok, _} = cowboy:start_http(Ref, 100, [{port, 0}], [ + {max_keepalive, 50}, + {timeout, 500} + |ProtoOpts]), + Port = ranch:get_port(Ref), + [{type, tcp}, {port, Port}, {opts, []}|Config]. + +init_https(Ref, ProtoOpts, Config) -> + Opts = get_certs(), + {ok, _} = cowboy:start_https(Ref, 100, Opts ++ [{port, 0}], [ + {max_keepalive, 50}, + {timeout, 500} + |ProtoOpts]), + Port = ranch:get_port(Ref), + [{type, ssl}, {port, Port}, {opts, Opts}|Config]. + +init_spdy(Ref, ProtoOpts, Config) -> + Opts = get_certs(), + {ok, _} = cowboy:start_spdy(Ref, 100, Opts ++ [{port, 0}], + ProtoOpts), + Port = ranch:get_port(Ref), + [{type, ssl}, {port, Port}, {opts, Opts}|Config]. + +%% Common group of listeners used by most suites. + +common_all() -> + [ + {group, http}, + {group, https}, + {group, spdy}, + {group, http_compress}, + {group, https_compress}, + {group, spdy_compress} + ]. + +common_groups(Tests) -> + [ + {http, [parallel], Tests}, + {https, [parallel], Tests}, + {spdy, [parallel], Tests}, + {http_compress, [parallel], Tests}, + {https_compress, [parallel], Tests}, + {spdy_compress, [parallel], Tests} + ]. + +init_common_groups(Name = http, Config, Mod) -> + init_http(Name, [ + {env, [{dispatch, Mod:init_dispatch(Config)}]} + ], Config); +init_common_groups(Name = https, Config, Mod) -> + init_https(Name, [ + {env, [{dispatch, Mod:init_dispatch(Config)}]} + ], Config); +init_common_groups(Name = spdy, Config, Mod) -> + init_spdy(Name, [ + {env, [{dispatch, Mod:init_dispatch(Config)}]} + ], Config); +init_common_groups(Name = http_compress, Config, Mod) -> + init_http(Name, [ + {env, [{dispatch, Mod:init_dispatch(Config)}]}, + {compress, true} + ], Config); +init_common_groups(Name = https_compress, Config, Mod) -> + init_https(Name, [ + {env, [{dispatch, Mod:init_dispatch(Config)}]}, + {compress, true} + ], Config); +init_common_groups(Name = spdy_compress, Config, Mod) -> + init_spdy(Name, [ + {env, [{dispatch, Mod:init_dispatch(Config)}]}, + {compress, true} + ], Config). + +%% Support functions for testing using Gun. + +gun_open(Config) -> + gun_open(Config, []). + +gun_open(Config, Opts) -> + {ok, ConnPid} = gun:open("localhost", config(port, Config), + [{retry, 0}, {type, config(type, Config)}|Opts]), + ConnPid. + +gun_monitor_open(Config) -> + gun_monitor_open(Config, []). + +gun_monitor_open(Config, Opts) -> + ConnPid = gun_open(Config, Opts), + {ConnPid, monitor(process, ConnPid)}. + +gun_is_gone(ConnPid, MRef) -> + receive {'DOWN', MRef, process, ConnPid, gone} -> ok + after 500 -> error(timeout) end. + +%% Support functions for testing using a raw socket. + +raw_open(Config) -> + Transport = case config(type, Config) of + tcp -> gen_tcp; + ssl -> ssl + end, + {_, Opts} = lists:keyfind(opts, 1, Config), + {ok, Socket} = Transport:connect("localhost", config(port, Config), + [binary, {active, false}, {packet, raw}, + {reuseaddr, true}, {nodelay, true}|Opts]), + {raw_client, Socket, Transport}. + +raw_send({raw_client, Socket, Transport}, Data) -> + Transport:send(Socket, Data). + +raw_recv_head({raw_client, Socket, Transport}) -> + {ok, Data} = Transport:recv(Socket, 0, 5000), + raw_recv_head(Socket, Transport, Data). + +raw_recv_head(Socket, Transport, Buffer) -> + case binary:match(Buffer, <<"\r\n\r\n">>) of + nomatch -> + {ok, Data} = Transport:recv(Socket, 0, 5000), + raw_recv_head(Socket, Transport, << Buffer/binary, Data/binary >>); + {_, _} -> + Buffer + end. + +raw_expect_recv({raw_client, Socket, Transport}, Expect) -> + {ok, Expect} = Transport:recv(Socket, iolist_size(Expect), 5000), + ok. diff --git a/test/eunit_SUITE.erl b/test/eunit_SUITE.erl index a460890..1d817c6 100644 --- a/test/eunit_SUITE.erl +++ b/test/eunit_SUITE.erl @@ -1,4 +1,4 @@ -%% Copyright (c) 2013, Loïc Hoguin <[email protected]> +%% Copyright (c) 2013-2014, Loïc Hoguin <[email protected]> %% %% Permission to use, copy, modify, and/or distribute this software for any %% purpose with or without fee is hereby granted, provided that the above @@ -13,16 +13,7 @@ %% OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -module(eunit_SUITE). - --include_lib("common_test/include/ct.hrl"). - -%% ct. --export([all/0]). - -%% Tests. --export([eunit/1]). - -%% ct. +-compile(export_all). all() -> [eunit]. diff --git a/test/handlers/long_polling_h.erl b/test/handlers/long_polling_h.erl new file mode 100644 index 0000000..21f1d4d --- /dev/null +++ b/test/handlers/long_polling_h.erl @@ -0,0 +1,27 @@ +%% This module implements a loop handler for long-polling. +%% It starts by sending itself a message after 200ms, +%% then sends another after that for a total of 3 messages. +%% When it receives the last message, it sends a 102 reply back. + +-module(long_polling_h). +-behaviour(cowboy_loop_handler). + +-export([init/3]). +-export([info/3]). +-export([terminate/3]). + +init(_, Req, _) -> + erlang:send_after(200, self(), timeout), + {loop, Req, 2, 5000, hibernate}. + +info(timeout, Req, 0) -> + {ok, Req2} = cowboy_req:reply(102, Req), + {ok, Req2, 0}; +info(timeout, Req, Count) -> + erlang:send_after(200, self(), timeout), + {loop, Req, Count - 1, hibernate}. + +terminate({normal, shutdown}, _, 0) -> + ok; +terminate({error, overflow}, _, _) -> + ok. diff --git a/test/handlers/loop_handler_body_h.erl b/test/handlers/loop_handler_body_h.erl new file mode 100644 index 0000000..db69b02 --- /dev/null +++ b/test/handlers/loop_handler_body_h.erl @@ -0,0 +1,24 @@ +%% This module implements a loop handler that reads +%% the request body after sending itself a message, +%% checks that its size is exactly 100000 bytes, +%% then sends a 200 reply back. + +-module(loop_handler_body_h). +-behaviour(cowboy_loop_handler). + +-export([init/3]). +-export([info/3]). +-export([terminate/3]). + +init(_, Req, _) -> + self() ! timeout, + {loop, Req, undefined, 5000, hibernate}. + +info(timeout, Req, State) -> + {ok, Body, Req2} = cowboy_req:body(Req), + 100000 = byte_size(Body), + {ok, Req3} = cowboy_req:reply(200, Req2), + {ok, Req3, State}. + +terminate({normal, shutdown}, _, _) -> + ok. diff --git a/test/handlers/loop_handler_timeout_h.erl b/test/handlers/loop_handler_timeout_h.erl new file mode 100644 index 0000000..1125046 --- /dev/null +++ b/test/handlers/loop_handler_timeout_h.erl @@ -0,0 +1,23 @@ +%% This module implements a loop handler that sends +%% itself a timeout that will intentionally arrive +%% too late, as it configures itself to only wait +%% 200ms before closing the connection in init/3. +%% This results in a 204 reply being sent back by Cowboy. + +-module(loop_handler_timeout_h). +-behaviour(cowboy_loop_handler). + +-export([init/3]). +-export([info/3]). +-export([terminate/3]). + +init(_, Req, _) -> + erlang:send_after(1000, self(), timeout), + {loop, Req, undefined, 200, hibernate}. + +info(timeout, Req, State) -> + {ok, Req2} = cowboy_req:reply(500, Req), + {ok, Req2, State}. + +terminate({normal, timeout}, _, _) -> + ok. diff --git a/test/http_SUITE.erl b/test/http_SUITE.erl index 13e7b0b..4e4c058 100644 --- a/test/http_SUITE.erl +++ b/test/http_SUITE.erl @@ -1,4 +1,4 @@ -%% Copyright (c) 2011-2013, Loïc Hoguin <[email protected]> +%% Copyright (c) 2011-2014, Loïc Hoguin <[email protected]> %% Copyright (c) 2011, Anthony Ramine <[email protected]> %% %% Permission to use, copy, modify, and/or distribute this software for any @@ -14,90 +14,17 @@ %% OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -module(http_SUITE). - --include_lib("common_test/include/ct.hrl"). - -%% ct. --export([all/0]). --export([groups/0]). --export([init_per_suite/1]). --export([end_per_suite/1]). --export([init_per_group/2]). --export([end_per_group/2]). - -%% Callbacks. --export([etag_gen/3]). --export([mimetypes_text_html/1]). - -%% Tests. --export([check_raw_status/1]). --export([check_status/1]). --export([chunked_response/1]). --export([echo_body/1]). --export([echo_body_max_length/1]). --export([echo_body_qs/1]). --export([echo_body_qs_max_length/1]). --export([error_chain_handle_after_reply/1]). --export([error_chain_handle_before_reply/1]). --export([error_handle_after_reply/1]). --export([error_init_after_reply/1]). --export([error_init_reply_handle_error/1]). --export([headers_dupe/1]). --export([http10_chunkless/1]). --export([http10_hostless/1]). --export([keepalive_max/1]). --export([keepalive_nl/1]). --export([keepalive_stream_loop/1]). --export([multipart/1]). --export([nc_rand/1]). --export([nc_zero/1]). --export([onrequest/1]). --export([onrequest_reply/1]). --export([onresponse_capitalize/1]). --export([onresponse_crash/1]). --export([onresponse_reply/1]). --export([parse_host/1]). --export([pipeline/1]). --export([pipeline_long_polling/1]). --export([rest_bad_accept/1]). --export([rest_bad_content_type/1]). --export([rest_expires/1]). --export([rest_keepalive/1]). --export([rest_keepalive_post/1]). --export([rest_missing_get_callbacks/1]). --export([rest_missing_put_callbacks/1]). --export([rest_nodelete/1]). --export([rest_options_default/1]). --export([rest_param_all/1]). --export([rest_patch/1]). --export([rest_post_charset/1]). --export([rest_postonly/1]). --export([rest_resource_etags/1]). --export([rest_resource_etags_if_none_match/1]). --export([set_env_dispatch/1]). --export([set_resp_body/1]). --export([set_resp_header/1]). --export([set_resp_overwrite/1]). --export([slowloris/1]). --export([slowloris2/1]). --export([static_attribute_etag/1]). --export([static_function_etag/1]). --export([static_mimetypes_function/1]). --export([static_specify_file/1]). --export([static_specify_file_catchall/1]). --export([static_test_file/1]). --export([static_test_file_css/1]). --export([stream_body_set_resp/1]). --export([stream_body_set_resp_close/1]). --export([stream_body_set_resp_chunked/1]). --export([stream_body_set_resp_chunked10/1]). --export([streamed_response/1]). --export([te_chunked/1]). --export([te_chunked_chopped/1]). --export([te_chunked_delayed/1]). --export([te_chunked_split_body/1]). --export([te_chunked_split_crlf/1]). --export([te_identity/1]). +-compile(export_all). + +-import(cowboy_test, [config/2]). +-import(cowboy_test, [gun_open/1]). +-import(cowboy_test, [gun_monitor_open/1]). +-import(cowboy_test, [gun_monitor_open/2]). +-import(cowboy_test, [gun_is_gone/2]). +-import(cowboy_test, [raw_open/1]). +-import(cowboy_test, [raw_send/2]). +-import(cowboy_test, [raw_recv_head/1]). +-import(cowboy_test, [raw_expect_recv/2]). %% ct. @@ -115,68 +42,10 @@ all() -> ]. groups() -> - Tests = [ - check_raw_status, - check_status, - chunked_response, - echo_body, - echo_body_max_length, - echo_body_qs, - echo_body_qs_max_length, - error_chain_handle_after_reply, - error_chain_handle_before_reply, - error_handle_after_reply, - error_init_after_reply, - error_init_reply_handle_error, - headers_dupe, - http10_chunkless, - http10_hostless, - keepalive_max, - keepalive_nl, - keepalive_stream_loop, - multipart, - nc_rand, - nc_zero, - pipeline, - pipeline_long_polling, - rest_bad_accept, - rest_bad_content_type, - rest_expires, - rest_keepalive, - rest_keepalive_post, - rest_missing_get_callbacks, - rest_missing_put_callbacks, - rest_nodelete, - rest_options_default, - rest_param_all, - rest_patch, - rest_post_charset, - rest_postonly, - rest_resource_etags, - rest_resource_etags_if_none_match, - set_resp_body, - set_resp_header, - set_resp_overwrite, - slowloris, - slowloris2, - static_attribute_etag, - static_function_etag, - static_mimetypes_function, - static_specify_file, - static_specify_file_catchall, - static_test_file, - static_test_file_css, - stream_body_set_resp, - stream_body_set_resp_close, - stream_body_set_resp_chunked, - stream_body_set_resp_chunked10, - streamed_response, - te_chunked, - te_chunked_chopped, - te_chunked_delayed, - te_chunked_split_body, - te_chunked_split_crlf, - te_identity + Tests = cowboy_test:all(?MODULE) -- [ + onrequest, onrequest_reply, onrequest_hook, + onresponse_crash, onresponse_reply, onresponse_capitalize, + parse_host, set_env_dispatch ], [ {http, [parallel], Tests}, @@ -203,152 +72,83 @@ groups() -> ]. init_per_suite(Config) -> - application:start(crypto), - application:start(cowlib), - application:start(ranch), - application:start(cowboy), - Dir = ?config(priv_dir, Config) ++ "/static", + Dir = config(priv_dir, Config) ++ "/static", ct_helper:create_static_dir(Dir), [{static_dir, Dir}|Config]. end_per_suite(Config) -> - Dir = ?config(static_dir, Config), - ct_helper:delete_static_dir(Dir), - application:stop(cowboy), - application:stop(ranch), - application:stop(cowlib), - application:stop(crypto), - ok. - -init_per_group(http, Config) -> - Transport = ranch_tcp, - {ok, _} = cowboy:start_http(http, 100, [{port, 0}], [ - {env, [{dispatch, init_dispatch(Config)}]}, - {max_keepalive, 50}, - {timeout, 500} - ]), - Port = ranch:get_port(http), - {ok, Client} = cowboy_client:init([]), - [{scheme, <<"http">>}, {port, Port}, {opts, []}, - {transport, Transport}, {client, Client}|Config]; -init_per_group(https, Config) -> - Transport = ranch_ssl, - {_, Cert, Key} = ct_helper:make_certs(), - Opts = [{cert, Cert}, {key, Key}], - application:start(asn1), - application:start(public_key), - application:start(ssl), - {ok, _} = cowboy:start_https(https, 100, Opts ++ [{port, 0}], [ - {env, [{dispatch, init_dispatch(Config)}]}, - {max_keepalive, 50}, - {timeout, 500} - ]), - Port = ranch:get_port(https), - {ok, Client} = cowboy_client:init(Opts), - [{scheme, <<"https">>}, {port, Port}, {opts, Opts}, - {transport, Transport}, {client, Client}|Config]; -init_per_group(http_compress, Config) -> - Transport = ranch_tcp, - {ok, _} = cowboy:start_http(http_compress, 100, [{port, 0}], [ - {compress, true}, + ct_helper:delete_static_dir(config(static_dir, Config)). + +init_per_group(Name = http, Config) -> + cowboy_test:init_http(Name, [ + {env, [{dispatch, init_dispatch(Config)}]} + ], Config); +init_per_group(Name = https, Config) -> + cowboy_test:init_https(Name, [ + {env, [{dispatch, init_dispatch(Config)}]} + ], Config); +init_per_group(Name = http_compress, Config) -> + cowboy_test:init_http(Name, [ {env, [{dispatch, init_dispatch(Config)}]}, - {max_keepalive, 50}, - {timeout, 500} - ]), - Port = ranch:get_port(http_compress), - {ok, Client} = cowboy_client:init([]), - [{scheme, <<"http">>}, {port, Port}, {opts, []}, - {transport, Transport}, {client, Client}|Config]; -init_per_group(https_compress, Config) -> - Transport = ranch_ssl, - {_, Cert, Key} = ct_helper:make_certs(), - Opts = [{cert, Cert}, {key, Key}], - application:start(asn1), - application:start(public_key), - application:start(ssl), - {ok, _} = cowboy:start_https(https_compress, 100, Opts ++ [{port, 0}], [ - {compress, true}, + {compress, true} + ], Config); +init_per_group(Name = https_compress, Config) -> + cowboy_test:init_https(Name, [ {env, [{dispatch, init_dispatch(Config)}]}, - {max_keepalive, 50}, - {timeout, 500} - ]), - Port = ranch:get_port(https_compress), - {ok, Client} = cowboy_client:init(Opts), - [{scheme, <<"https">>}, {port, Port}, {opts, Opts}, - {transport, Transport}, {client, Client}|Config]; + {compress, true} + ], Config); +%% Most, if not all of these, should be in separate test suites. init_per_group(onrequest, Config) -> - Transport = ranch_tcp, {ok, _} = cowboy:start_http(onrequest, 100, [{port, 0}], [ {env, [{dispatch, init_dispatch(Config)}]}, {max_keepalive, 50}, - {onrequest, fun onrequest_hook/1}, + {onrequest, fun do_onrequest_hook/1}, {timeout, 500} ]), Port = ranch:get_port(onrequest), - {ok, Client} = cowboy_client:init([]), - [{scheme, <<"http">>}, {port, Port}, {opts, []}, - {transport, Transport}, {client, Client}|Config]; + [{type, tcp}, {port, Port}, {opts, []}|Config]; init_per_group(onresponse, Config) -> - Transport = ranch_tcp, {ok, _} = cowboy:start_http(onresponse, 100, [{port, 0}], [ {env, [{dispatch, init_dispatch(Config)}]}, {max_keepalive, 50}, - {onresponse, fun onresponse_hook/4}, + {onresponse, fun do_onresponse_hook/4}, {timeout, 500} ]), Port = ranch:get_port(onresponse), - {ok, Client} = cowboy_client:init([]), - [{scheme, <<"http">>}, {port, Port}, {opts, []}, - {transport, Transport}, {client, Client}|Config]; + [{type, tcp}, {port, Port}, {opts, []}|Config]; init_per_group(onresponse_capitalize, Config) -> - Transport = ranch_tcp, {ok, _} = cowboy:start_http(onresponse_capitalize, 100, [{port, 0}], [ {env, [{dispatch, init_dispatch(Config)}]}, {max_keepalive, 50}, - {onresponse, fun onresponse_capitalize_hook/4}, + {onresponse, fun do_onresponse_capitalize_hook/4}, {timeout, 500} ]), Port = ranch:get_port(onresponse_capitalize), - {ok, Client} = cowboy_client:init([]), - [{scheme, <<"http">>}, {port, Port}, {opts, []}, - {transport, Transport}, {client, Client}|Config]; + [{type, tcp}, {port, Port}, {opts, []}|Config]; init_per_group(parse_host, Config) -> - Transport = ranch_tcp, Dispatch = cowboy_router:compile([ {'_', [ {"/req_attr", http_req_attr, []} ]} ]), - {ok, _} = cowboy:start_http(http, 100, [{port, 0}], [ + {ok, _} = cowboy:start_http(parse_host, 100, [{port, 0}], [ {env, [{dispatch, Dispatch}]}, {max_keepalive, 50}, {timeout, 500} ]), - Port = ranch:get_port(http), - {ok, Client} = cowboy_client:init([]), - [{scheme, <<"http">>}, {port, Port}, {opts, []}, - {transport, Transport}, {client, Client}|Config]; + Port = ranch:get_port(parse_host), + [{type, tcp}, {port, Port}, {opts, []}|Config]; init_per_group(set_env, Config) -> - Transport = ranch_tcp, {ok, _} = cowboy:start_http(set_env, 100, [{port, 0}], [ {env, [{dispatch, []}]}, {max_keepalive, 50}, {timeout, 500} ]), Port = ranch:get_port(set_env), - {ok, Client} = cowboy_client:init([]), - [{scheme, <<"http">>}, {port, Port}, {opts, []}, - {transport, Transport}, {client, Client}|Config]. - -end_per_group(Name, _) when Name =:= https; Name =:= https_compress -> - cowboy:stop_listener(Name), - application:stop(ssl), - application:stop(public_key), - application:stop(asn1), - ok; + [{type, tcp}, {port, Port}, {opts, []}|Config]. + end_per_group(Name, _) -> - cowboy:stop_listener(Name), - ok. + ok = cowboy:stop_listener(Name). %% Dispatch configuration. @@ -358,7 +158,6 @@ init_dispatch(Config) -> {"/chunked_response", http_chunked, []}, {"/streamed_response", http_streamed, []}, {"/init_shutdown", http_init_shutdown, []}, - {"/long_polling", http_long_polling, []}, {"/headers/dupe", http_handler, [{headers, [{<<"connection">>, <<"close">>}]}]}, {"/set_resp/header", http_set_resp, @@ -378,19 +177,20 @@ init_dispatch(Config) -> {reply, set_resp_chunked}, {body, [<<"stream_body">>, <<"_set_resp_chunked">>]}]}, {"/static/[...]", cowboy_static, - {dir, ?config(static_dir, Config)}}, + {dir, config(static_dir, Config)}}, {"/static_mimetypes_function/[...]", cowboy_static, - {dir, ?config(static_dir, Config), - [{mimetypes, ?MODULE, mimetypes_text_html}]}}, + {dir, config(static_dir, Config), + [{mimetypes, ?MODULE, do_mimetypes_text_html}]}}, {"/handler_errors", http_errors, []}, {"/static_attribute_etag/[...]", cowboy_static, - {dir, ?config(static_dir, Config)}}, + {dir, config(static_dir, Config)}}, {"/static_function_etag/[...]", cowboy_static, - {dir, ?config(static_dir, Config), - [{etag, ?MODULE, etag_gen}]}}, + {dir, config(static_dir, Config), + [{etag, ?MODULE, do_etag_gen}]}}, {"/static_specify_file/[...]", cowboy_static, - {file, ?config(static_dir, Config) ++ "/style.css"}}, + {file, config(static_dir, Config) ++ "/style.css"}}, {"/multipart", http_multipart, []}, + {"/multipart/large", http_multipart_stream, []}, {"/echo/body", http_echo_body, []}, {"/echo/body_qs", http_body_qs, []}, {"/param_all", rest_param_all, []}, @@ -408,59 +208,36 @@ init_dispatch(Config) -> {"/resetags", rest_resource_etags, []}, {"/rest_expires", rest_expires, []}, {"/rest_empty_resource", rest_empty_resource, []}, - {"/loop_recv", http_loop_recv, []}, {"/loop_stream_recv", http_loop_stream_recv, []}, - {"/loop_timeout", http_loop_timeout, []}, {"/", http_handler, []} ]} ]). -etag_gen(_, _, _) -> +%% Callbacks. + +do_etag_gen(_, _, _) -> {strong, <<"etag">>}. -mimetypes_text_html(_) -> +do_mimetypes_text_html(_) -> <<"text/html">>. %% Convenience functions. -quick_raw(Data, Config) -> - Client = ?config(client, Config), - Transport = ?config(transport, Config), - {ok, Client2} = cowboy_client:connect( - Transport, "localhost", ?config(port, Config), Client), - {ok, Client3} = cowboy_client:raw_request(Data, Client2), - case cowboy_client:response(Client3) of - {ok, Status, _, _} -> Status; - {error, _} -> closed +do_raw(Data, Config) -> + Client = raw_open(Config), + ok = raw_send(Client, Data), + case catch raw_recv_head(Client) of + {'EXIT', _} -> closed; + Resp -> element(2, cow_http:parse_status_line(Resp)) end. -build_url(Path, Config) -> - {scheme, Scheme} = lists:keyfind(scheme, 1, Config), - {port, Port} = lists:keyfind(port, 1, Config), - PortBin = list_to_binary(integer_to_list(Port)), - PathBin = list_to_binary(Path), - << Scheme/binary, "://localhost:", PortBin/binary, PathBin/binary >>. - -quick_get(URL, Config) -> - Client = ?config(client, Config), - {ok, Client2} = cowboy_client:request(<<"GET">>, - build_url(URL, Config), Client), - {ok, Status, _, _} = cowboy_client:response(Client2), +do_get(Path, Config) -> + ConnPid = gun_open(Config), + Ref = gun:get(ConnPid, Path), + {response, _, Status, _} = gun:await(ConnPid, Ref), + gun:close(ConnPid), Status. -body_to_chunks(_, <<>>, Acc) -> - lists:reverse([<<"0\r\n\r\n">>|Acc]); -body_to_chunks(ChunkSize, Body, Acc) -> - BodySize = byte_size(Body), - ChunkSize2 = case BodySize < ChunkSize of - true -> BodySize; - false -> ChunkSize - end, - << Chunk:ChunkSize2/binary, Rest/binary >> = Body, - ChunkSizeBin = list_to_binary(integer_to_list(ChunkSize2, 16)), - body_to_chunks(ChunkSize, Rest, - [<< ChunkSizeBin/binary, "\r\n", Chunk/binary, "\r\n" >>|Acc]). - %% Tests. check_raw_status(Config) -> @@ -486,14 +263,10 @@ The document has moved <A HREF=\"http://www.google.co.il/\">here</A>. </BODY></HTML>", Tests = [ - {102, <<"GET /long_polling HTTP/1.1\r\nHost: localhost\r\n" - "Content-Length: 5000\r\n\r\n", 0:5000/unit:8 >>}, {200, ["GET / HTTP/1.0\r\nHost: localhost\r\n" "Set-Cookie: ", HugeCookie, "\r\n\r\n"]}, {200, "\r\n\r\n\r\n\r\n\r\nGET / HTTP/1.1\r\nHost: localhost\r\n\r\n"}, {200, "GET http://proxy/ HTTP/1.1\r\nHost: localhost\r\n\r\n"}, - {200, <<"POST /loop_recv HTTP/1.1\r\nHost: localhost\r\n" - "Content-Length: 100000\r\n\r\n", 0:100000/unit:8 >>}, {400, "\n"}, {400, "Garbage\r\n\r\n"}, {400, "\r\n\r\n\r\n\r\n\r\n\r\n"}, @@ -507,8 +280,6 @@ The document has moved {408, "GET / HTTP/1.1\r\nHost: localhost\r\n\r"}, {414, Huge}, {400, "GET / HTTP/1.1\r\n" ++ Huge}, - {500, <<"GET /long_polling HTTP/1.1\r\nHost: localhost\r\n" - "Content-Length: 100000\r\n\r\n", 0:100000/unit:8 >>}, {505, "GET / HTTP/1.2\r\nHost: localhost\r\n\r\n"}, {closed, ""}, {closed, "\r\n"}, @@ -516,17 +287,15 @@ The document has moved {closed, "GET / HTTP/1.1"} ], _ = [{Status, Packet} = begin - Ret = quick_raw(Packet, Config), + Ret = do_raw(Packet, Config), {Ret, Packet} end || {Status, Packet} <- Tests], ok. check_status(Config) -> Tests = [ - {102, "/long_polling"}, {200, "/"}, {200, "/simple"}, - {204, "/loop_timeout"}, {400, "/static/%2f"}, {400, "/static/%2e"}, {400, "/static/%2e%2e"}, @@ -540,237 +309,197 @@ check_status(Config) -> {666, "/init_shutdown"} ], _ = [{Status, URL} = begin - Ret = quick_get(URL, Config), + Ret = do_get(URL, Config), {Ret, URL} end || {Status, URL} <- Tests]. chunked_response(Config) -> - Client = ?config(client, Config), - {ok, Client2} = cowboy_client:request(<<"GET">>, - build_url("/chunked_response", Config), Client), - {ok, 200, Headers, Client3} = cowboy_client:response(Client2), + ConnPid = gun_open(Config), + Ref = gun:get(ConnPid, "/chunked_response"), + {response, nofin, 200, Headers} = gun:await(ConnPid, Ref), true = lists:keymember(<<"transfer-encoding">>, 1, Headers), - {ok, Transport, Socket} = cowboy_client:transport(Client3), - {ok, <<"11\r\nchunked_handler\r\n\r\nB\r\nworks fine!\r\n0\r\n\r\n">>} - = Transport:recv(Socket, 44, 1000), - {error, closed} = cowboy_client:response(Client3). + {ok, <<"chunked_handler\r\nworks fine!">>} = gun:await_body(ConnPid, Ref), + ok. %% Check if sending requests whose size is around the MTU breaks something. echo_body(Config) -> - Client = ?config(client, Config), MTU = ct_helper:get_loopback_mtu(), _ = [begin Body = list_to_binary(lists:duplicate(Size, $a)), - {ok, Client2} = cowboy_client:request(<<"POST">>, - build_url("/echo/body", Config), - [{<<"connection">>, <<"close">>}], - Body, Client), - {ok, 200, _, Client3} = cowboy_client:response(Client2), - {ok, Body, _} = cowboy_client:response_body(Client3) + ConnPid = gun_open(Config), + Ref = gun:post(ConnPid, "/echo/body", [], Body), + {response, nofin, 200, _} = gun:await(ConnPid, Ref), + {ok, Body} = gun:await_body(ConnPid, Ref) end || Size <- lists:seq(MTU - 500, MTU)], ok. %% Check if sending request whose size is bigger than 1000000 bytes causes 413 echo_body_max_length(Config) -> - Client = ?config(client, Config), - Body = <<$a:8000008>>, - {ok, Client2} = cowboy_client:request(<<"POST">>, - build_url("/echo/body", Config), - [{<<"connection">>, <<"close">>}], - Body, Client), - {ok, 413, _, _} = cowboy_client:response(Client2). + ConnPid = gun_open(Config), + Ref = gun:post(ConnPid, "/echo/body", [], << 0:8000008 >>), + {response, nofin, 413, _} = gun:await(ConnPid, Ref), + ok. % check if body_qs echo's back results echo_body_qs(Config) -> - Client = ?config(client, Config), - Body = <<"echo=67890">>, - {ok, Client2} = cowboy_client:request(<<"POST">>, - build_url("/echo/body_qs", Config), - [{<<"connection">>, <<"close">>}], - Body, Client), - {ok, 200, _, Client3} = cowboy_client:response(Client2), - {ok, <<"67890">>, _} = cowboy_client:response_body(Client3). - -%% Check if sending request whose size is bigger 16000 bytes causes 413 + ConnPid = gun_open(Config), + Ref = gun:post(ConnPid, "/echo/body_qs", [], <<"echo=67890">>), + {response, nofin, 200, _} = gun:await(ConnPid, Ref), + {ok, <<"67890">>} = gun:await_body(ConnPid, Ref), + ok. + echo_body_qs_max_length(Config) -> - Client = ?config(client, Config), - DefaultMaxBodyQsLength = 16000, - % subtract "echo=" minus 1 byte from max to hit the limit - Bits = (DefaultMaxBodyQsLength - 4) * 8, - AppendedBody = <<$a:Bits>>, - Body = <<"echo=", AppendedBody/binary>>, - {ok, Client2} = cowboy_client:request(<<"POST">>, - build_url("/echo/body_qs", Config), - [{<<"connection">>, <<"close">>}], - Body, Client), - {ok, 413, _, _} = cowboy_client:response(Client2). + ConnPid = gun_open(Config), + Ref = gun:post(ConnPid, "/echo/body_qs", [], << "echo=", 0:15996/unit:8 >>), + {response, nofin, 413, _} = gun:await(ConnPid, Ref), + ok. error_chain_handle_after_reply(Config) -> - Client = ?config(client, Config), - {ok, Client2} = cowboy_client:request(<<"GET">>, - build_url("/", Config), Client), - {ok, Client3} = cowboy_client:request(<<"GET">>, - build_url("/handler_errors?case=handle_after_reply", Config), Client2), - {ok, 200, _, Client4} = cowboy_client:response(Client3), - {ok, 200, _, Client5} = cowboy_client:response(Client4), - {error, closed} = cowboy_client:response(Client5). + {ConnPid, MRef} = gun_monitor_open(Config), + Ref1 = gun:get(ConnPid, "/"), + Ref2 = gun:get(ConnPid, "/handler_errors?case=handle_after_reply"), + {response, nofin, 200, _} = gun:await(ConnPid, Ref1, MRef), + {response, nofin, 200, _} = gun:await(ConnPid, Ref2, MRef), + gun_is_gone(ConnPid, MRef). error_chain_handle_before_reply(Config) -> - Client = ?config(client, Config), - {ok, Client2} = cowboy_client:request(<<"GET">>, - build_url("/", Config), Client), - {ok, Client3} = cowboy_client:request(<<"GET">>, - build_url("/handler_errors?case=handle_before_reply", Config), Client2), - {ok, 200, _, Client4} = cowboy_client:response(Client3), - {ok, 500, _, Client5} = cowboy_client:response(Client4), - {error, closed} = cowboy_client:response(Client5). + {ConnPid, MRef} = gun_monitor_open(Config), + Ref1 = gun:get(ConnPid, "/"), + Ref2 = gun:get(ConnPid, "/handler_errors?case=handle_before_reply"), + {response, nofin, 200, _} = gun:await(ConnPid, Ref1, MRef), + {response, fin, 500, _} = gun:await(ConnPid, Ref2, MRef), + gun_is_gone(ConnPid, MRef). error_handle_after_reply(Config) -> - Client = ?config(client, Config), - {ok, Client2} = cowboy_client:request(<<"GET">>, - build_url("/handler_errors?case=handle_after_reply", Config), Client), - {ok, 200, _, Client3} = cowboy_client:response(Client2), - {error, closed} = cowboy_client:response(Client3). + {ConnPid, MRef} = gun_monitor_open(Config), + Ref = gun:get(ConnPid, "/handler_errors?case=handle_after_reply"), + {response, nofin, 200, _} = gun:await(ConnPid, Ref, MRef), + gun_is_gone(ConnPid, MRef). error_init_after_reply(Config) -> - Client = ?config(client, Config), - {ok, Client2} = cowboy_client:request(<<"GET">>, - build_url("/handler_errors?case=init_after_reply", Config), Client), - {ok, 200, _, Client3} = cowboy_client:response(Client2), - {error, closed} = cowboy_client:response(Client3). + {ConnPid, MRef} = gun_monitor_open(Config), + Ref = gun:get(ConnPid, "/handler_errors?case=init_after_reply"), + {response, nofin, 200, _} = gun:await(ConnPid, Ref, MRef), + gun_is_gone(ConnPid, MRef). error_init_reply_handle_error(Config) -> - Client = ?config(client, Config), - {ok, Client2} = cowboy_client:request(<<"GET">>, - build_url("/handler_errors?case=init_reply_handle_error", Config), Client), - {ok, 200, _, Client3} = cowboy_client:response(Client2), - {error, closed} = cowboy_client:response(Client3). + {ConnPid, MRef} = gun_monitor_open(Config), + Ref = gun:get(ConnPid, "/handler_errors?case=init_reply_handle_error"), + {response, nofin, 200, _} = gun:await(ConnPid, Ref, MRef), + gun_is_gone(ConnPid, MRef). headers_dupe(Config) -> - Client = ?config(client, Config), - {ok, Client2} = cowboy_client:request(<<"GET">>, - build_url("/headers/dupe", Config), Client), - {ok, 200, Headers, Client3} = cowboy_client:response(Client2), - {<<"connection">>, <<"close">>} - = lists:keyfind(<<"connection">>, 1, Headers), - Connections = [H || H = {Name, _} <- Headers, Name =:= <<"connection">>], - 1 = length(Connections), - {error, closed} = cowboy_client:response(Client3). + {ConnPid, MRef} = gun_monitor_open(Config), + Ref = gun:get(ConnPid, "/headers/dupe"), + {response, nofin, 200, Headers} = gun:await(ConnPid, Ref, MRef), + %% Ensure that only one connection header was received. + [<<"close">>] = [V || {Name, V} <- Headers, Name =:= <<"connection">>], + gun_is_gone(ConnPid, MRef). http10_chunkless(Config) -> - Client = ?config(client, Config), - Transport = ?config(transport, Config), - {ok, Client2} = cowboy_client:connect( - Transport, "localhost", ?config(port, Config), Client), - Data = "GET /chunked_response HTTP/1.0\r\nHost: localhost\r\n\r\n", - {ok, Client3} = cowboy_client:raw_request(Data, Client2), - {ok, 200, Headers, Client4} = cowboy_client:response(Client3), + {ConnPid, MRef} = gun_monitor_open(Config, [{http, [{version, 'HTTP/1.0'}]}]), + Ref = gun:get(ConnPid, "/chunked_response"), + {response, nofin, 200, Headers} = gun:await(ConnPid, Ref, MRef), false = lists:keyfind(<<"transfer-encoding">>, 1, Headers), - %% Hack: we just try to get 28 bytes and compare. - {ok, Transport, Socket} = cowboy_client:transport(Client4), - Buffer = element(7, Client4), - Buffer2 = case Transport:recv(Socket, 28 - byte_size(Buffer), 1000) of - {ok, Recv} -> << Buffer/binary, Recv/binary >>; - _ -> Buffer - end, - <<"chunked_handler\r\nworks fine!">> = Buffer2. + {ok, <<"chunked_handler\r\nworks fine!">>} = gun:await_body(ConnPid, Ref, MRef), + gun_is_gone(ConnPid, MRef). http10_hostless(Config) -> - Port10 = ?config(port, Config) + 10, - Name = list_to_atom("http10_hostless_" ++ integer_to_list(Port10)), - ranch:start_listener(Name, 5, - ?config(transport, Config), ?config(opts, Config) ++ [{port, Port10}], + Name = http10_hostless, + Port10 = config(port, Config) + 10, + Transport = case config(type, Config) of + tcp -> ranch_tcp; + ssl -> ranch_ssl + end, + ranch:start_listener(Name, 5, Transport, + config(opts, Config) ++ [{port, Port10}], cowboy_protocol, [ {env, [{dispatch, cowboy_router:compile([ {'_', [{"/http1.0/hostless", http_handler, []}]}])}]}, {max_keepalive, 50}, {timeout, 500}] ), - 200 = quick_raw("GET /http1.0/hostless HTTP/1.0\r\n\r\n", + 200 = do_raw("GET /http1.0/hostless HTTP/1.0\r\n\r\n", [{port, Port10}|Config]), - cowboy:stop_listener(http10). + cowboy:stop_listener(http10_hostless). keepalive_max(Config) -> - Client = ?config(client, Config), - URL = build_url("/", Config), - ok = keepalive_max_loop(Client, URL, 50). - -keepalive_max_loop(Client, _, 0) -> - {error, closed} = cowboy_client:response(Client), - ok; -keepalive_max_loop(Client, URL, N) -> - Headers = [{<<"connection">>, <<"keep-alive">>}], - {ok, Client2} = cowboy_client:request(<<"GET">>, URL, Headers, Client), - {ok, 200, RespHeaders, Client3} = cowboy_client:response(Client2), - Expected = case N of - 1 -> <<"close">>; - N -> <<"keep-alive">> - end, - {<<"connection">>, Expected} - = lists:keyfind(<<"connection">>, 1, RespHeaders), - keepalive_max_loop(Client3, URL, N - 1). + {ConnPid, MRef} = gun_monitor_open(Config), + Refs = [gun:get(ConnPid, "/", [{<<"connection">>, <<"keep-alive">>}]) + || _ <- lists:seq(1, 49)], + CloseRef = gun:get(ConnPid, "/", [{<<"connection">>, <<"keep-alive">>}]), + _ = [begin + {response, nofin, 200, Headers} = gun:await(ConnPid, Ref, MRef), + {_, <<"keep-alive">>} = lists:keyfind(<<"connection">>, 1, Headers) + end || Ref <- Refs], + {response, nofin, 200, Headers} = gun:await(ConnPid, CloseRef, MRef), + {_, <<"close">>} = lists:keyfind(<<"connection">>, 1, Headers), + gun_is_gone(ConnPid, MRef). keepalive_nl(Config) -> - Client = ?config(client, Config), - URL = build_url("/", Config), - ok = keepalive_nl_loop(Client, URL, 10). - -keepalive_nl_loop(Client, _, 0) -> - {error, closed} = cowboy_client:response(Client), - ok; -keepalive_nl_loop(Client, URL, N) -> - Headers = [{<<"connection">>, <<"keep-alive">>}], - {ok, Client2} = cowboy_client:request(<<"GET">>, URL, Headers, Client), - {ok, 200, RespHeaders, Client3} = cowboy_client:response(Client2), - {<<"connection">>, <<"keep-alive">>} - = lists:keyfind(<<"connection">>, 1, RespHeaders), - {ok, Transport, Socket} = cowboy_client:transport(Client2), - ok = Transport:send(Socket, <<"\r\n">>), %% empty line - keepalive_nl_loop(Client3, URL, N - 1). + ConnPid = gun_open(Config), + Refs = [begin + Ref = gun:get(ConnPid, "/", [{<<"connection">>, <<"keep-alive">>}]), + gun:dbg_send_raw(ConnPid, <<"\r\n">>), + Ref + end || _ <- lists:seq(1, 10)], + _ = [begin + {response, nofin, 200, Headers} = gun:await(ConnPid, Ref), + {_, <<"keep-alive">>} = lists:keyfind(<<"connection">>, 1, Headers) + end || Ref <- Refs], + ok. keepalive_stream_loop(Config) -> - Client = ?config(client, Config), - Transport = ?config(transport, Config), - {ok, Client2} = cowboy_client:connect( - Transport, "localhost", ?config(port, Config), Client), - keepalive_stream_loop(Client2, 10). - -keepalive_stream_loop(Client, 0) -> - {error, closed} = cowboy_client:response(Client), - ok; -keepalive_stream_loop(Client, N) -> - {ok, _} = cowboy_client:raw_request("POST /loop_stream_recv HTTP/1.1\r\n" - "Host: localhost\r\n" - "Connection: keepalive\r\n" - "Transfer-Encoding: chunked\r\n\r\n", Client), - _ = [{ok, _} = cowboy_client:raw_request(<<"4\r\n",Id:32,"\r\n">>, Client) || - Id <- lists:seq(1, 250)], - {ok, _} = cowboy_client:raw_request(<<"0\r\n\r\n">>, Client), - {ok, 200, _, _} = cowboy_client:response(Client), - keepalive_stream_loop(Client, N-1). + ConnPid = gun_open(Config), + Refs = [begin + Ref = gun:post(ConnPid, "/loop_stream_recv", + [{<<"transfer-encoding">>, <<"chunked">>}]), + _ = [gun:data(ConnPid, Ref, nofin, << ID:32 >>) + || ID <- lists:seq(1, 250)], + gun:data(ConnPid, Ref, fin, <<>>), + Ref + end || _ <- lists:seq(1, 10)], + _ = [begin + {response, fin, 200, _} = gun:await(ConnPid, Ref) + end || Ref <- Refs], + ok. multipart(Config) -> - Client = ?config(client, Config), + ConnPid = gun_open(Config), Body = << "This is a preamble." "\r\n--OHai\r\nX-Name:answer\r\n\r\n42" "\r\n--OHai\r\nServer:Cowboy\r\n\r\nIt rocks!\r\n" - "\r\n--OHai--" - "This is an epiloque." + "\r\n--OHai--\r\n" + "This is an epilogue." >>, - {ok, Client2} = cowboy_client:request(<<"POST">>, - build_url("/multipart", Config), + Ref = gun:post(ConnPid, "/multipart", [{<<"content-type">>, <<"multipart/x-makes-no-sense; boundary=OHai">>}], - Body, Client), - {ok, 200, _, Client3} = cowboy_client:response(Client2), - {ok, RespBody, _} = cowboy_client:response_body(Client3), + Body), + {response, nofin, 200, _} = gun:await(ConnPid, Ref), + {ok, RespBody} = gun:await_body(ConnPid, Ref), Parts = binary_to_term(RespBody), Parts = [ {[{<<"x-name">>, <<"answer">>}], <<"42">>}, {[{<<"server">>, <<"Cowboy">>}], <<"It rocks!\r\n">>} - ]. + ], + ok. + +multipart_large(Config) -> + ConnPid = gun_open(Config), + Boundary = "----------", + Big = << 0:9000000/unit:8 >>, + Bigger = << 0:9999999/unit:8 >>, + Body = ["--", Boundary, "\r\ncontent-length: 9000000\r\n\r\n", Big, "\r\n", + "--", Boundary, "\r\ncontent-length: 9999999\r\n\r\n", Bigger, "\r\n", + "--", Boundary, "--\r\n"], + Ref = gun:post(ConnPid, "/multipart/large", + [{<<"content-type">>, ["multipart/x-large; boundary=", Boundary]}], + Body), + {response, fin, 200, _} = gun:await(ConnPid, Ref), + ok. -nc_reqs(Config, Input) -> +do_nc(Config, Input) -> Cat = os:find_executable("cat"), Nc = os:find_executable("nc"), case {Cat, Nc} of @@ -780,37 +509,36 @@ nc_reqs(Config, Input) -> {skip, {notfound, nc}}; _Good -> %% Throw garbage at the server then check if it's still up. - {port, Port} = lists:keyfind(port, 1, Config), - StrPort = integer_to_list(Port), + StrPort = integer_to_list(config(port, Config)), [os:cmd("cat " ++ Input ++ " | nc localhost " ++ StrPort) || _ <- lists:seq(1, 100)], - 200 = quick_get("/", Config) + 200 = do_get("/", Config) end. nc_rand(Config) -> - nc_reqs(Config, "/dev/urandom"). + do_nc(Config, "/dev/urandom"). nc_zero(Config) -> - nc_reqs(Config, "/dev/zero"). + do_nc(Config, "/dev/zero"). onrequest(Config) -> - Client = ?config(client, Config), - {ok, Client2} = cowboy_client:request(<<"GET">>, - build_url("/", Config), Client), - {ok, 200, Headers, Client3} = cowboy_client:response(Client2), + ConnPid = gun_open(Config), + Ref = gun:get(ConnPid, "/"), + {response, nofin, 200, Headers} = gun:await(ConnPid, Ref), {<<"server">>, <<"Serenity">>} = lists:keyfind(<<"server">>, 1, Headers), - {ok, <<"http_handler">>, _} = cowboy_client:response_body(Client3). + {ok, <<"http_handler">>} = gun:await_body(ConnPid, Ref), + ok. onrequest_reply(Config) -> - Client = ?config(client, Config), - {ok, Client2} = cowboy_client:request(<<"GET">>, - build_url("/?reply=1", Config), Client), - {ok, 200, Headers, Client3} = cowboy_client:response(Client2), + ConnPid = gun_open(Config), + Ref = gun:get(ConnPid, "/?reply=1"), + {response, nofin, 200, Headers} = gun:await(ConnPid, Ref), {<<"server">>, <<"Cowboy">>} = lists:keyfind(<<"server">>, 1, Headers), - {ok, <<"replied!">>, _} = cowboy_client:response_body(Client3). + {ok, <<"replied!">>} = gun:await_body(ConnPid, Ref), + ok. %% Hook for the above onrequest tests. -onrequest_hook(Req) -> +do_onrequest_hook(Req) -> case cowboy_req:qs_val(<<"reply">>, Req) of {undefined, Req2} -> cowboy_req:set_resp_header(<<"server">>, <<"Serenity">>, Req2); @@ -821,229 +549,172 @@ onrequest_hook(Req) -> end. onresponse_capitalize(Config) -> - Client = ?config(client, Config), - {ok, Client2} = cowboy_client:request(<<"GET">>, - build_url("/", Config), Client), - {ok, Transport, Socket} = cowboy_client:transport(Client2), - {ok, Data} = Transport:recv(Socket, 0, 1000), - false = nomatch =:= binary:match(Data, <<"Content-Length">>). + Client = raw_open(Config), + ok = raw_send(Client, "GET / HTTP/1.1\r\nHost: localhost\r\n\r\n"), + Data = raw_recv_head(Client), + false = nomatch =:= binary:match(Data, <<"Content-Length">>), + ok. %% Hook for the above onresponse_capitalize test. -onresponse_capitalize_hook(Status, Headers, Body, Req) -> +do_onresponse_capitalize_hook(Status, Headers, Body, Req) -> Headers2 = [{cowboy_bstr:capitalize_token(N), V} || {N, V} <- Headers], {ok, Req2} = cowboy_req:reply(Status, Headers2, Body, Req), Req2. onresponse_crash(Config) -> - Client = ?config(client, Config), - {ok, Client2} = cowboy_client:request(<<"GET">>, - build_url("/handler_errors?case=init_before_reply", Config), Client), - {ok, 777, Headers, _} = cowboy_client:response(Client2), + ConnPid = gun_open(Config), + Ref = gun:get(ConnPid, "/handler_errors?case=init_before_reply"), + {response, fin, 777, Headers} = gun:await(ConnPid, Ref), {<<"x-hook">>, <<"onresponse">>} = lists:keyfind(<<"x-hook">>, 1, Headers). onresponse_reply(Config) -> - Client = ?config(client, Config), - {ok, Client2} = cowboy_client:request(<<"GET">>, - build_url("/", Config), Client), - {ok, 777, Headers, Client3} = cowboy_client:response(Client2), + ConnPid = gun_open(Config), + Ref = gun:get(ConnPid, "/"), + {response, nofin, 777, Headers} = gun:await(ConnPid, Ref), {<<"x-hook">>, <<"onresponse">>} = lists:keyfind(<<"x-hook">>, 1, Headers), - %% Make sure we don't get the body initially sent. - {error, closed} = cowboy_client:response_body(Client3). + ok. %% Hook for the above onresponse tests. -onresponse_hook(_, Headers, _, Req) -> +do_onresponse_hook(_, Headers, _, Req) -> {ok, Req2} = cowboy_req:reply( <<"777 Lucky">>, [{<<"x-hook">>, <<"onresponse">>}|Headers], Req), Req2. parse_host(Config) -> + ConnPid = gun_open(Config), Tests = [ - {<<"example.org\n8080">>, <<"example.org:8080">>}, - {<<"example.org\n80">>, <<"example.org">>}, - {<<"192.0.2.1\n8080">>, <<"192.0.2.1:8080">>}, - {<<"192.0.2.1\n80">>, <<"192.0.2.1">>}, - {<<"[2001:db8::1]\n8080">>, <<"[2001:db8::1]:8080">>}, - {<<"[2001:db8::1]\n80">>, <<"[2001:db8::1]">>}, - {<<"[::ffff:192.0.2.1]\n8080">>, <<"[::ffff:192.0.2.1]:8080">>}, - {<<"[::ffff:192.0.2.1]\n80">>, <<"[::ffff:192.0.2.1]">>} + {<<"example.org:8080">>, <<"example.org\n8080">>}, + {<<"example.org">>, <<"example.org\n80">>}, + {<<"192.0.2.1:8080">>, <<"192.0.2.1\n8080">>}, + {<<"192.0.2.1">>, <<"192.0.2.1\n80">>}, + {<<"[2001:db8::1]:8080">>, <<"[2001:db8::1]\n8080">>}, + {<<"[2001:db8::1]">>, <<"[2001:db8::1]\n80">>}, + {<<"[::ffff:192.0.2.1]:8080">>, <<"[::ffff:192.0.2.1]\n8080">>}, + {<<"[::ffff:192.0.2.1]">>, <<"[::ffff:192.0.2.1]\n80">>} ], [begin - Client = ?config(client, Config), - {ok, Client2} = cowboy_client:request(<<"GET">>, - build_url("/req_attr?attr=host_and_port", Config), - [{<<"host">>, Host}], - Client), - {ok, 200, _, Client3} = cowboy_client:response(Client2), - {ok, Value, Client4} = cowboy_client:response_body(Client3), - {error, closed} = cowboy_client:response(Client4), - Value - end || {Value, Host} <- Tests]. + Ref = gun:get(ConnPid, "/req_attr?attr=host_and_port", + [{<<"host">>, Host}]), + {response, nofin, 200, _} = gun:await(ConnPid, Ref), + {ok, Body} = gun:await_body(ConnPid, Ref) + end || {Host, Body} <- Tests], + ok. pipeline(Config) -> - Client = ?config(client, Config), - {ok, Client2} = cowboy_client:request(<<"GET">>, - build_url("/", Config), Client), - {ok, Client3} = cowboy_client:request(<<"GET">>, - build_url("/", Config), Client2), - {ok, Client4} = cowboy_client:request(<<"GET">>, - build_url("/", Config), Client3), - {ok, Client5} = cowboy_client:request(<<"GET">>, - build_url("/", Config), Client4), - {ok, Client6} = cowboy_client:request(<<"GET">>, - build_url("/", Config), [{<<"connection">>, <<"close">>}], Client5), - {ok, 200, _, Client7} = cowboy_client:response(Client6), - {ok, 200, _, Client8} = cowboy_client:response(Client7), - {ok, 200, _, Client9} = cowboy_client:response(Client8), - {ok, 200, _, Client10} = cowboy_client:response(Client9), - {ok, 200, _, Client11} = cowboy_client:response(Client10), - {error, closed} = cowboy_client:response(Client11). - -pipeline_long_polling(Config) -> - Client = ?config(client, Config), - {ok, Client2} = cowboy_client:request(<<"GET">>, - build_url("/long_polling", Config), Client), - {ok, Client3} = cowboy_client:request(<<"GET">>, - build_url("/long_polling", Config), Client2), - {ok, 102, _, Client4} = cowboy_client:response(Client3), - {ok, 102, _, Client5} = cowboy_client:response(Client4), - {error, closed} = cowboy_client:response(Client5). + ConnPid = gun_open(Config), + Refs = [gun:get(ConnPid, "/") || _ <- lists:seq(1, 5)], + _ = [{response, nofin, 200, _} = gun:await(ConnPid, Ref) || Ref <- Refs], + ok. rest_param_all(Config) -> - Client = ?config(client, Config), - URL = build_url("/param_all", Config), - % Accept without param - {ok, Client2} = cowboy_client:request(<<"GET">>, URL, - [{<<"accept">>, <<"text/plain">>}], Client), - Client3 = check_response(Client2, <<"[]">>), - % Accept with param - {ok, Client4} = cowboy_client:request(<<"GET">>, URL, - [{<<"accept">>, <<"text/plain;level=1">>}], Client3), - Client5 = check_response(Client4, <<"level=1">>), - % Accept with param and quality - {ok, Client6} = cowboy_client:request(<<"GET">>, URL, - [{<<"accept">>, - <<"text/plain;level=1;q=0.8, text/plain;level=2;q=0.5">>}], - Client5), - Client7 = check_response(Client6, <<"level=1">>), - {ok, Client8} = cowboy_client:request(<<"GET">>, URL, - [{<<"accept">>, - <<"text/plain;level=1;q=0.5, text/plain;level=2;q=0.8">>}], - Client7), - Client9 = check_response(Client8, <<"level=2">>), - % Without Accept - {ok, Client10} = cowboy_client:request(<<"GET">>, URL, [], Client9), - Client11 = check_response(Client10, <<"'*'">>), - % Content-Type without param - {ok, Client12} = cowboy_client:request(<<"PUT">>, URL, - [{<<"content-type">>, <<"text/plain">>}], Client11), - {ok, 204, _, Client13} = cowboy_client:response(Client12), - % Content-Type with param - {ok, Client14} = cowboy_client:request(<<"PUT">>, URL, - [{<<"content-type">>, <<"text/plain; charset=utf-8">>}], Client13), - {ok, 204, _, _} = cowboy_client:response(Client14). - -check_response(Client, Body) -> - {ok, 200, _, Client2} = cowboy_client:response(Client), - {ok, Body, Client3} = cowboy_client:response_body(Client2), - Client3. + ConnPid = gun_open(Config), + %% Accept without param. + Ref1 = gun:get(ConnPid, "/param_all", + [{<<"accept">>, <<"text/plain">>}]), + {response, nofin, 200, _} = gun:await(ConnPid, Ref1), + {ok, <<"[]">>} = gun:await_body(ConnPid, Ref1), + %% Accept with param. + Ref2 = gun:get(ConnPid, "/param_all", + [{<<"accept">>, <<"text/plain;level=1">>}]), + {response, nofin, 200, _} = gun:await(ConnPid, Ref2), + {ok, <<"level=1">>} = gun:await_body(ConnPid, Ref2), + %% Accept with param and quality. + Ref3 = gun:get(ConnPid, "/param_all", + [{<<"accept">>, <<"text/plain;level=1;q=0.8, text/plain;level=2;q=0.5">>}]), + {response, nofin, 200, _} = gun:await(ConnPid, Ref3), + {ok, <<"level=1">>} = gun:await_body(ConnPid, Ref3), + Ref4 = gun:get(ConnPid, "/param_all", + [{<<"accept">>, <<"text/plain;level=1;q=0.5, text/plain;level=2;q=0.8">>}]), + {response, nofin, 200, _} = gun:await(ConnPid, Ref4), + {ok, <<"level=2">>} = gun:await_body(ConnPid, Ref4), + %% Without Accept. + Ref5 = gun:get(ConnPid, "/param_all"), + {response, nofin, 200, _} = gun:await(ConnPid, Ref5), + {ok, <<"'*'">>} = gun:await_body(ConnPid, Ref5), + %% Content-Type without param. + Ref6 = gun:put(ConnPid, "/param_all", + [{<<"content-type">>, <<"text/plain">>}]), + {response, fin, 204, _} = gun:await(ConnPid, Ref6), + %% Content-Type with param. + Ref7 = gun:put(ConnPid, "/param_all", + [{<<"content-type">>, <<"text/plain; charset=utf-8">>}]), + {response, fin, 204, _} = gun:await(ConnPid, Ref7), + ok. rest_bad_accept(Config) -> - Client = ?config(client, Config), - {ok, Client2} = cowboy_client:request(<<"GET">>, - build_url("/bad_accept", Config), - [{<<"accept">>, <<"1">>}], - Client), - {ok, 400, _, _} = cowboy_client:response(Client2). + ConnPid = gun_open(Config), + Ref = gun:get(ConnPid, "/bad_accept", + [{<<"accept">>, <<"1">>}]), + {response, fin, 400, _} = gun:await(ConnPid, Ref), + ok. rest_bad_content_type(Config) -> - Client = ?config(client, Config), - {ok, Client2} = cowboy_client:request(<<"PATCH">>, - build_url("/bad_content_type", Config), - [{<<"content-type">>, <<"text/plain, text/html">>}], - <<"Whatever">>, Client), - {ok, 415, _, _} = cowboy_client:response(Client2). + ConnPid = gun_open(Config), + Ref = gun:patch(ConnPid, "/bad_content_type", + [{<<"content-type">>, <<"text/plain, text/html">>}], <<"Whatever">>), + {response, fin, 415, _} = gun:await(ConnPid, Ref), + ok. rest_expires(Config) -> - Client = ?config(client, Config), - {ok, Client2} = cowboy_client:request(<<"GET">>, - build_url("/rest_expires", Config), Client), - {ok, 200, RespHeaders, _} = cowboy_client:response(Client2), - {_, Expires} = lists:keyfind(<<"expires">>, 1, RespHeaders), - {_, LastModified} = lists:keyfind(<<"last-modified">>, 1, RespHeaders), + ConnPid = gun_open(Config), + Ref = gun:get(ConnPid, "/rest_expires"), + {response, nofin, 200, Headers} = gun:await(ConnPid, Ref), + {_, Expires} = lists:keyfind(<<"expires">>, 1, Headers), + {_, LastModified} = lists:keyfind(<<"last-modified">>, 1, Headers), Expires = LastModified = <<"Fri, 21 Sep 2012 22:36:14 GMT">>, ok. rest_keepalive(Config) -> - Client = ?config(client, Config), - URL = build_url("/simple", Config), - ok = rest_keepalive_loop(Client, URL, 10). - -rest_keepalive_loop(_, _, 0) -> - ok; -rest_keepalive_loop(Client, URL, N) -> - Headers = [{<<"connection">>, <<"keep-alive">>}], - {ok, Client2} = cowboy_client:request(<<"GET">>, URL, Headers, Client), - {ok, 200, RespHeaders, Client3} = cowboy_client:response(Client2), - {<<"connection">>, <<"keep-alive">>} - = lists:keyfind(<<"connection">>, 1, RespHeaders), - rest_keepalive_loop(Client3, URL, N - 1). + ConnPid = gun_open(Config), + Refs = [gun:get(ConnPid, "/simple") || _ <- lists:seq(1, 10)], + _ = [begin + {response, nofin, 200, Headers} = gun:await(ConnPid, Ref), + {_, <<"keep-alive">>} = lists:keyfind(<<"connection">>, 1, Headers) + end || Ref <- Refs], + ok. rest_keepalive_post(Config) -> - Client = ?config(client, Config), - ok = rest_keepalive_post_loop(Config, Client, forbidden_post, 10). - -rest_keepalive_post_loop(_, _, _, 0) -> - ok; -rest_keepalive_post_loop(Config, Client, simple_post, N) -> - Headers = [ - {<<"connection">>, <<"keep-alive">>}, - {<<"content-type">>, <<"text/plain">>} - ], - {ok, Client2} = cowboy_client:request(<<"POST">>, - build_url("/simple_post", Config), Headers, "12345", Client), - {ok, 303, RespHeaders, Client3} = cowboy_client:response(Client2), - {<<"connection">>, <<"keep-alive">>} - = lists:keyfind(<<"connection">>, 1, RespHeaders), - rest_keepalive_post_loop(Config, Client3, forbidden_post, N - 1); -rest_keepalive_post_loop(Config, Client, forbidden_post, N) -> - Headers = [ - {<<"connection">>, <<"keep-alive">>}, - {<<"content-type">>, <<"text/plain">>} - ], - {ok, Client2} = cowboy_client:request(<<"POST">>, - build_url("/forbidden_post", Config), Headers, "12345", Client), - {ok, 403, RespHeaders, Client3} = cowboy_client:response(Client2), - {<<"connection">>, <<"keep-alive">>} - = lists:keyfind(<<"connection">>, 1, RespHeaders), - rest_keepalive_post_loop(Config, Client3, simple_post, N - 1). + ConnPid = gun_open(Config), + Refs = [{ + gun:post(ConnPid, "/forbidden_post", + [{<<"content-type">>, <<"text/plain">>}]), + gun:post(ConnPid, "/simple_post", + [{<<"content-type">>, <<"text/plain">>}]) + } || _ <- lists:seq(1, 5)], + _ = [begin + {response, fin, 403, Headers1} = gun:await(ConnPid, Ref1), + {_, <<"keep-alive">>} = lists:keyfind(<<"connection">>, 1, Headers1), + {response, fin, 303, Headers2} = gun:await(ConnPid, Ref2), + {_, <<"keep-alive">>} = lists:keyfind(<<"connection">>, 1, Headers2) + end || {Ref1, Ref2} <- Refs], + ok. rest_missing_get_callbacks(Config) -> - Client = ?config(client, Config), - {ok, Client2} = cowboy_client:request(<<"GET">>, - build_url("/missing_get_callbacks", Config), Client), - {ok, 500, _, _} = cowboy_client:response(Client2). + ConnPid = gun_open(Config), + Ref = gun:get(ConnPid, "/missing_get_callbacks"), + {response, fin, 500, _} = gun:await(ConnPid, Ref), + ok. rest_missing_put_callbacks(Config) -> - Client = ?config(client, Config), - {ok, Client2} = cowboy_client:request(<<"PUT">>, - build_url("/missing_put_callbacks", Config), - [{<<"content-type">>, <<"application/json">>}], - <<"{}">>, Client), - {ok, 500, _, _} = cowboy_client:response(Client2). + ConnPid = gun_open(Config), + Ref = gun:put(ConnPid, "/missing_put_callbacks", + [{<<"content-type">>, <<"application/json">>}], <<"{}">>), + {response, fin, 500, _} = gun:await(ConnPid, Ref), + ok. rest_nodelete(Config) -> - Client = ?config(client, Config), - {ok, Client2} = cowboy_client:request(<<"DELETE">>, - build_url("/nodelete", Config), Client), - {ok, 500, _, _} = cowboy_client:response(Client2). + ConnPid = gun_open(Config), + Ref = gun:delete(ConnPid, "/nodelete"), + {response, fin, 500, _} = gun:await(ConnPid, Ref), + ok. rest_options_default(Config) -> - Client = ?config(client, Config), - {ok, Client2} = cowboy_client:request(<<"OPTIONS">>, - build_url("/rest_empty_resource", Config), Client), - {ok, 200, Headers, _} = cowboy_client:response(Client2), - {_, <<"HEAD, GET, OPTIONS">>} = lists:keyfind(<<"allow">>, 1, Headers). + ConnPid = gun_open(Config), + Ref = gun:options(ConnPid, "/rest_empty_resource"), + {response, fin, 200, Headers} = gun:await(ConnPid, Ref), + {_, <<"HEAD, GET, OPTIONS">>} = lists:keyfind(<<"allow">>, 1, Headers), + ok. rest_patch(Config) -> Tests = [ @@ -1052,40 +723,34 @@ rest_patch(Config) -> {400, [{<<"content-type">>, <<"text/plain">>}], <<"halt">>}, {415, [{<<"content-type">>, <<"application/json">>}], <<"bad_content_type">>} ], - Client = ?config(client, Config), + ConnPid = gun_open(Config), _ = [begin - {ok, Client2} = cowboy_client:request(<<"PATCH">>, - build_url("/patch", Config), Headers, Body, Client), - {ok, Status, _, _} = cowboy_client:response(Client2), - ok - end || {Status, Headers, Body} <- Tests]. + Ref = gun:patch(ConnPid, "/patch", Headers, Body), + {response, fin, Status, _} = gun:await(ConnPid, Ref) + end || {Status, Headers, Body} <- Tests], + ok. rest_post_charset(Config) -> - Client = ?config(client, Config), - Headers = [ - {<<"content-type">>, <<"text/plain;charset=UTF-8">>} - ], - {ok, Client2} = cowboy_client:request(<<"POST">>, - build_url("/post_charset", Config), Headers, "12345", Client), - {ok, 204, _, _} = cowboy_client:response(Client2). + ConnPid = gun_open(Config), + Ref = gun:post(ConnPid, "/post_charset", + [{<<"content-type">>, <<"text/plain;charset=UTF-8">>}], "12345"), + {response, fin, 204, _} = gun:await(ConnPid, Ref), + ok. rest_postonly(Config) -> - Client = ?config(client, Config), - Headers = [ - {<<"content-type">>, <<"text/plain">>} - ], - {ok, Client2} = cowboy_client:request(<<"POST">>, - build_url("/postonly", Config), Headers, "12345", Client), - {ok, 204, _, _} = cowboy_client:response(Client2). + ConnPid = gun_open(Config), + Ref = gun:post(ConnPid, "/postonly", + [{<<"content-type">>, <<"text/plain">>}], "12345"), + {response, fin, 204, _} = gun:await(ConnPid, Ref), + ok. rest_resource_get_etag(Config, Type) -> rest_resource_get_etag(Config, Type, []). rest_resource_get_etag(Config, Type, Headers) -> - Client = ?config(client, Config), - {ok, Client2} = cowboy_client:request(<<"GET">>, - build_url("/resetags?type=" ++ Type, Config), Headers, Client), - {ok, Status, RespHeaders, _} = cowboy_client:response(Client2), + ConnPid = gun_open(Config), + Ref = gun:get(ConnPid, "/resetags?type=" ++ Type, Headers), + {response, _, Status, RespHeaders} = gun:await(ConnPid, Ref), case lists:keyfind(<<"etag">>, 1, RespHeaders) of false -> {Status, false}; {<<"etag">>, ETag} -> {Status, ETag} @@ -1119,48 +784,44 @@ rest_resource_etags_if_none_match(Config) -> end || {Status, ETag, Type} <- Tests]. set_env_dispatch(Config) -> - Client = ?config(client, Config), - {ok, Client2} = cowboy_client:request(<<"GET">>, - build_url("/", Config), Client), - {ok, 400, _, _} = cowboy_client:response(Client2), + ConnPid1 = gun_open(Config), + Ref1 = gun:get(ConnPid1, "/"), + {response, fin, 400, _} = gun:await(ConnPid1, Ref1), ok = cowboy:set_env(set_env, dispatch, cowboy_router:compile([{'_', [{"/", http_handler, []}]}])), - {ok, Client3} = cowboy_client:request(<<"GET">>, - build_url("/", Config), Client), - {ok, 200, _, _} = cowboy_client:response(Client3). + ConnPid2 = gun_open(Config), + Ref2 = gun:get(ConnPid2, "/"), + {response, nofin, 200, _} = gun:await(ConnPid2, Ref2), + ok. set_resp_body(Config) -> - Client = ?config(client, Config), - {ok, Client2} = cowboy_client:request(<<"GET">>, - build_url("/set_resp/body", Config), Client), - {ok, 200, _, Client3} = cowboy_client:response(Client2), - {ok, <<"A flameless dance does not equal a cycle">>, _} - = cowboy_client:response_body(Client3). + ConnPid = gun_open(Config), + Ref = gun:get(ConnPid, "/set_resp/body"), + {response, nofin, 200, _} = gun:await(ConnPid, Ref), + {ok, <<"A flameless dance does not equal a cycle">>} + = gun:await_body(ConnPid, Ref), + ok. set_resp_header(Config) -> - Client = ?config(client, Config), - {ok, Client2} = cowboy_client:request(<<"GET">>, - build_url("/set_resp/header", Config), Client), - {ok, 200, Headers, _} = cowboy_client:response(Client2), - {<<"vary">>, <<"Accept">>} = lists:keyfind(<<"vary">>, 1, Headers), - {<<"set-cookie">>, _} = lists:keyfind(<<"set-cookie">>, 1, Headers). + ConnPid = gun_open(Config), + Ref = gun:get(ConnPid, "/set_resp/header"), + {response, nofin, 200, Headers} = gun:await(ConnPid, Ref), + {_, <<"Accept">>} = lists:keyfind(<<"vary">>, 1, Headers), + {_, _} = lists:keyfind(<<"set-cookie">>, 1, Headers), + ok. set_resp_overwrite(Config) -> - Client = ?config(client, Config), - {ok, Client2} = cowboy_client:request(<<"GET">>, - build_url("/set_resp/overwrite", Config), Client), - {ok, 200, Headers, _} = cowboy_client:response(Client2), - {<<"server">>, <<"DesireDrive/1.0">>} - = lists:keyfind(<<"server">>, 1, Headers). + ConnPid = gun_open(Config), + Ref = gun:get(ConnPid, "/set_resp/overwrite"), + {response, nofin, 200, Headers} = gun:await(ConnPid, Ref), + {_, <<"DesireDrive/1.0">>} = lists:keyfind(<<"server">>, 1, Headers), + ok. slowloris(Config) -> - Client = ?config(client, Config), - Transport = ?config(transport, Config), - {ok, Client2} = cowboy_client:connect( - Transport, "localhost", ?config(port, Config), Client), + Client = raw_open(Config), try [begin - {ok, _} = cowboy_client:raw_request([C], Client2), + ok = raw_send(Client, [C]), receive after 25 -> ok end end || C <- "GET / HTTP/1.1\r\nHost: localhost\r\n" "User-Agent: Mozilla/5.0 (Windows; U; Windows NT 6.0; en-US)\r\n" @@ -1171,249 +832,214 @@ slowloris(Config) -> end. slowloris2(Config) -> - Client = ?config(client, Config), - Transport = ?config(transport, Config), - {ok, Client2} = cowboy_client:connect( - Transport, "localhost", ?config(port, Config), Client), - {ok, _} = cowboy_client:raw_request("GET / HTTP/1.1\r\n", Client2), + Client = raw_open(Config), + ok = raw_send(Client, "GET / HTTP/1.1\r\n"), receive after 300 -> ok end, - {ok, _} = cowboy_client:raw_request("Host: localhost\r\n", Client2), + ok = raw_send(Client, "Host: localhost\r\n"), receive after 300 -> ok end, - {ok, 408, _, _} = cowboy_client:response(Client2). + Data = raw_recv_head(Client), + {_, 408, _, _} = cow_http:parse_status_line(Data), + ok. static_attribute_etag(Config) -> - Client = ?config(client, Config), - {ok, Client2} = cowboy_client:request(<<"GET">>, - build_url("/static_attribute_etag/index.html", Config), Client), - {ok, Client3} = cowboy_client:request(<<"GET">>, - build_url("/static_attribute_etag/index.html", Config), Client2), - {ok, 200, Headers1, Client4} = cowboy_client:response(Client3), - {ok, 200, Headers2, _} = cowboy_client:response(Client4), - {<<"etag">>, ETag1} = lists:keyfind(<<"etag">>, 1, Headers1), - {<<"etag">>, ETag2} = lists:keyfind(<<"etag">>, 1, Headers2), - false = ETag1 =:= undefined, - ETag1 = ETag2. + ConnPid = gun_open(Config), + Ref1 = gun:get(ConnPid, "/static_attribute_etag/index.html"), + Ref2 = gun:get(ConnPid, "/static_attribute_etag/index.html"), + {response, nofin, 200, Headers1} = gun:await(ConnPid, Ref1), + {response, nofin, 200, Headers2} = gun:await(ConnPid, Ref2), + {_, ETag} = lists:keyfind(<<"etag">>, 1, Headers1), + {_, ETag} = lists:keyfind(<<"etag">>, 1, Headers2), + true = ETag =/= undefined, + ok. static_function_etag(Config) -> - Client = ?config(client, Config), - {ok, Client2} = cowboy_client:request(<<"GET">>, - build_url("/static_function_etag/index.html", Config), Client), - {ok, Client3} = cowboy_client:request(<<"GET">>, - build_url("/static_function_etag/index.html", Config), Client2), - {ok, 200, Headers1, Client4} = cowboy_client:response(Client3), - {ok, 200, Headers2, _} = cowboy_client:response(Client4), - {<<"etag">>, ETag1} = lists:keyfind(<<"etag">>, 1, Headers1), - {<<"etag">>, ETag2} = lists:keyfind(<<"etag">>, 1, Headers2), - false = ETag1 =:= undefined, - ETag1 = ETag2. + ConnPid = gun_open(Config), + Ref1 = gun:get(ConnPid, "/static_function_etag/index.html"), + Ref2 = gun:get(ConnPid, "/static_function_etag/index.html"), + {response, nofin, 200, Headers1} = gun:await(ConnPid, Ref1), + {response, nofin, 200, Headers2} = gun:await(ConnPid, Ref2), + {_, ETag} = lists:keyfind(<<"etag">>, 1, Headers1), + {_, ETag} = lists:keyfind(<<"etag">>, 1, Headers2), + true = ETag =/= undefined, + ok. static_mimetypes_function(Config) -> - Client = ?config(client, Config), - {ok, Client2} = cowboy_client:request(<<"GET">>, - build_url("/static_mimetypes_function/index.html", Config), Client), - {ok, 200, Headers, _} = cowboy_client:response(Client2), - {<<"content-type">>, <<"text/html">>} - = lists:keyfind(<<"content-type">>, 1, Headers). + ConnPid = gun_open(Config), + Ref = gun:get(ConnPid, "/static_mimetypes_function/index.html"), + {response, nofin, 200, Headers} = gun:await(ConnPid, Ref), + {_, <<"text/html">>} = lists:keyfind(<<"content-type">>, 1, Headers), + ok. static_specify_file(Config) -> - Client = ?config(client, Config), - {ok, Client2} = cowboy_client:request(<<"GET">>, - build_url("/static_specify_file", Config), Client), - {ok, 200, Headers, Client3} = cowboy_client:response(Client2), - {<<"content-type">>, <<"text/css">>} - = lists:keyfind(<<"content-type">>, 1, Headers), - {ok, <<"body{color:red}\n">>, _} = cowboy_client:response_body(Client3). + ConnPid = gun_open(Config), + Ref = gun:get(ConnPid, "/static_specify_file"), + {response, nofin, 200, Headers} = gun:await(ConnPid, Ref), + {_, <<"text/css">>} = lists:keyfind(<<"content-type">>, 1, Headers), + {ok, <<"body{color:red}\n">>} = gun:await_body(ConnPid, Ref), + ok. static_specify_file_catchall(Config) -> - Client = ?config(client, Config), - {ok, Client2} = cowboy_client:request(<<"GET">>, - build_url("/static_specify_file/none", Config), Client), - {ok, 200, Headers, Client3} = cowboy_client:response(Client2), - {<<"content-type">>, <<"text/css">>} - = lists:keyfind(<<"content-type">>, 1, Headers), - {ok, <<"body{color:red}\n">>, _} = cowboy_client:response_body(Client3). + ConnPid = gun_open(Config), + Ref = gun:get(ConnPid, "/static_specify_file/none"), + {response, nofin, 200, Headers} = gun:await(ConnPid, Ref), + {_, <<"text/css">>} = lists:keyfind(<<"content-type">>, 1, Headers), + {ok, <<"body{color:red}\n">>} = gun:await_body(ConnPid, Ref), + ok. static_test_file(Config) -> - Client = ?config(client, Config), - {ok, Client2} = cowboy_client:request(<<"GET">>, - build_url("/static/unknown", Config), Client), - {ok, 200, Headers, _} = cowboy_client:response(Client2), - {<<"content-type">>, <<"application/octet-stream">>} - = lists:keyfind(<<"content-type">>, 1, Headers). + ConnPid = gun_open(Config), + Ref = gun:get(ConnPid, "/static/unknown"), + {response, nofin, 200, Headers} = gun:await(ConnPid, Ref), + {_, <<"application/octet-stream">>} = lists:keyfind(<<"content-type">>, 1, Headers), + ok. static_test_file_css(Config) -> - Client = ?config(client, Config), - {ok, Client2} = cowboy_client:request(<<"GET">>, - build_url("/static/style.css", Config), Client), - {ok, 200, Headers, _} = cowboy_client:response(Client2), - {<<"content-type">>, <<"text/css">>} - = lists:keyfind(<<"content-type">>, 1, Headers). + ConnPid = gun_open(Config), + Ref = gun:get(ConnPid, "/static/style.css"), + {response, nofin, 200, Headers} = gun:await(ConnPid, Ref), + {_, <<"text/css">>} = lists:keyfind(<<"content-type">>, 1, Headers), + ok. stream_body_set_resp(Config) -> - Client = ?config(client, Config), - {ok, Client2} = cowboy_client:request(<<"GET">>, - build_url("/stream_body/set_resp", Config), Client), - {ok, 200, _, Client3} = cowboy_client:response(Client2), - {ok, <<"stream_body_set_resp">>, _} - = cowboy_client:response_body(Client3). + ConnPid = gun_open(Config), + Ref = gun:get(ConnPid, "/stream_body/set_resp"), + {response, nofin, 200, _} = gun:await(ConnPid, Ref), + {ok, <<"stream_body_set_resp">>} = gun:await_body(ConnPid, Ref), + ok. stream_body_set_resp_close(Config) -> - Client = ?config(client, Config), - {ok, Client2} = cowboy_client:request(<<"GET">>, - build_url("/stream_body/set_resp_close", Config), Client), - {ok, 200, _, Client3} = cowboy_client:response(Client2), - {ok, Transport, Socket} = cowboy_client:transport(Client3), - case element(7, Client3) of - <<"stream_body_set_resp_close">> -> - ok; - Buffer -> - {ok, Rest} = Transport:recv(Socket, 26 - byte_size(Buffer), 1000), - <<"stream_body_set_resp_close">> = << Buffer/binary, Rest/binary >>, - ok - end, - {error, closed} = Transport:recv(Socket, 0, 1000). + {ConnPid, MRef} = gun_monitor_open(Config), + Ref = gun:get(ConnPid, "/stream_body/set_resp_close"), + {response, nofin, 200, _} = gun:await(ConnPid, Ref, MRef), + {ok, <<"stream_body_set_resp_close">>} = gun:await_body(ConnPid, Ref, MRef), + gun_is_gone(ConnPid, MRef). stream_body_set_resp_chunked(Config) -> - Client = ?config(client, Config), - {ok, Client2} = cowboy_client:request(<<"GET">>, - build_url("/stream_body/set_resp_chunked", Config), Client), - {ok, 200, Headers, Client3} = cowboy_client:response(Client2), + ConnPid = gun_open(Config), + Ref = gun:get(ConnPid, "/stream_body/set_resp_chunked"), + {response, nofin, 200, Headers} = gun:await(ConnPid, Ref), {_, <<"chunked">>} = lists:keyfind(<<"transfer-encoding">>, 1, Headers), - {ok, Transport, Socket} = cowboy_client:transport(Client3), - case element(7, Client3) of - <<"B\r\nstream_body\r\n11\r\n_set_resp_chunked\r\n0\r\n\r\n">> -> - ok; - Buffer -> - {ok, Rest} = Transport:recv(Socket, 44 - byte_size(Buffer), 1000), - <<"B\r\nstream_body\r\n11\r\n_set_resp_chunked\r\n0\r\n\r\n">> - = <<Buffer/binary, Rest/binary>>, - ok - end. + {ok, <<"stream_body_set_resp_chunked">>} = gun:await_body(ConnPid, Ref), + ok. stream_body_set_resp_chunked10(Config) -> - Client = ?config(client, Config), - Transport = ?config(transport, Config), - {ok, Client2} = cowboy_client:connect( - Transport, "localhost", ?config(port, Config), Client), - Data = ["GET /stream_body/set_resp_chunked HTTP/1.0\r\n", - "Host: localhost\r\n\r\n"], - {ok, Client3} = cowboy_client:raw_request(Data, Client2), - {ok, 200, Headers, Client4} = cowboy_client:response(Client3), - false = lists:keymember(<<"transfer-encoding">>, 1, Headers), - {ok, Transport, Socket} = cowboy_client:transport(Client4), - case element(7, Client4) of - <<"stream_body_set_resp_chunked">> -> - ok; - Buffer -> - {ok, Rest} = Transport:recv(Socket, 28 - byte_size(Buffer), 1000), - <<"stream_body_set_resp_chunked">> - = <<Buffer/binary, Rest/binary>>, - ok - end, - {error, closed} = Transport:recv(Socket, 0, 1000). + {ConnPid, MRef} = gun_monitor_open(Config, [{http, [{version, 'HTTP/1.0'}]}]), + Ref = gun:get(ConnPid, "/stream_body/set_resp_chunked"), + {response, nofin, 200, Headers} = gun:await(ConnPid, Ref, MRef), + false = lists:keyfind(<<"transfer-encoding">>, 1, Headers), + {ok, <<"stream_body_set_resp_chunked">>} = gun:await_body(ConnPid, Ref, MRef), + gun_is_gone(ConnPid, MRef). +%% Undocumented hack: force chunked response to be streamed as HTTP/1.1. streamed_response(Config) -> - Client = ?config(client, Config), - {ok, Client2} = cowboy_client:request(<<"GET">>, - build_url("/streamed_response", Config), Client), - {ok, 200, Headers, Client3} = cowboy_client:response(Client2), + Client = raw_open(Config), + ok = raw_send(Client, "GET /streamed_response HTTP/1.1\r\nHost: localhost\r\n\r\n"), + Data = raw_recv_head(Client), + {'HTTP/1.1', 200, _, Rest} = cow_http:parse_status_line(Data), + {Headers, Rest2} = cow_http:parse_headers(Rest), false = lists:keymember(<<"transfer-encoding">>, 1, Headers), - {ok, Transport, Socket} = cowboy_client:transport(Client3), - {ok, <<"streamed_handler\r\nworks fine!">>} - = Transport:recv(Socket, 29, 1000), - {error, closed} = cowboy_client:response(Client3). + Rest2Size = byte_size(Rest2), + ok = case <<"streamed_handler\r\nworks fine!">> of + Rest2 -> ok; + << Rest2:Rest2Size/binary, Expect/bits >> -> raw_expect_recv(Client, Expect) + end. te_chunked(Config) -> - Client = ?config(client, Config), Body = list_to_binary(io_lib:format("~p", [lists:seq(1, 100)])), - Chunks = body_to_chunks(50, Body, []), - {ok, Client2} = cowboy_client:request(<<"GET">>, - build_url("/echo/body", Config), - [{<<"transfer-encoding">>, <<"chunked">>}], - Chunks, Client), - {ok, 200, _, Client3} = cowboy_client:response(Client2), - {ok, Body, _} = cowboy_client:response_body(Client3). + ConnPid = gun_open(Config), + Ref = gun:post(ConnPid, "/echo/body", + [{<<"transfer-encoding">>, <<"chunked">>}], Body), + {response, nofin, 200, _} = gun:await(ConnPid, Ref), + {ok, Body} = gun:await_body(ConnPid, Ref), + ok. + +do_body_to_chunks(_, <<>>, Acc) -> + lists:reverse([<<"0\r\n\r\n">>|Acc]); +do_body_to_chunks(ChunkSize, Body, Acc) -> + BodySize = byte_size(Body), + ChunkSize2 = case BodySize < ChunkSize of + true -> BodySize; + false -> ChunkSize + end, + << Chunk:ChunkSize2/binary, Rest/binary >> = Body, + ChunkSizeBin = list_to_binary(integer_to_list(ChunkSize2, 16)), + do_body_to_chunks(ChunkSize, Rest, + [<< ChunkSizeBin/binary, "\r\n", Chunk/binary, "\r\n" >>|Acc]). te_chunked_chopped(Config) -> - Client = ?config(client, Config), Body = list_to_binary(io_lib:format("~p", [lists:seq(1, 100)])), - Body2 = iolist_to_binary(body_to_chunks(50, Body, [])), - {ok, Client2} = cowboy_client:request(<<"GET">>, - build_url("/echo/body", Config), - [{<<"transfer-encoding">>, <<"chunked">>}], Client), - {ok, Transport, Socket} = cowboy_client:transport(Client2), + Body2 = iolist_to_binary(do_body_to_chunks(50, Body, [])), + ConnPid = gun_open(Config), + Ref = gun:post(ConnPid, "/echo/body", + [{<<"transfer-encoding">>, <<"chunked">>}]), _ = [begin - ok = Transport:send(Socket, << C >>), - ok = timer:sleep(10) + ok = gun:dbg_send_raw(ConnPid, << C >>), + receive after 10 -> ok end end || << C >> <= Body2], - {ok, 200, _, Client3} = cowboy_client:response(Client2), - {ok, Body, _} = cowboy_client:response_body(Client3). + {response, nofin, 200, _} = gun:await(ConnPid, Ref), + {ok, Body} = gun:await_body(ConnPid, Ref), + ok. te_chunked_delayed(Config) -> - Client = ?config(client, Config), Body = list_to_binary(io_lib:format("~p", [lists:seq(1, 100)])), - Chunks = body_to_chunks(50, Body, []), - {ok, Client2} = cowboy_client:request(<<"GET">>, - build_url("/echo/body", Config), - [{<<"transfer-encoding">>, <<"chunked">>}], Client), - {ok, Transport, Socket} = cowboy_client:transport(Client2), + Chunks = do_body_to_chunks(50, Body, []), + ConnPid = gun_open(Config), + Ref = gun:post(ConnPid, "/echo/body", + [{<<"transfer-encoding">>, <<"chunked">>}]), _ = [begin - ok = Transport:send(Socket, Chunk), - ok = timer:sleep(10) + ok = gun:dbg_send_raw(ConnPid, Chunk), + receive after 10 -> ok end end || Chunk <- Chunks], - {ok, 200, _, Client3} = cowboy_client:response(Client2), - {ok, Body, _} = cowboy_client:response_body(Client3). + {response, nofin, 200, _} = gun:await(ConnPid, Ref), + {ok, Body} = gun:await_body(ConnPid, Ref), + ok. te_chunked_split_body(Config) -> - Client = ?config(client, Config), Body = list_to_binary(io_lib:format("~p", [lists:seq(1, 100)])), - Chunks = body_to_chunks(50, Body, []), - {ok, Client2} = cowboy_client:request(<<"GET">>, - build_url("/echo/body", Config), - [{<<"transfer-encoding">>, <<"chunked">>}], Client), - {ok, Transport, Socket} = cowboy_client:transport(Client2), + Chunks = do_body_to_chunks(50, Body, []), + ConnPid = gun_open(Config), + Ref = gun:post(ConnPid, "/echo/body", + [{<<"transfer-encoding">>, <<"chunked">>}]), _ = [begin case Chunk of - %% Final chunk. <<"0\r\n\r\n">> -> - ok = Transport:send(Socket, Chunk); + ok = gun:dbg_send_raw(ConnPid, Chunk); _ -> - %% Chunk of form <<"9\r\nChunkBody\r\n">>. [Size, ChunkBody, <<>>] = binary:split(Chunk, [<<"\r\n">>], [global]), PartASize = random:uniform(byte_size(ChunkBody)), <<PartA:PartASize/binary, PartB/binary>> = ChunkBody, - ok = Transport:send(Socket, [Size, <<"\r\n">>, PartA]), - ok = timer:sleep(10), - ok = Transport:send(Socket, [PartB, <<"\r\n">>]) + ok = gun:dbg_send_raw(ConnPid, [Size, <<"\r\n">>, PartA]), + receive after 10 -> ok end, + ok = gun:dbg_send_raw(ConnPid, [PartB, <<"\r\n">>]) end end || Chunk <- Chunks], - {ok, 200, _, Client3} = cowboy_client:response(Client2), - {ok, Body, _} = cowboy_client:response_body(Client3). + {response, nofin, 200, _} = gun:await(ConnPid, Ref), + {ok, Body} = gun:await_body(ConnPid, Ref), + ok. te_chunked_split_crlf(Config) -> - Client = ?config(client, Config), Body = list_to_binary(io_lib:format("~p", [lists:seq(1, 100)])), - Chunks = body_to_chunks(50, Body, []), - {ok, Client2} = cowboy_client:request(<<"GET">>, - build_url("/echo/body", Config), - [{<<"transfer-encoding">>, <<"chunked">>}], Client), - {ok, Transport, Socket} = cowboy_client:transport(Client2), + Chunks = do_body_to_chunks(50, Body, []), + ConnPid = gun_open(Config), + Ref = gun:post(ConnPid, "/echo/body", + [{<<"transfer-encoding">>, <<"chunked">>}]), _ = [begin - %% <<"\r\n">> is last 2 bytes of Chunk split before or after <<"\r">>. + %% Split in the newline just before the end of the chunk. Len = byte_size(Chunk) - (random:uniform(2) - 1), - <<Chunk2:Len/binary, End/binary>> = Chunk, - ok = Transport:send(Socket, Chunk2), - ok = timer:sleep(10), - ok = Transport:send(Socket, End) + << Chunk2:Len/binary, End/binary >> = Chunk, + ok = gun:dbg_send_raw(ConnPid, Chunk2), + receive after 10 -> ok end, + ok = gun:dbg_send_raw(ConnPid, End) end || Chunk <- Chunks], - {ok, 200, _, Client3} = cowboy_client:response(Client2), - {ok, Body, _} = cowboy_client:response_body(Client3). + {response, nofin, 200, _} = gun:await(ConnPid, Ref), + {ok, Body} = gun:await_body(ConnPid, Ref), + ok. te_identity(Config) -> - Client = ?config(client, Config), Body = list_to_binary(io_lib:format("~p", [lists:seq(1, 100)])), - {ok, Client2} = cowboy_client:request(<<"GET">>, - build_url("/echo/body", Config), [], Body, Client), - {ok, 200, _, Client3} = cowboy_client:response(Client2), - {ok, Body, _} = cowboy_client:response_body(Client3). + ConnPid = gun_open(Config), + Ref = gun:post(ConnPid, "/echo/body", [], Body), + {response, nofin, 200, _} = gun:await(ConnPid, Ref), + {ok, Body} = gun:await_body(ConnPid, Ref), + ok. diff --git a/test/http_SUITE_data/http_errors.erl b/test/http_SUITE_data/http_errors.erl index 8831362..35ac3bd 100644 --- a/test/http_SUITE_data/http_errors.erl +++ b/test/http_SUITE_data/http_errors.erl @@ -9,30 +9,28 @@ init({_Transport, http}, Req, _Opts) -> case_init(Case, Req1). case_init(<<"init_before_reply">> = Case, _Req) -> + cowboy_error_h:ignore(?MODULE, case_init, 2), erlang:error(Case); - case_init(<<"init_after_reply">> = Case, Req) -> + cowboy_error_h:ignore(?MODULE, case_init, 2), {ok, _Req1} = cowboy_req:reply(200, [], "http_handler_crashes", Req), erlang:error(Case); - case_init(<<"init_reply_handle_error">> = Case, Req) -> {ok, Req1} = cowboy_req:reply(200, [], "http_handler_crashes", Req), {ok, Req1, Case}; - case_init(<<"handle_before_reply">> = Case, Req) -> {ok, Req, Case}; - case_init(<<"handle_after_reply">> = Case, Req) -> {ok, Req, Case}. - handle(_Req, <<"init_reply_handle_error">> = Case) -> + cowboy_error_h:ignore(?MODULE, handle, 2), erlang:error(Case); - handle(_Req, <<"handle_before_reply">> = Case) -> + cowboy_error_h:ignore(?MODULE, handle, 2), erlang:error(Case); - handle(Req, <<"handle_after_reply">> = Case) -> + cowboy_error_h:ignore(?MODULE, handle, 2), {ok, _Req1} = cowboy_req:reply(200, [], "http_handler_crashes", Req), erlang:error(Case). diff --git a/test/http_SUITE_data/http_long_polling.erl b/test/http_SUITE_data/http_long_polling.erl deleted file mode 100644 index ad4e66e..0000000 --- a/test/http_SUITE_data/http_long_polling.erl +++ /dev/null @@ -1,24 +0,0 @@ -%% Feel free to use, reuse and abuse the code in this file. - --module(http_long_polling). --behaviour(cowboy_http_handler). --export([init/3, handle/2, info/3, terminate/3]). - -init({_Transport, http}, Req, _Opts) -> - erlang:send_after(500, self(), timeout), - {loop, Req, 5, 5000, hibernate}. - -handle(_Req, _State) -> - exit(badarg). - -info(timeout, Req, 0) -> - {ok, Req2} = cowboy_req:reply(102, Req), - {ok, Req2, 0}; -info(timeout, Req, State) -> - erlang:send_after(500, self(), timeout), - {loop, Req, State - 1, hibernate}. - -terminate({normal, shutdown}, _, _) -> - ok; -terminate({error, overflow}, _, _) -> - ok. diff --git a/test/http_SUITE_data/http_loop_recv.erl b/test/http_SUITE_data/http_loop_recv.erl deleted file mode 100644 index d0577f0..0000000 --- a/test/http_SUITE_data/http_loop_recv.erl +++ /dev/null @@ -1,18 +0,0 @@ -%% Feel free to use, reuse and abuse the code in this file. - --module(http_loop_recv). --behaviour(cowboy_loop_handler). --export([init/3, info/3, terminate/3]). - -init({_, http}, Req, _) -> - self() ! recv_timeout, - {loop, Req, undefined, 500, hibernate}. - -info(recv_timeout, Req, State) -> - {ok, Body, Req1} = cowboy_req:body(Req), - 100000 = byte_size(Body), - {ok, Req2} = cowboy_req:reply(200, Req1), - {ok, Req2, State}. - -terminate({normal, shutdown}, _, _) -> - ok. diff --git a/test/http_SUITE_data/http_loop_stream_recv.erl b/test/http_SUITE_data/http_loop_stream_recv.erl index 87113c6..9f7646a 100644 --- a/test/http_SUITE_data/http_loop_stream_recv.erl +++ b/test/http_SUITE_data/http_loop_stream_recv.erl @@ -8,34 +8,27 @@ init({_, http}, Req, _) -> receive after 100 -> ok end, self() ! stream, - {loop, Req, 1, 100}. + {loop, Req, undefined, 100}. -info(stream, Req, Id) -> - case stream_next(Req) of - {ok, Id, Req2} -> - info(stream, Req2, Id+1); +info(stream, Req, undefined) -> + stream(Req, 1, <<>>). + +stream(Req, ID, Acc) -> + case cowboy_req:stream_body(Req) of + {ok, Data, Req2} -> + parse_id(Req2, ID, << Acc/binary, Data/binary >>); {done, Req2} -> {ok, Req3} = cowboy_req:reply(200, Req2), - {ok, Req3, Id} + {ok, Req3, undefined} + end. + +parse_id(Req, ID, Data) -> + case Data of + << ID:32, Rest/bits >> -> + parse_id(Req, ID + 1, Rest); + _ -> + stream(Req, ID, Data) end. terminate({normal, shutdown}, _, _) -> ok. - -stream_next(Req) -> - stream_next(<<>>, Req). - -stream_next(Buffer, Req) -> - case cowboy_req:stream_body(Req) of - {ok, Packet, Req2} -> - case <<Buffer/binary, Packet/binary>> of - <<Id:32>> -> - {ok, Id, Req2}; - Buffer2 when byte_size(Buffer2) < 4 -> - stream_next(Buffer2, Req2); - _InvalidBuffer -> - {error, invalid_chunk} - end; - Other -> - Other - end. diff --git a/test/http_SUITE_data/http_loop_timeout.erl b/test/http_SUITE_data/http_loop_timeout.erl deleted file mode 100644 index dd3472c..0000000 --- a/test/http_SUITE_data/http_loop_timeout.erl +++ /dev/null @@ -1,16 +0,0 @@ -%% Feel free to use, reuse and abuse the code in this file. - --module(http_loop_timeout). --behaviour(cowboy_loop_handler). --export([init/3, info/3, terminate/3]). - -init({_, http}, Req, _) -> - erlang:send_after(1000, self(), error_timeout), - {loop, Req, undefined, 500, hibernate}. - -info(error_timeout, Req, State) -> - {ok, Req2} = cowboy_req:reply(500, Req), - {ok, Req2, State}. - -terminate({normal, timeout}, _, _) -> - ok. diff --git a/test/http_SUITE_data/http_multipart.erl b/test/http_SUITE_data/http_multipart.erl index c94739f..79bfeb8 100644 --- a/test/http_SUITE_data/http_multipart.erl +++ b/test/http_SUITE_data/http_multipart.erl @@ -8,22 +8,18 @@ init({_Transport, http}, Req, []) -> {ok, Req, {}}. handle(Req, State) -> - {Result, Req2} = acc_multipart(Req), + {Result, Req2} = acc_multipart(Req, []), {ok, Req3} = cowboy_req:reply(200, [], term_to_binary(Result), Req2), {ok, Req3, State}. terminate(_, _, _) -> ok. -acc_multipart(Req) -> - acc_multipart(cowboy_req:multipart_data(Req), []). - -acc_multipart({headers, Headers, Req}, Acc) -> - acc_multipart(cowboy_req:multipart_data(Req), [{Headers, []}|Acc]); -acc_multipart({body, Data, Req}, [{Headers, BodyAcc}|Acc]) -> - acc_multipart(cowboy_req:multipart_data(Req), [{Headers, [Data|BodyAcc]}|Acc]); -acc_multipart({end_of_part, Req}, [{Headers, BodyAcc}|Acc]) -> - acc_multipart(cowboy_req:multipart_data(Req), - [{Headers, list_to_binary(lists:reverse(BodyAcc))}|Acc]); -acc_multipart({eof, Req}, Acc) -> - {lists:reverse(Acc), Req}. +acc_multipart(Req, Acc) -> + case cowboy_req:part(Req) of + {ok, Headers, Req2} -> + {ok, Body, Req3} = cowboy_req:part_body(Req2), + acc_multipart(Req3, [{Headers, Body}|Acc]); + {done, Req2} -> + {lists:reverse(Acc), Req2} + end. diff --git a/test/http_SUITE_data/http_multipart_stream.erl b/test/http_SUITE_data/http_multipart_stream.erl new file mode 100644 index 0000000..926d150 --- /dev/null +++ b/test/http_SUITE_data/http_multipart_stream.erl @@ -0,0 +1,34 @@ +%% Feel free to use, reuse and abuse the code in this file. + +-module(http_multipart_stream). +-behaviour(cowboy_http_handler). +-export([init/3, handle/2, terminate/3]). + +init(_, Req, []) -> + {ok, Req, undefined}. + +handle(Req, State) -> + Req2 = multipart(Req), + {ok, Req3} = cowboy_req:reply(200, Req2), + {ok, Req3, State}. + +terminate(_, _, _) -> + ok. + +multipart(Req) -> + case cowboy_req:part(Req) of + {ok, [{<<"content-length">>, BinLength}], Req2} -> + Length = list_to_integer(binary_to_list(BinLength)), + {Length, Req3} = stream_body(Req2, 0), + multipart(Req3); + {done, Req2} -> + Req2 + end. + +stream_body(Req, N) -> + case cowboy_req:part_body(Req) of + {ok, Data, Req2} -> + {N + byte_size(Data), Req2}; + {more, Data, Req2} -> + stream_body(Req2, N + byte_size(Data)) + end. diff --git a/test/http_SUITE_data/rest_missing_callbacks.erl b/test/http_SUITE_data/rest_missing_callbacks.erl index 171c856..94bfbbd 100644 --- a/test/http_SUITE_data/rest_missing_callbacks.erl +++ b/test/http_SUITE_data/rest_missing_callbacks.erl @@ -11,11 +11,13 @@ allowed_methods(Req, State) -> {[<<"GET">>, <<"PUT">>], Req, State}. content_types_accepted(Req, State) -> + cowboy_error_h:ignore(cowboy_rest, process_content_type, 3), {[ {<<"application/json">>, put_application_json} ], Req, State}. content_types_provided(Req, State) -> + cowboy_error_h:ignore(cowboy_rest, set_resp_body, 2), {[ {<<"text/plain">>, get_text_plain} ], Req, State}. diff --git a/test/http_SUITE_data/rest_resource_etags.erl b/test/http_SUITE_data/rest_resource_etags.erl index 43f1e05..2652f57 100644 --- a/test/http_SUITE_data/rest_resource_etags.erl +++ b/test/http_SUITE_data/rest_resource_etags.erl @@ -18,8 +18,10 @@ generate_etag(Req, State) -> {<<"\"etag-header-value\"">>, Req2, State}; %% Invalid return values from generate_etag/2. {<<"binary-strong-unquoted">>, Req2} -> + cowboy_error_h:ignore(cowboy_http, quoted_string, 2), {<<"etag-header-value">>, Req2, State}; {<<"binary-weak-unquoted">>, Req2} -> + cowboy_error_h:ignore(cowboy_http, quoted_string, 2), {<<"W/etag-header-value">>, Req2, State} end. diff --git a/test/loop_handler_SUITE.erl b/test/loop_handler_SUITE.erl new file mode 100644 index 0000000..5f69490 --- /dev/null +++ b/test/loop_handler_SUITE.erl @@ -0,0 +1,87 @@ +%% Copyright (c) 2011-2014, Loïc Hoguin <[email protected]> +%% +%% Permission to use, copy, modify, and/or distribute this software for any +%% purpose with or without fee is hereby granted, provided that the above +%% copyright notice and this permission notice appear in all copies. +%% +%% THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +%% WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +%% MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +%% ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +%% WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +%% ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF +%% OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + +-module(loop_handler_SUITE). +-compile(export_all). + +-import(cowboy_test, [config/2]). +-import(cowboy_test, [doc/1]). +-import(cowboy_test, [gun_open/1]). + +%% ct. + +all() -> + cowboy_test:common_all(). + +groups() -> + cowboy_test:common_groups(cowboy_test:all(?MODULE)). + +init_per_group(Name, Config) -> + cowboy_test:init_common_groups(Name, Config, ?MODULE). + +end_per_group(Name, _) -> + cowboy:stop_listener(Name). + +%% Dispatch configuration. + +init_dispatch(_) -> + cowboy_router:compile([{'_', [ + {"/long_polling", long_polling_h, []}, + {"/loop_body", loop_handler_body_h, []}, + {"/loop_timeout", loop_handler_timeout_h, []} + ]}]). + +%% Tests. + +long_polling(Config) -> + doc("Simple long-polling."), + ConnPid = gun_open(Config), + Ref = gun:get(ConnPid, "/long_polling"), + {response, fin, 102, _} = gun:await(ConnPid, Ref), + ok. + +long_polling_body(Config) -> + doc("Long-polling with a body that falls within the configurable limits."), + ConnPid = gun_open(Config), + Ref = gun:post(ConnPid, "/long_polling", [], << 0:5000/unit:8 >>), + {response, fin, 102, _} = gun:await(ConnPid, Ref), + ok. + +long_polling_body_too_large(Config) -> + doc("Long-polling with a body that exceeds the configurable limits."), + ConnPid = gun_open(Config), + Ref = gun:post(ConnPid, "/long_polling", [], << 0:100000/unit:8 >>), + {response, fin, 500, _} = gun:await(ConnPid, Ref), + ok. + +long_polling_pipeline(Config) -> + doc("Pipeline of long-polling calls."), + ConnPid = gun_open(Config), + Refs = [gun:get(ConnPid, "/long_polling") || _ <- lists:seq(1, 2)], + _ = [{response, fin, 102, _} = gun:await(ConnPid, Ref) || Ref <- Refs], + ok. + +loop_body(Config) -> + doc("Check that a loop handler can read the request body in info/3."), + ConnPid = gun_open(Config), + Ref = gun:post(ConnPid, "/loop_body", [], << 0:100000/unit:8 >>), + {response, fin, 200, _} = gun:await(ConnPid, Ref), + ok. + +loop_timeout(Config) -> + doc("Ensure that the loop handler timeout results in a 204 response."), + ConnPid = gun_open(Config), + Ref = gun:get(ConnPid, "/loop_timeout"), + {response, fin, 204, _} = gun:await(ConnPid, Ref), + ok. diff --git a/test/spdy_SUITE.erl b/test/spdy_SUITE.erl index c73c4f7..2e9c7e4 100644 --- a/test/spdy_SUITE.erl +++ b/test/spdy_SUITE.erl @@ -1,4 +1,4 @@ -%% Copyright (c) 2013, Loïc Hoguin <[email protected]> +%% Copyright (c) 2013-2014, Loïc Hoguin <[email protected]> %% %% Permission to use, copy, modify, and/or distribute this software for any %% purpose with or without fee is hereby granted, provided that the above @@ -13,21 +13,10 @@ %% OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -module(spdy_SUITE). +-compile(export_all). --include_lib("common_test/include/ct.hrl"). - -%% ct. --export([all/0]). --export([groups/0]). --export([init_per_suite/1]). --export([end_per_suite/1]). --export([init_per_group/2]). --export([end_per_group/2]). - -%% Tests. --export([check_status/1]). --export([echo_body/1]). --export([echo_body_multi/1]). +-import(cowboy_test, [config/2]). +-import(cowboy_test, [gun_monitor_open/1]). %% ct. @@ -35,55 +24,28 @@ all() -> [{group, spdy}]. groups() -> - [{spdy, [], [ - check_status, - echo_body, - echo_body_multi - ]}]. + [{spdy, [], cowboy_test:all(?MODULE)}]. init_per_suite(Config) -> case proplists:get_value(ssl_app, ssl:versions()) of Version when Version < "5.2.1" -> {skip, "No NPN support in SSL application."}; _ -> - application:start(crypto), - application:start(cowlib), - application:start(ranch), - application:start(cowboy), - application:start(asn1), - application:start(public_key), - application:start(ssl), - application:start(gun), - Dir = ?config(priv_dir, Config) ++ "/static", + Dir = config(priv_dir, Config) ++ "/static", ct_helper:create_static_dir(Dir), [{static_dir, Dir}|Config] end. end_per_suite(Config) -> - Dir = ?config(static_dir, Config), - ct_helper:delete_static_dir(Dir), - application:stop(gun), - application:stop(ssl), - application:stop(public_key), - application:stop(asn1), - application:stop(cowboy), - application:stop(ranch), - application:stop(cowlib), - application:stop(crypto), - ok. + ct_helper:delete_static_dir(config(static_dir, Config)). init_per_group(Name, Config) -> - {_, Cert, Key} = ct_helper:make_certs(), - Opts = [{cert, Cert}, {key, Key}], - {ok, _} = cowboy:start_spdy(Name, 100, Opts ++ [{port, 0}], [ + cowboy_test:init_spdy(Name, [ {env, [{dispatch, init_dispatch(Config)}]} - ]), - Port = ranch:get_port(Name), - [{port, Port}|Config]. + ], Config). end_per_group(Name, _) -> - cowboy:stop_listener(Name), - ok. + cowboy:stop_listener(Name). %% Dispatch configuration. @@ -91,7 +53,7 @@ init_dispatch(Config) -> cowboy_router:compile([ {"localhost", [ {"/static/[...]", cowboy_static, - {dir, ?config(static_dir, Config)}}, + {dir, config(static_dir, Config)}}, {"/echo/body", http_echo_body, []}, {"/chunked", http_chunked, []}, {"/", http_handler, []} @@ -100,24 +62,14 @@ init_dispatch(Config) -> %% Convenience functions. -quick_get(Pid, Host, Path) -> - MRef = monitor(process, Pid), - StreamRef = gun:get(Pid, Path, [{":host", Host}]), - receive - {'DOWN', MRef, _, _, Reason} -> - error(Reason); - {gun_response, Pid, StreamRef, IsFin, - << Status:3/binary, _/bits >>, Headers} -> - {IsFin, list_to_integer(binary_to_list(Status)), Headers} - after 1000 -> - error(timeout) - end. +do_get(ConnPid, MRef, Host, Path) -> + StreamRef = gun:get(ConnPid, Path, [{":host", Host}]), + {response, IsFin, Status, _} = gun:await(ConnPid, StreamRef, MRef), + {IsFin, Status}. %% Tests. check_status(Config) -> - {_, Port} = lists:keyfind(port, 1, Config), - {ok, Pid} = gun:open("localhost", Port), Tests = [ {200, nofin, "localhost", "/"}, {200, nofin, "localhost", "/chunked"}, @@ -126,64 +78,33 @@ check_status(Config) -> {400, fin, "localhost", "bad-path"}, {404, fin, "localhost", "/this/path/does/not/exist"} ], + {ConnPid, MRef} = gun_monitor_open(Config), _ = [{Status, Fin, Host, Path} = begin - {IsFin, Ret, _} = quick_get(Pid, Host, Path), + {IsFin, Ret} = do_get(ConnPid, MRef, Host, Path), {Ret, IsFin, Host, Path} end || {Status, Fin, Host, Path} <- Tests], - gun:close(Pid). + gun:close(ConnPid). echo_body(Config) -> - {_, Port} = lists:keyfind(port, 1, Config), - {ok, Pid} = gun:open("localhost", Port), - MRef = monitor(process, Pid), + {ConnPid, MRef} = gun_monitor_open(Config), Body = << 0:800000 >>, - StreamRef = gun:post(Pid, "/echo/body", [ - {<<"content-length">>, integer_to_list(byte_size(Body))}, + StreamRef = gun:post(ConnPid, "/echo/body", [ {<<"content-type">>, "application/octet-stream"} ], Body), - receive - {'DOWN', MRef, _, _, Reason} -> - error(Reason); - {gun_response, Pid, StreamRef, nofin, << "200", _/bits >>, _} -> - ok - after 1000 -> - error(response_timeout) - end, - receive - {'DOWN', MRef, _, _, Reason2} -> - error({gun_data, Reason2}); - {gun_data, Pid, StreamRef, fin, Body} -> - ok - after 1000 -> - error(data_timeout) - end, - gun:close(Pid). + {response, nofin, 200, _} = gun:await(ConnPid, StreamRef, MRef), + {ok, Body} = gun:await_body(ConnPid, StreamRef, MRef), + gun:close(ConnPid). echo_body_multi(Config) -> - {_, Port} = lists:keyfind(port, 1, Config), - {ok, Pid} = gun:open("localhost", Port), - MRef = monitor(process, Pid), + {ConnPid, MRef} = gun_monitor_open(Config), BodyChunk = << 0:80000 >>, - StreamRef = gun:post(Pid, "/echo/body", [ + StreamRef = gun:post(ConnPid, "/echo/body", [ + %% @todo I'm still unhappy with this. It shouldn't be required... {<<"content-length">>, integer_to_list(byte_size(BodyChunk) * 10)}, {<<"content-type">>, "application/octet-stream"} ]), - _ = [gun:data(Pid, StreamRef, nofin, BodyChunk) || _ <- lists:seq(1, 9)], - gun:data(Pid, StreamRef, fin, BodyChunk), - receive - {'DOWN', MRef, _, _, Reason} -> - error(Reason); - {gun_response, Pid, StreamRef, nofin, << "200", _/bits >>, _} -> - ok - after 1000 -> - error(response_timeout) - end, - receive - {'DOWN', MRef, _, _, Reason2} -> - error({gun_data, Reason2}); - {gun_data, Pid, StreamRef, fin, << 0:800000 >>} -> - ok - after 1000 -> - error(data_timeout) - end, - gun:close(Pid). + _ = [gun:data(ConnPid, StreamRef, nofin, BodyChunk) || _ <- lists:seq(1, 9)], + gun:data(ConnPid, StreamRef, fin, BodyChunk), + {response, nofin, 200, _} = gun:await(ConnPid, StreamRef, MRef), + {ok, << 0:800000 >>} = gun:await_body(ConnPid, StreamRef, MRef), + gun:close(ConnPid). diff --git a/test/ws_SUITE.erl b/test/ws_SUITE.erl index 0a8ca43..77c82f6 100644 --- a/test/ws_SUITE.erl +++ b/test/ws_SUITE.erl @@ -1,4 +1,4 @@ -%% Copyright (c) 2011-2013, Loïc Hoguin <[email protected]> +%% Copyright (c) 2011-2014, Loïc Hoguin <[email protected]> %% %% Permission to use, copy, modify, and/or distribute this software for any %% purpose with or without fee is hereby granted, provided that the above @@ -13,94 +13,53 @@ %% OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -module(ws_SUITE). +-compile(export_all). --include_lib("common_test/include/ct.hrl"). - -%% ct. --export([all/0]). --export([groups/0]). --export([init_per_suite/1]). --export([end_per_suite/1]). --export([init_per_group/2]). --export([end_per_group/2]). - -%% Tests. --export([ws0/1]). --export([ws8/1]). --export([ws8_init_shutdown/1]). --export([ws8_single_bytes/1]). --export([ws13/1]). --export([ws_deflate/1]). --export([ws_deflate_chunks/1]). --export([ws_deflate_fragments/1]). --export([ws_send_close/1]). --export([ws_send_close_payload/1]). --export([ws_send_many/1]). --export([ws_text_fragments/1]). --export([ws_timeout_hibernate/1]). --export([ws_timeout_cancel/1]). --export([ws_timeout_reset/1]). --export([ws_upgrade_with_opts/1]). +-import(cowboy_test, [config/2]). %% ct. all() -> - [{group, ws}]. + [{group, autobahn}, {group, ws}]. groups() -> - BaseTests = [ - ws0, - ws8, - ws8_init_shutdown, - ws8_single_bytes, - ws13, - ws_deflate, - ws_deflate_chunks, - ws_deflate_fragments, - ws_send_close, - ws_send_close_payload, - ws_send_many, - ws_text_fragments, - ws_timeout_hibernate, - ws_timeout_cancel, - ws_timeout_reset, - ws_upgrade_with_opts - ], - [{ws, [parallel], BaseTests}]. + BaseTests = cowboy_test:all(?MODULE) -- [autobahn_fuzzingclient], + [{autobahn, [], [autobahn_fuzzingclient]}, {ws, [parallel], BaseTests}]. init_per_suite(Config) -> - application:start(crypto), - application:start(cowlib), - application:start(ranch), - application:start(cowboy), Config. -end_per_suite(_Config) -> - application:stop(cowboy), - application:stop(ranch), - application:stop(cowlib), - application:stop(crypto), - ok. - -init_per_group(ws, Config) -> - cowboy:start_http(ws, 100, [{port, 0}], [ +init_per_group(Name = autobahn, Config) -> + %% Some systems have it named pip2. + Out = os:cmd("pip show autobahntestsuite ; pip2 show autobahntestsuite"), + case string:str(Out, "autobahntestsuite") of + 0 -> + ct:print("Skipping the autobahn group because the " + "Autobahn Test Suite is not installed.~nTo install it, " + "please follow the instructions on this page:~n~n " + "http://autobahn.ws/testsuite/installation.html"), + {skip, "Autobahn Test Suite not installed."}; + _ -> + {ok, _} = cowboy:start_http(Name, 100, [{port, 33080}], [ + {env, [{dispatch, init_dispatch()}]}]), + Config + end; +init_per_group(Name = ws, Config) -> + cowboy_test:init_http(Name, [ {env, [{dispatch, init_dispatch()}]}, {compress, true} - ]), - Port = ranch:get_port(ws), - [{port, Port}|Config]. + ], Config). end_per_group(Listener, _Config) -> - cowboy:stop_listener(Listener), - ok. + cowboy:stop_listener(Listener). %% Dispatch configuration. init_dispatch() -> cowboy_router:compile([ {"localhost", [ - {"/ws_echo_timer", ws_echo_timer, []}, {"/ws_echo", ws_echo, []}, + {"/ws_echo_timer", ws_echo_timer, []}, {"/ws_init_shutdown", ws_init_shutdown, []}, {"/ws_send_many", ws_send_many, [ {sequence, [ @@ -127,7 +86,21 @@ init_dispatch() -> ]} ]). -%% ws and wss. +%% Tests. + +autobahn_fuzzingclient(Config) -> + Out = os:cmd("cd " ++ config(priv_dir, Config) + ++ " && wstest -m fuzzingclient -s " + ++ config(data_dir, Config) ++ "client.json"), + Report = config(priv_dir, Config) ++ "reports/servers/index.html", + ct:log("<h2><a href=\"~s\">Full report</a></h2>~n", [Report]), + ct:print("Autobahn Test Suite report: file://~s~n", [Report]), + ct:log("~s~n", [Out]), + {ok, HTML} = file:read_file(Report), + case length(binary:matches(HTML, <<"case_failed">>)) > 2 of + true -> error(failed); + false -> ok + end. %% We do not support hixie76 anymore. ws0(Config) -> @@ -163,7 +136,7 @@ ws8(Config) -> {ok, Handshake} = gen_tcp:recv(Socket, 0, 6000), {ok, {http_response, {1, 1}, 101, "Switching Protocols"}, Rest} = erlang:decode_packet(http, Handshake, []), - [Headers, <<>>] = websocket_headers( + [Headers, <<>>] = do_decode_headers( erlang:decode_packet(httph, Rest, []), []), {'Connection', "Upgrade"} = lists:keyfind('Connection', 1, Headers), {'Upgrade', "websocket"} = lists:keyfind('Upgrade', 1, Headers), @@ -223,7 +196,7 @@ ws8_single_bytes(Config) -> {ok, Handshake} = gen_tcp:recv(Socket, 0, 6000), {ok, {http_response, {1, 1}, 101, "Switching Protocols"}, Rest} = erlang:decode_packet(http, Handshake, []), - [Headers, <<>>] = websocket_headers( + [Headers, <<>>] = do_decode_headers( erlang:decode_packet(httph, Rest, []), []), {'Connection', "Upgrade"} = lists:keyfind('Connection', 1, Headers), {'Upgrade', "websocket"} = lists:keyfind('Upgrade', 1, Headers), @@ -283,7 +256,7 @@ ws13(Config) -> {ok, Handshake} = gen_tcp:recv(Socket, 0, 6000), {ok, {http_response, {1, 1}, 101, "Switching Protocols"}, Rest} = erlang:decode_packet(http, Handshake, []), - [Headers, <<>>] = websocket_headers( + [Headers, <<>>] = do_decode_headers( erlang:decode_packet(httph, Rest, []), []), {'Connection', "Upgrade"} = lists:keyfind('Connection', 1, Headers), {'Upgrade', "websocket"} = lists:keyfind('Upgrade', 1, Headers), @@ -335,7 +308,7 @@ ws_deflate(Config) -> {ok, Handshake} = gen_tcp:recv(Socket, 0, 6000), {ok, {http_response, {1, 1}, 101, "Switching Protocols"}, Rest} = erlang:decode_packet(http, Handshake, []), - [Headers, <<>>] = websocket_headers( + [Headers, <<>>] = do_decode_headers( erlang:decode_packet(httph, Rest, []), []), {'Connection', "Upgrade"} = lists:keyfind('Connection', 1, Headers), {'Upgrade', "websocket"} = lists:keyfind('Upgrade', 1, Headers), @@ -346,7 +319,7 @@ ws_deflate(Config) -> Mask = 16#11223344, Hello = << 242, 72, 205, 201, 201, 7, 0 >>, - MaskedHello = websocket_mask(Hello, Mask, <<>>), + MaskedHello = do_mask(Hello, Mask, <<>>), % send compressed text frame containing the Hello string ok = gen_tcp:send(Socket, << 1:1, 1:1, 0:2, 1:4, 1:1, 7:7, Mask:32, @@ -377,7 +350,7 @@ ws_deflate_chunks(Config) -> {ok, Handshake} = gen_tcp:recv(Socket, 0, 6000), {ok, {http_response, {1, 1}, 101, "Switching Protocols"}, Rest} = erlang:decode_packet(http, Handshake, []), - [Headers, <<>>] = websocket_headers( + [Headers, <<>>] = do_decode_headers( erlang:decode_packet(httph, Rest, []), []), {'Connection', "Upgrade"} = lists:keyfind('Connection', 1, Headers), {'Upgrade', "websocket"} = lists:keyfind('Upgrade', 1, Headers), @@ -388,7 +361,7 @@ ws_deflate_chunks(Config) -> Mask = 16#11223344, Hello = << 242, 72, 205, 201, 201, 7, 0 >>, - MaskedHello = websocket_mask(Hello, Mask, <<>>), + MaskedHello = do_mask(Hello, Mask, <<>>), % send compressed text frame containing the Hello string ok = gen_tcp:send(Socket, << 1:1, 1:1, 0:2, 1:4, 1:1, 7:7, Mask:32, @@ -422,7 +395,7 @@ ws_deflate_fragments(Config) -> {ok, Handshake} = gen_tcp:recv(Socket, 0, 6000), {ok, {http_response, {1, 1}, 101, "Switching Protocols"}, Rest} = erlang:decode_packet(http, Handshake, []), - [Headers, <<>>] = websocket_headers( + [Headers, <<>>] = do_decode_headers( erlang:decode_packet(httph, Rest, []), []), {'Connection', "Upgrade"} = lists:keyfind('Connection', 1, Headers), {'Upgrade', "websocket"} = lists:keyfind('Upgrade', 1, Headers), @@ -437,9 +410,9 @@ ws_deflate_fragments(Config) -> % send compressed text frame containing the Hello string % as 2 separate fragments ok = gen_tcp:send(Socket, << 0:1, 1:1, 0:2, 1:4, 1:1, 4:7, Mask:32, - (websocket_mask(binary:part(Hello, 0, 4), Mask, <<>>))/binary >>), + (do_mask(binary:part(Hello, 0, 4), Mask, <<>>))/binary >>), ok = gen_tcp:send(Socket, << 1:1, 1:1, 0:2, 0:4, 1:1, 3:7, Mask:32, - (websocket_mask(binary:part(Hello, 4, 3), Mask, <<>>))/binary >>), + (do_mask(binary:part(Hello, 4, 3), Mask, <<>>))/binary >>), % receive compressed text frame containing the Hello string {ok, << 1:1, 1:1, 0:2, 1:4, 0:1, 7:7, Hello/binary >>} = gen_tcp:recv(Socket, 0, 6000), @@ -465,7 +438,7 @@ ws_send_close(Config) -> {ok, Handshake} = gen_tcp:recv(Socket, 0, 6000), {ok, {http_response, {1, 1}, 101, "Switching Protocols"}, Rest} = erlang:decode_packet(http, Handshake, []), - [Headers, <<>>] = websocket_headers( + [Headers, <<>>] = do_decode_headers( erlang:decode_packet(httph, Rest, []), []), {'Connection', "Upgrade"} = lists:keyfind('Connection', 1, Headers), {'Upgrade', "websocket"} = lists:keyfind('Upgrade', 1, Headers), @@ -494,7 +467,7 @@ ws_send_close_payload(Config) -> {ok, Handshake} = gen_tcp:recv(Socket, 0, 6000), {ok, {http_response, {1, 1}, 101, "Switching Protocols"}, Rest} = erlang:decode_packet(http, Handshake, []), - [Headers, <<>>] = websocket_headers( + [Headers, <<>>] = do_decode_headers( erlang:decode_packet(httph, Rest, []), []), {'Connection', "Upgrade"} = lists:keyfind('Connection', 1, Headers), {'Upgrade', "websocket"} = lists:keyfind('Upgrade', 1, Headers), @@ -523,7 +496,7 @@ ws_send_many(Config) -> {ok, Handshake} = gen_tcp:recv(Socket, 0, 6000), {ok, {http_response, {1, 1}, 101, "Switching Protocols"}, Rest} = erlang:decode_packet(http, Handshake, []), - [Headers, <<>>] = websocket_headers( + [Headers, <<>>] = do_decode_headers( erlang:decode_packet(httph, Rest, []), []), {'Connection', "Upgrade"} = lists:keyfind('Connection', 1, Headers), {'Upgrade', "websocket"} = lists:keyfind('Upgrade', 1, Headers), @@ -555,7 +528,7 @@ ws_text_fragments(Config) -> {ok, Handshake} = gen_tcp:recv(Socket, 0, 6000), {ok, {http_response, {1, 1}, 101, "Switching Protocols"}, Rest} = erlang:decode_packet(http, Handshake, []), - [Headers, <<>>] = websocket_headers( + [Headers, <<>>] = do_decode_headers( erlang:decode_packet(httph, Rest, []), []), {'Connection', "Upgrade"} = lists:keyfind('Connection', 1, Headers), {'Upgrade', "websocket"} = lists:keyfind('Upgrade', 1, Headers), @@ -609,7 +582,7 @@ ws_timeout_hibernate(Config) -> {ok, Handshake} = gen_tcp:recv(Socket, 0, 6000), {ok, {http_response, {1, 1}, 101, "Switching Protocols"}, Rest} = erlang:decode_packet(http, Handshake, []), - [Headers, <<>>] = websocket_headers( + [Headers, <<>>] = do_decode_headers( erlang:decode_packet(httph, Rest, []), []), {'Connection', "Upgrade"} = lists:keyfind('Connection', 1, Headers), {'Upgrade', "websocket"} = lists:keyfind('Upgrade', 1, Headers), @@ -636,7 +609,7 @@ ws_timeout_cancel(Config) -> {ok, Handshake} = gen_tcp:recv(Socket, 0, 6000), {ok, {http_response, {1, 1}, 101, "Switching Protocols"}, Rest} = erlang:decode_packet(http, Handshake, []), - [Headers, <<>>] = websocket_headers( + [Headers, <<>>] = do_decode_headers( erlang:decode_packet(httph, Rest, []), []), {'Connection', "Upgrade"} = lists:keyfind('Connection', 1, Headers), {'Upgrade', "websocket"} = lists:keyfind('Upgrade', 1, Headers), @@ -663,7 +636,7 @@ ws_timeout_reset(Config) -> {ok, Handshake} = gen_tcp:recv(Socket, 0, 6000), {ok, {http_response, {1, 1}, 101, "Switching Protocols"}, Rest} = erlang:decode_packet(http, Handshake, []), - [Headers, <<>>] = websocket_headers( + [Headers, <<>>] = do_decode_headers( erlang:decode_packet(httph, Rest, []), []), {'Connection', "Upgrade"} = lists:keyfind('Connection', 1, Headers), {'Upgrade', "websocket"} = lists:keyfind('Upgrade', 1, Headers), @@ -696,7 +669,7 @@ ws_upgrade_with_opts(Config) -> {ok, Handshake} = gen_tcp:recv(Socket, 0, 6000), {ok, {http_response, {1, 1}, 101, "Switching Protocols"}, Rest} = erlang:decode_packet(http, Handshake, []), - [Headers, <<>>] = websocket_headers( + [Headers, <<>>] = do_decode_headers( erlang:decode_packet(httph, Rest, []), []), {'Connection', "Upgrade"} = lists:keyfind('Connection', 1, Headers), {'Upgrade', "websocket"} = lists:keyfind('Upgrade', 1, Headers), @@ -711,27 +684,27 @@ ws_upgrade_with_opts(Config) -> %% Internal. -websocket_headers({ok, http_eoh, Rest}, Acc) -> +do_decode_headers({ok, http_eoh, Rest}, Acc) -> [Acc, Rest]; -websocket_headers({ok, {http_header, _I, Key, _R, Value}, Rest}, Acc) -> +do_decode_headers({ok, {http_header, _I, Key, _R, Value}, Rest}, Acc) -> F = fun(S) when is_atom(S) -> S; (S) -> string:to_lower(S) end, - websocket_headers(erlang:decode_packet(httph, Rest, []), + do_decode_headers(erlang:decode_packet(httph, Rest, []), [{F(Key), Value}|Acc]). -websocket_mask(<<>>, _, Unmasked) -> - Unmasked; -websocket_mask(<< O:32, Rest/bits >>, MaskKey, Acc) -> +do_mask(<<>>, _, Acc) -> + Acc; +do_mask(<< O:32, Rest/bits >>, MaskKey, Acc) -> T = O bxor MaskKey, - websocket_mask(Rest, MaskKey, << Acc/binary, T:32 >>); -websocket_mask(<< O:24 >>, MaskKey, Acc) -> + do_mask(Rest, MaskKey, << Acc/binary, T:32 >>); +do_mask(<< O:24 >>, MaskKey, Acc) -> << MaskKey2:24, _:8 >> = << MaskKey:32 >>, T = O bxor MaskKey2, << Acc/binary, T:24 >>; -websocket_mask(<< O:16 >>, MaskKey, Acc) -> +do_mask(<< O:16 >>, MaskKey, Acc) -> << MaskKey2:16, _:16 >> = << MaskKey:32 >>, T = O bxor MaskKey2, << Acc/binary, T:16 >>; -websocket_mask(<< O:8 >>, MaskKey, Acc) -> +do_mask(<< O:8 >>, MaskKey, Acc) -> << MaskKey2:8, _:24 >> = << MaskKey:32 >>, T = O bxor MaskKey2, << Acc/binary, T:8 >>. diff --git a/test/ws_SUITE_data/client.json b/test/ws_SUITE_data/client.json new file mode 100644 index 0000000..7899503 --- /dev/null +++ b/test/ws_SUITE_data/client.json @@ -0,0 +1,14 @@ +{ + "options": {"failByDrop": false}, + "enable-ssl": false, + + "servers": [{ + "agent": "Cowboy", + "url": "ws://localhost:33080/ws_echo", + "options": {"version": 18} + }], + + "cases": ["*"], + "exclude-cases": [], + "exclude-agent-cases": {} +} |