ソースを参照

chore: update change

firest 1 年間 前
コミット
d2ca4e9f11

+ 1 - 1
apps/emqx_rule_engine/src/emqx_rule_api_schema.erl

@@ -289,7 +289,7 @@ fields("ctx_check_authn_complete") ->
         {"event", event_sc(Event)},
         {"event", event_sc(Event)},
         {"clientid", sc(binary(), #{desc => ?DESC("event_clientid")})},
         {"clientid", sc(binary(), #{desc => ?DESC("event_clientid")})},
         {"username", sc(binary(), #{desc => ?DESC("event_username")})},
         {"username", sc(binary(), #{desc => ?DESC("event_username")})},
-        {"peerhost", sc(binary(), #{desc => ?DESC("event_peerhost")})},
+        {"peername", sc(binary(), #{desc => ?DESC("event_peername")})},
         {"is_anonymous", sc(boolean(), #{desc => ?DESC("event_is_anonymous")})},
         {"is_anonymous", sc(boolean(), #{desc => ?DESC("event_is_anonymous")})},
         {"is_superuser", sc(boolean(), #{desc => ?DESC("event_is_superuser")})}
         {"is_superuser", sc(boolean(), #{desc => ?DESC("event_is_superuser")})}
     ];
     ];

+ 4 - 3
apps/emqx_rule_engine/src/emqx_rule_events.erl

@@ -455,7 +455,8 @@ eventmsg_check_authn_complete(
     _ClientInfo = #{
     _ClientInfo = #{
         clientid := ClientId,
         clientid := ClientId,
         username := Username,
         username := Username,
-        peerhost := PeerHost
+        peerhost := PeerHost,
+        peerport := PeerPort
     },
     },
     #{is_anonymous := IsAnonymous} = Result
     #{is_anonymous := IsAnonymous} = Result
 ) ->
 ) ->
@@ -465,7 +466,7 @@ eventmsg_check_authn_complete(
         #{
         #{
             clientid => ClientId,
             clientid => ClientId,
             username => Username,
             username => Username,
-            peerhost => ntoa(PeerHost),
+            peername => ntoa({PeerHost, PeerPort}),
             is_anonymous => IsAnonymous,
             is_anonymous => IsAnonymous,
             is_superuser => IsSuperuser
             is_superuser => IsSuperuser
         },
         },
@@ -1077,7 +1078,7 @@ columns_with_exam('client.check_authn_complete') ->
         {<<"event">>, 'client.check_authz_complete'},
         {<<"event">>, 'client.check_authz_complete'},
         {<<"clientid">>, <<"c_emqx">>},
         {<<"clientid">>, <<"c_emqx">>},
         {<<"username">>, <<"u_emqx">>},
         {<<"username">>, <<"u_emqx">>},
-        {<<"peerhost">>, <<"192.168.0.10">>},
+        {<<"peername">>, <<"192.168.0.10:56431">>},
         {<<"is_superuser">>, true},
         {<<"is_superuser">>, true},
         {<<"is_anonymous">>, false},
         {<<"is_anonymous">>, false},
         {<<"timestamp">>, erlang:system_time(millisecond)},
         {<<"timestamp">>, erlang:system_time(millisecond)},

+ 1 - 0
changes/ce/feat-12983.en.md

@@ -0,0 +1 @@
+Add new rule engine event `$events/client_check_authn_complete` for authentication completion event.