From a55679b231b61e7d2269142efa337ae6face2343 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Hoguin?= Date: Tue, 14 Jun 2016 11:30:42 +0200 Subject: Fix rest_basic_auth example --- examples/rest_basic_auth/README.asciidoc | 114 ++++++++++++++++++++- .../rest_basic_auth/src/rest_basic_auth_app.erl | 6 +- 2 files changed, 116 insertions(+), 4 deletions(-) (limited to 'examples') diff --git a/examples/rest_basic_auth/README.asciidoc b/examples/rest_basic_auth/README.asciidoc index 04609b3..ce7ef26 100644 --- a/examples/rest_basic_auth/README.asciidoc +++ b/examples/rest_basic_auth/README.asciidoc @@ -9,7 +9,7 @@ $ make run Then point your browser to http://localhost:8080 -== Example output +== HTTP/1.1 example output Request with no authentication: @@ -38,3 +38,115 @@ content-type: text/plain Hello, Alladin! ---- + +== HTTP/2 example output + +Request with no authentication: + +[source,bash] +---- +$ nghttp -v http://localhost:8080 +[ 0.000] Connected +[ 0.000] send SETTINGS frame + (niv=2) + [SETTINGS_MAX_CONCURRENT_STREAMS(0x03):100] + [SETTINGS_INITIAL_WINDOW_SIZE(0x04):65535] +[ 0.000] send PRIORITY frame + (dep_stream_id=0, weight=201, exclusive=0) +[ 0.000] send PRIORITY frame + (dep_stream_id=0, weight=101, exclusive=0) +[ 0.000] send PRIORITY frame + (dep_stream_id=0, weight=1, exclusive=0) +[ 0.000] send PRIORITY frame + (dep_stream_id=7, weight=1, exclusive=0) +[ 0.000] send PRIORITY frame + (dep_stream_id=3, weight=1, exclusive=0) +[ 0.000] send HEADERS frame + ; END_STREAM | END_HEADERS | PRIORITY + (padlen=0, dep_stream_id=11, weight=16, exclusive=0) + ; Open new stream + :method: GET + :path: / + :scheme: http + :authority: localhost:8080 + accept: */* + accept-encoding: gzip, deflate + user-agent: nghttp2/1.7.1 +[ 0.004] recv SETTINGS frame + (niv=0) +[ 0.004] recv SETTINGS frame + ; ACK + (niv=0) +[ 0.004] send SETTINGS frame + ; ACK + (niv=0) +[ 0.004] recv (stream_id=13) :status: 401 +[ 0.004] recv (stream_id=13) content-length: 0 +[ 0.004] recv (stream_id=13) date: Tue, 14 Jun 2016 09:15:56 GMT +[ 0.004] recv (stream_id=13) server: Cowboy +[ 0.004] recv (stream_id=13) www-authenticate: Basic realm="cowboy" +[ 0.004] recv HEADERS frame + ; END_HEADERS + (padlen=0) + ; First response header +[ 0.004] recv DATA frame + ; END_STREAM +[ 0.004] send GOAWAY frame + (last_stream_id=0, error_code=NO_ERROR(0x00), opaque_data(0)=[]) +---- + +Request with authentication: + +[source,bash] +---- +$ nghttp -v -H "Authorization: Basic `echo -n Alladin:open sesame | base64`" http://localhost:8080 +[ 0.000] Connected +[ 0.000] send SETTINGS frame + (niv=2) + [SETTINGS_MAX_CONCURRENT_STREAMS(0x03):100] + [SETTINGS_INITIAL_WINDOW_SIZE(0x04):65535] +[ 0.000] send PRIORITY frame + (dep_stream_id=0, weight=201, exclusive=0) +[ 0.000] send PRIORITY frame + (dep_stream_id=0, weight=101, exclusive=0) +[ 0.000] send PRIORITY frame + (dep_stream_id=0, weight=1, exclusive=0) +[ 0.000] send PRIORITY frame + (dep_stream_id=7, weight=1, exclusive=0) +[ 0.001] send PRIORITY frame + (dep_stream_id=3, weight=1, exclusive=0) +[ 0.001] send HEADERS frame + ; END_STREAM | END_HEADERS | PRIORITY + (padlen=0, dep_stream_id=11, weight=16, exclusive=0) + ; Open new stream + :method: GET + :path: / + :scheme: http + :authority: localhost:8080 + accept: */* + accept-encoding: gzip, deflate + user-agent: nghttp2/1.7.1 + authorization: Basic QWxsYWRpbjpvcGVuIHNlc2FtZQ== +[ 0.002] recv SETTINGS frame + (niv=0) +[ 0.002] recv SETTINGS frame + ; ACK + (niv=0) +[ 0.002] send SETTINGS frame + ; ACK + (niv=0) +[ 0.004] recv (stream_id=13) :status: 200 +[ 0.004] recv (stream_id=13) content-length: 16 +[ 0.004] recv (stream_id=13) content-type: text/plain +[ 0.004] recv (stream_id=13) date: Tue, 14 Jun 2016 09:15:48 GMT +[ 0.004] recv (stream_id=13) server: Cowboy +[ 0.004] recv HEADERS frame + ; END_HEADERS + (padlen=0) + ; First response header +Hello, Alladin! +[ 0.004] recv DATA frame + ; END_STREAM +[ 0.004] send GOAWAY frame + (last_stream_id=0, error_code=NO_ERROR(0x00), opaque_data(0)=[]) +---- diff --git a/examples/rest_basic_auth/src/rest_basic_auth_app.erl b/examples/rest_basic_auth/src/rest_basic_auth_app.erl index c19349d..cc1718d 100644 --- a/examples/rest_basic_auth/src/rest_basic_auth_app.erl +++ b/examples/rest_basic_auth/src/rest_basic_auth_app.erl @@ -16,9 +16,9 @@ start(_Type, _Args) -> {"/", toppage_handler, []} ]} ]), - {ok, _} = cowboy:start_http(http, 100, [{port, 8080}], [ - {env, [{dispatch, Dispatch}]} - ]), + {ok, _} = cowboy:start_clear(http, 100, [{port, 8080}], #{ + env => #{dispatch => Dispatch} + }), rest_basic_auth_sup:start_link(). stop(_State) -> -- cgit v1.2.3