yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore(gw): fix zone name

This commit is contained in:
JianBo He 2021-08-03 16:51:57 +08:00
parent f36c523ae8
commit 1b2f732f13
4 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/emqx_gateway/src/exproto/emqx_exproto_channel.erl
View File

@ -588,7 +588,7 @@ default_conninfo(ConnInfo) ->
default_clientinfo(#{peername := {PeerHost, _}, default_clientinfo(#{peername := {PeerHost, _},
sockname := {_, SockPort}}) -> sockname := {_, SockPort}}) ->
#{zone => external, #{zone => default,
protocol => undefined, protocol => undefined,
peerhost => PeerHost, peerhost => PeerHost,
sockport => SockPort, sockport => SockPort,

2
apps/emqx_gateway/src/mqttsn/emqx_sn_channel.erl
View File

@ -119,7 +119,7 @@ init(ConnInfo = #{peername := {PeerHost, _},
EnableQoS3 = maps:get(enable_qos3, Option, true), EnableQoS3 = maps:get(enable_qos3, Option, true),
ClientInfo = set_peercert_infos( ClientInfo = set_peercert_infos(
Peercert, Peercert,
#{ zone => undefined %% XXX: #{ zone => default
, protocol => 'mqtt-sn' , protocol => 'mqtt-sn'
, peerhost => PeerHost , peerhost => PeerHost
, sockport => SockPort , sockport => SockPort

14
apps/emqx_gateway/test/emqx_exproto_SUITE.erl
View File

@ -139,9 +139,9 @@ t_auth_deny(Cfg) ->
}, },
Password = <<"123456">>, Password = <<"123456">>,
ok = meck:new(emqx_access_control, [passthrough, no_history, no_link]), ok = meck:new(emqx_gateway_ctx, [passthrough, no_history, no_link]),
ok = meck:expect(emqx_access_control, authenticate, ok = meck:expect(emqx_gateway_ctx, authenticate,
fun(_) -> {error, ?RC_NOT_AUTHORIZED} end), fun(_, _) -> {error, ?RC_NOT_AUTHORIZED} end),
ConnBin = frame_connect(Client, Password), ConnBin = frame_connect(Client, Password),
ConnAckBin = frame_connack(1), ConnAckBin = frame_connack(1),
@ -152,7 +152,7 @@ t_auth_deny(Cfg) ->
SockType =/= udp andalso begin SockType =/= udp andalso begin
{error, closed} = recv(Sock, 5000) {error, closed} = recv(Sock, 5000)
end, end,
meck:unload([emqx_access_control]). meck:unload([emqx_gateway_ctx]).
t_acl_deny(Cfg) -> t_acl_deny(Cfg) ->
SockType = proplists:get_value(listener_type, Cfg), SockType = proplists:get_value(listener_type, Cfg),
@ -164,8 +164,8 @@ t_acl_deny(Cfg) ->
}, },
Password = <<"123456">>, Password = <<"123456">>,
ok = meck:new(emqx_access_control, [passthrough, no_history, no_link]), ok = meck:new(emqx_gateway_ctx, [passthrough, no_history, no_link]),
ok = meck:expect(emqx_access_control, authorize, fun(_, _, _) -> deny end), ok = meck:expect(emqx_gateway_ctx, authorize, fun(_, _, _, _) -> deny end),
ConnBin = frame_connect(Client, Password), ConnBin = frame_connect(Client, Password),
ConnAckBin = frame_connack(0), ConnAckBin = frame_connack(0),
@ -188,7 +188,7 @@ t_acl_deny(Cfg) ->
send(Sock, PubBin), send(Sock, PubBin),
{ok, PubBinFailedAck} = recv(Sock, 5000), {ok, PubBinFailedAck} = recv(Sock, 5000),
meck:unload([emqx_access_control]), meck:unload([emqx_gateway_ctx]),
send(Sock, PubBin), send(Sock, PubBin),
{ok, PubBinSuccesAck} = recv(Sock, 5000), {ok, PubBinSuccesAck} = recv(Sock, 5000),

1
apps/emqx_gateway/test/emqx_stomp_SUITE.erl
View File

@ -26,7 +26,6 @@
-define(CONF_DEFAULT, <<""" -define(CONF_DEFAULT, <<"""
gateway: { gateway: {
stomp.1: { stomp.1: {
authenticator: allow_anonymous
clientinfo_override: { clientinfo_override: {
username: \"${Packet.headers.login}\" username: \"${Packet.headers.login}\"
password: \"${Packet.headers.passcode}\" password: \"${Packet.headers.passcode}\"