From 5ef64557b5b4c92224d68d1445cdb7846a76a0be Mon Sep 17 00:00:00 2001 From: Nelson Vides Date: Tue, 20 Apr 2021 14:58:58 +0200 Subject: Exit gracefully on {error,closed} when reading the PROXY header LH: Simplified the test a little. --- src/cowboy_clear.erl | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'src/cowboy_clear.erl') diff --git a/src/cowboy_clear.erl b/src/cowboy_clear.erl index 4f3a234..e4ca9da 100644 --- a/src/cowboy_clear.erl +++ b/src/cowboy_clear.erl @@ -33,13 +33,7 @@ start_link(Ref, Transport, Opts) -> -spec connection_process(pid(), ranch:ref(), module(), cowboy:opts()) -> ok. connection_process(Parent, Ref, Transport, Opts) -> - ProxyInfo = case maps:get(proxy_header, Opts, false) of - true -> - {ok, ProxyInfo0} = ranch:recv_proxy_header(Ref, 1000), - ProxyInfo0; - false -> - undefined - end, + ProxyInfo = get_proxy_info(Ref, Opts), {ok, Socket} = ranch:handshake(Ref), %% Use cowboy_http2 directly only when 'http' is missing. %% Otherwise switch to cowboy_http2 from cowboy_http. @@ -58,3 +52,11 @@ init(Parent, Ref, Socket, Transport, ProxyInfo, Opts, Protocol) -> supervisor -> process_flag(trap_exit, true) end, Protocol:init(Parent, Ref, Socket, Transport, ProxyInfo, Opts). + +get_proxy_info(Ref, #{proxy_header := true}) -> + case ranch:recv_proxy_header(Ref, 1000) of + {ok, ProxyInfo} -> ProxyInfo; + {error, closed} -> exit({shutdown, closed}) + end; +get_proxy_info(_, _) -> + undefined. -- cgit v1.2.3