fix(jwt): make binary_to_number function support list type

apps/emqx_auth_jwt/src/emqx_auth_jwt.erl

@@ -26,7 +26,7 @@
         , description/0
         ]).
 
--export([binary_to_number/1]).
+-export([string_to_number/1]).
 
 %%--------------------------------------------------------------------
 %% Authentication callbacks
@@ -73,7 +73,7 @@ check_acl(ClientInfo = #{jwt_claims := Claims},
     end.
 
 is_expired(Exp) when is_binary(Exp)  ->
-    case binary_to_number(Exp) of
+    case string_to_number(Exp) of
         {ok, Val} ->
             is_expired(Val);
         _ ->
@@ -89,17 +89,12 @@ is_expired(Exp) ->
 
 description() -> "Authentication with JWT".
 
-binary_to_number(Bin) ->
+string_to_number(Bin) when is_binary(Bin) ->
-    try
+    string_to_number(Bin, fun erlang:binary_to_integer/1, fun erlang:binary_to_float/1);
-        {ok, erlang:binary_to_integer(Bin)}
+string_to_number(Str) when is_list(Str) ->
-    catch _:_ ->
+    string_to_number(Str, fun erlang:list_to_integer/1, fun erlang:list_to_float/1);
-        try
+string_to_number(_) ->
-            Val = erlang:binary_to_float(Bin),
+    false.
-            {ok, erlang:round(Val)}
-        catch _:_ ->
-            false
-        end
-    end.
 
 %%------------------------------------------------------------------------------
 %% Verify Claims
@@ -145,3 +140,14 @@ match_topic(ClientInfo, AclTopic, Topic) ->
     TopicWords = emqx_topic:words(Topic),
     AclTopicRendered = emqx_access_rule:feed_var(ClientInfo, AclTopicWords),
     emqx_topic:match(TopicWords, AclTopicRendered).
+
+string_to_number(Str, IntFun, FloatFun) ->
+    try
+        {ok, IntFun(Str)}
+    catch _:_ ->
+        try
+            {ok, FloatFun(Str)}
+        catch _:_ ->
+            false
+        end
+    end.

apps/emqx_auth_jwt/src/emqx_auth_jwt_svr.erl

@@ -215,13 +215,13 @@ with_int_value(Fun) ->
             case Value of
                 Int when is_integer(Int) -> Fun(Int);
                 Bin when is_binary(Bin) ->
-                    case emqx_auth_jwt:binary_to_number(Bin) of
+                    case emqx_auth_jwt:string_to_number(Bin) of
-                        {ok, Int} -> Fun(Int);
+                        {ok, Num} -> Fun(Num);
                         _ -> false
                     end;
                 Str when is_list(Str) ->
-                    case emqx_auth_jwt:binary_to_number(Str) of
+                    case emqx_auth_jwt:string_to_number(Str) of
-                        {ok, Int} -> Fun(Int);
+                        {ok, Num} -> Fun(Num);
                         _ -> false
                     end
             end