Merge pull request #7796 from zhongwencool/fix-ws-max-connection-not-work
fix: websocket's max_connection not work
This commit is contained in:
zhongwencool
GitHub
commit
737abc5700
|
|
@ -1515,7 +1515,7 @@ base_listener() ->
|
|||
)},
|
||||
{"acceptors",
|
||||
sc(
|
||||
integer(),
|
||||
pos_integer(),
|
||||
#{
|
||||
default => 16,
|
||||
desc => ?DESC(base_listener_acceptors)
|
||||
|
|
@ -1523,7 +1523,7 @@ base_listener() ->
|
|||
)},
|
||||
{"max_connections",
|
||||
sc(
|
||||
hoconsc:union([infinity, integer()]),
|
||||
hoconsc:union([infinity, pos_integer()]),
|
||||
#{
|
||||
default => infinity,
|
||||
desc => ?DESC(base_listener_max_connections)
|
||||
|
|
|
|||
|
|
@ -272,51 +272,18 @@ check_origin_header(Req, #{listener := {Type, Listener}} = Opts) ->
|
|||
false -> ok
|
||||
end.
|
||||
|
||||
websocket_init([
|
||||
Req,
|
||||
#{zone := Zone, limiter := LimiterCfg, listener := {Type, Listener}} = Opts
|
||||
]) ->
|
||||
{Peername, Peercert} =
|
||||
case
|
||||
emqx_config:get_listener_conf(Type, Listener, [proxy_protocol]) andalso
|
||||
maps:get(proxy_header, Req)
|
||||
of
|
||||
#{src_address := SrcAddr, src_port := SrcPort, ssl := SSL} ->
|
||||
SourceName = {SrcAddr, SrcPort},
|
||||
%% Notice: Only CN is available in Proxy Protocol V2 additional info
|
||||
SourceSSL =
|
||||
case maps:get(cn, SSL, undefined) of
|
||||
undeined -> nossl;
|
||||
CN -> [{pp2_ssl_cn, CN}]
|
||||
end,
|
||||
{SourceName, SourceSSL};
|
||||
#{src_address := SrcAddr, src_port := SrcPort} ->
|
||||
SourceName = {SrcAddr, SrcPort},
|
||||
{SourceName, nossl};
|
||||
_ ->
|
||||
{get_peer(Req, Opts), cowboy_req:cert(Req)}
|
||||
end,
|
||||
websocket_init([Req, Opts]) ->
|
||||
#{zone := Zone, limiter := LimiterCfg, listener := {Type, Listener}} = Opts,
|
||||
case check_max_connection(Type, Listener) of
|
||||
allow ->
|
||||
{Peername, PeerCert} = get_peer_info(Type, Listener, Req, Opts),
|
||||
Sockname = cowboy_req:sock(Req),
|
||||
WsCookie =
|
||||
try
|
||||
cowboy_req:parse_cookies(Req)
|
||||
catch
|
||||
error:badarg ->
|
||||
?SLOG(error, #{msg => "bad_cookie"}),
|
||||
undefined;
|
||||
Error:Reason ->
|
||||
?SLOG(error, #{
|
||||
msg => "failed_to_parse_cookie",
|
||||
exception => Error,
|
||||
reason => Reason
|
||||
}),
|
||||
undefined
|
||||
end,
|
||||
WsCookie = get_ws_cookie(Req),
|
||||
ConnInfo = #{
|
||||
socktype => ws,
|
||||
peername => Peername,
|
||||
sockname => Sockname,
|
||||
peercert => Peercert,
|
||||
peercert => PeerCert,
|
||||
ws_cookie => WsCookie,
|
||||
conn_mod => ?MODULE
|
||||
},
|
||||
|
|
@ -331,28 +298,12 @@ websocket_init([
|
|||
ParseState = emqx_frame:initial_parse_state(FrameOpts),
|
||||
Serialize = emqx_frame:serialize_opts(),
|
||||
Channel = emqx_channel:init(ConnInfo, Opts),
|
||||
GcState =
|
||||
case emqx_config:get_zone_conf(Zone, [force_gc]) of
|
||||
#{enable := false} -> undefined;
|
||||
GcPolicy -> emqx_gc:init(GcPolicy)
|
||||
end,
|
||||
StatsTimer =
|
||||
case emqx_config:get_zone_conf(Zone, [stats, enable]) of
|
||||
true -> undefined;
|
||||
false -> disabled
|
||||
end,
|
||||
GcState = get_force_gc(Zone),
|
||||
StatsTimer = get_stats_enable(Zone),
|
||||
%% MQTT Idle Timeout
|
||||
IdleTimeout = emqx_channel:get_mqtt_conf(Zone, idle_timeout),
|
||||
IdleTimer = start_timer(IdleTimeout, idle_timeout),
|
||||
case
|
||||
emqx_config:get_zone_conf(
|
||||
emqx_channel:info(zone, Channel),
|
||||
[force_shutdown]
|
||||
)
|
||||
of
|
||||
#{enable := false} -> ok;
|
||||
ShutdownPolicy -> emqx_misc:tune_heap_size(ShutdownPolicy)
|
||||
end,
|
||||
tune_heap_size(Channel),
|
||||
emqx_logger:set_metadata_peername(esockd:format(Peername)),
|
||||
{ok,
|
||||
#state{
|
||||
|
|
@ -374,7 +325,70 @@ websocket_init([
|
|||
limiter_timer = undefined,
|
||||
limiter_cache = queue:new()
|
||||
},
|
||||
hibernate}.
|
||||
hibernate};
|
||||
{denny, Reason} ->
|
||||
{stop, Reason}
|
||||
end.
|
||||
|
||||
tune_heap_size(Channel) ->
|
||||
case
|
||||
emqx_config:get_zone_conf(
|
||||
emqx_channel:info(zone, Channel),
|
||||
[force_shutdown]
|
||||
)
|
||||
of
|
||||
#{enable := false} -> ok;
|
||||
ShutdownPolicy -> emqx_misc:tune_heap_size(ShutdownPolicy)
|
||||
end.
|
||||
|
||||
get_stats_enable(Zone) ->
|
||||
case emqx_config:get_zone_conf(Zone, [stats, enable]) of
|
||||
true -> undefined;
|
||||
false -> disabled
|
||||
end.
|
||||
|
||||
get_force_gc(Zone) ->
|
||||
case emqx_config:get_zone_conf(Zone, [force_gc]) of
|
||||
#{enable := false} -> undefined;
|
||||
GcPolicy -> emqx_gc:init(GcPolicy)
|
||||
end.
|
||||
|
||||
get_ws_cookie(Req) ->
|
||||
try
|
||||
cowboy_req:parse_cookies(Req)
|
||||
catch
|
||||
error:badarg ->
|
||||
?SLOG(error, #{msg => "bad_cookie"}),
|
||||
undefined;
|
||||
Error:Reason ->
|
||||
?SLOG(error, #{
|
||||
msg => "failed_to_parse_cookie",
|
||||
exception => Error,
|
||||
reason => Reason
|
||||
}),
|
||||
undefined
|
||||
end.
|
||||
|
||||
get_peer_info(Type, Listener, Req, Opts) ->
|
||||
case
|
||||
emqx_config:get_listener_conf(Type, Listener, [proxy_protocol]) andalso
|
||||
maps:get(proxy_header, Req)
|
||||
of
|
||||
#{src_address := SrcAddr, src_port := SrcPort, ssl := SSL} ->
|
||||
SourceName = {SrcAddr, SrcPort},
|
||||
%% Notice: Only CN is available in Proxy Protocol V2 additional info
|
||||
SourceSSL =
|
||||
case maps:get(cn, SSL, undefined) of
|
||||
undeined -> nossl;
|
||||
CN -> [{pp2_ssl_cn, CN}]
|
||||
end,
|
||||
{SourceName, SourceSSL};
|
||||
#{src_address := SrcAddr, src_port := SrcPort} ->
|
||||
SourceName = {SrcAddr, SrcPort},
|
||||
{SourceName, nossl};
|
||||
_ ->
|
||||
{get_peer(Req, Opts), cowboy_req:cert(Req)}
|
||||
end.
|
||||
|
||||
websocket_handle({binary, Data}, State) when is_list(Data) ->
|
||||
websocket_handle({binary, iolist_to_binary(Data)}, State);
|
||||
|
|
@ -1000,6 +1014,26 @@ get_peer(Req, #{listener := {Type, Listener}}) ->
|
|||
_:_ -> {Addr, PeerPort}
|
||||
end.
|
||||
|
||||
check_max_connection(Type, Listener) ->
|
||||
case emqx_config:get_listener_conf(Type, Listener, [max_connections]) of
|
||||
infinity ->
|
||||
allow;
|
||||
Max ->
|
||||
MatchSpec = [{{'_', emqx_ws_connection}, [], [true]}],
|
||||
Curr = ets:select_count(emqx_channel_conn, MatchSpec),
|
||||
case Curr >= Max of
|
||||
false ->
|
||||
allow;
|
||||
true ->
|
||||
Reason = #{
|
||||
max => Max,
|
||||
current => Curr,
|
||||
msg => "websocket_max_connections_limited"
|
||||
},
|
||||
?SLOG(warning, Reason),
|
||||
{denny, Reason}
|
||||
end
|
||||
end.
|
||||
%%--------------------------------------------------------------------
|
||||
%% For CT tests
|
||||
%%--------------------------------------------------------------------
|
||||
|
|
|
|||
Loading…
Reference in New Issue