Merge pull request #8178 from thalesmg/fix-connack-auth-err-mqtt3-50

fix(metrics): inc `connack.auth_error` when using MQTT 3.1 (5.0)

apps/emqx/src/emqx_metrics.erl

@@ -484,8 +484,12 @@ inc_sent(Packet) ->
 
 do_inc_sent(?CONNACK_PACKET(ReasonCode)) ->
     (ReasonCode == ?RC_SUCCESS) orelse inc('packets.connack.error'),
-    (ReasonCode == ?RC_NOT_AUTHORIZED) andalso inc('packets.connack.auth_error'),
+    ((ReasonCode == ?RC_NOT_AUTHORIZED) orelse
-    (ReasonCode == ?RC_BAD_USER_NAME_OR_PASSWORD) andalso inc('packets.connack.auth_error'),
+        (ReasonCode == ?CONNACK_AUTH)) andalso
+        inc('packets.connack.auth_error'),
+    ((ReasonCode == ?RC_BAD_USER_NAME_OR_PASSWORD) orelse
+        (ReasonCode == ?CONNACK_CREDENTIALS)) andalso
+        inc('packets.connack.auth_error'),
     inc('packets.connack.sent');
 do_inc_sent(?PUBLISH_PACKET(QoS)) ->
     inc('messages.sent'),

apps/emqx/test/emqx_broker_SUITE.erl

@@ -678,6 +678,43 @@ t_connect_client_never_negative(Config) when is_list(Config) ->
 t_connect_client_never_negative({'end', _Config}) ->
     ok.
 
+t_connack_auth_error({init, Config}) ->
+    process_flag(trap_exit, true),
+    ChainName = 'mqtt:global',
+    AuthenticatorConfig = #{
+        enable => true,
+        mechanism => password_based,
+        backend => built_in_database,
+        user_id_type => username,
+        password_hash_algorithm => #{
+            name => plain,
+            salt_position => disable
+        },
+        user_group => <<"global:mqtt">>
+    },
+    ok = emqx_authentication:register_providers(
+        [{{password_based, built_in_database}, emqx_authentication_SUITE}]
+    ),
+    emqx_authentication:initialize_authentication(ChainName, AuthenticatorConfig),
+    Config;
+t_connack_auth_error({'end', _Config}) ->
+    ChainName = 'mqtt:global',
+    AuthenticatorID = <<"password_based:built_in_database">>,
+    ok = emqx_authentication:deregister_provider({password_based, built_in_database}),
+    ok = emqx_authentication:delete_authenticator(ChainName, AuthenticatorID),
+    ok;
+t_connack_auth_error(Config) when is_list(Config) ->
+    %% MQTT 3.1
+    ?assertEqual(0, emqx_metrics:val('packets.connack.auth_error')),
+    {ok, C0} = emqtt:start_link([{proto_ver, v4}]),
+    ?assertEqual({error, {malformed_username_or_password, undefined}}, emqtt:connect(C0)),
+    ?assertEqual(1, emqx_metrics:val('packets.connack.auth_error')),
+    %% MQTT 5.0
+    {ok, C1} = emqtt:start_link([{proto_ver, v5}]),
+    ?assertEqual({error, {bad_username_or_password, #{}}}, emqtt:connect(C1)),
+    ?assertEqual(2, emqx_metrics:val('packets.connack.auth_error')),
+    ok.
+
 wait_for_events(Action, Kinds) ->
     wait_for_events(Action, Kinds, 500).