From 60492615ba136c8c7efc9497d4a6c93943911a3f Mon Sep 17 00:00:00 2001
From: firest <blankalupo@163.com>
Date: Tue, 1 Nov 2022 15:49:02 +0800
Subject: [PATCH] fix(API): Ensure that the node name is known

---
 .../src/emqx_dashboard_monitor_api.erl        | 20 ++++++++++++-----
 .../src/emqx_gateway_api_clients.erl          | 22 +++++++++++--------
 .../src/emqx_mgmt_api_clients.erl             | 22 +++++++++++--------
 .../src/emqx_mgmt_api_subscriptions.erl       | 19 ++++++++++------
 4 files changed, 52 insertions(+), 31 deletions(-)

diff --git a/apps/emqx_dashboard/src/emqx_dashboard_monitor_api.erl b/apps/emqx_dashboard/src/emqx_dashboard_monitor_api.erl
index e3ea870af..50349bc40 100644
--- a/apps/emqx_dashboard/src/emqx_dashboard_monitor_api.erl
+++ b/apps/emqx_dashboard/src/emqx_dashboard_monitor_api.erl
@@ -131,12 +131,20 @@ monitor(get, #{query_string := QS, bindings := Bindings}) ->
     end.
 
 monitor_current(get, #{bindings := Bindings}) ->
-    NodeOrCluster = binary_to_atom(maps:get(node, Bindings, <<"all">>), utf8),
-    case emqx_dashboard_monitor:current_rate(NodeOrCluster) of
-        {ok, CurrentRate} ->
-            {200, CurrentRate};
-        {badrpc, {Node, Reason}} ->
-            Message = list_to_binary(io_lib:format("Bad node ~p, rpc failed ~p", [Node, Reason])),
+    RawNode = maps:get(node, Bindings, all),
+    case emqx_misc:safe_to_existing_atom(RawNode, utf8) of
+        {ok, NodeOrCluster} ->
+            case emqx_dashboard_monitor:current_rate(NodeOrCluster) of
+                {ok, CurrentRate} ->
+                    {200, CurrentRate};
+                {badrpc, {Node, Reason}} ->
+                    Message = list_to_binary(
+                        io_lib:format("Bad node ~p, rpc failed ~p", [Node, Reason])
+                    ),
+                    {400, 'BAD_RPC', Message}
+            end;
+        {error, _} ->
+            Message = list_to_binary(io_lib:format("Bad node ~p", [RawNode])),
             {400, 'BAD_RPC', Message}
     end.
 
diff --git a/apps/emqx_gateway/src/emqx_gateway_api_clients.erl b/apps/emqx_gateway/src/emqx_gateway_api_clients.erl
index ab82a4716..d5e7791ed 100644
--- a/apps/emqx_gateway/src/emqx_gateway_api_clients.erl
+++ b/apps/emqx_gateway/src/emqx_gateway_api_clients.erl
@@ -113,15 +113,19 @@ clients(get, #{
                         ?QUERY_FUN
                     );
                 Node0 ->
-                    Node1 = binary_to_atom(Node0, utf8),
-                    QStringWithoutNode = maps:without([<<"node">>], QString),
-                    emqx_mgmt_api:node_query(
-                        Node1,
-                        QStringWithoutNode,
-                        TabName,
-                        ?CLIENT_QSCHEMA,
-                        ?QUERY_FUN
-                    )
+                    case emqx_misc:safe_to_existing_atom(Node0) of
+                        {ok, Node1} ->
+                            QStringWithoutNode = maps:without([<<"node">>], QString),
+                            emqx_mgmt_api:node_query(
+                                Node1,
+                                QStringWithoutNode,
+                                TabName,
+                                ?CLIENT_QSCHEMA,
+                                ?QUERY_FUN
+                            );
+                        {error, _} ->
+                            {error, Node0, {badrpc, <<"invalid node">>}}
+                    end
             end,
         case Result of
             {error, page_limit_invalid} ->
diff --git a/apps/emqx_management/src/emqx_mgmt_api_clients.erl b/apps/emqx_management/src/emqx_mgmt_api_clients.erl
index 19bf63f66..beff0d53e 100644
--- a/apps/emqx_management/src/emqx_mgmt_api_clients.erl
+++ b/apps/emqx_management/src/emqx_mgmt_api_clients.erl
@@ -648,15 +648,19 @@ list_clients(QString) ->
                     ?QUERY_FUN
                 );
             Node0 ->
-                Node1 = binary_to_atom(Node0, utf8),
-                QStringWithoutNode = maps:without([<<"node">>], QString),
-                emqx_mgmt_api:node_query(
-                    Node1,
-                    QStringWithoutNode,
-                    ?CLIENT_QTAB,
-                    ?CLIENT_QSCHEMA,
-                    ?QUERY_FUN
-                )
+                case emqx_misc:safe_to_existing_atom(Node0) of
+                    {ok, Node1} ->
+                        QStringWithoutNode = maps:without([<<"node">>], QString),
+                        emqx_mgmt_api:node_query(
+                            Node1,
+                            QStringWithoutNode,
+                            ?CLIENT_QTAB,
+                            ?CLIENT_QSCHEMA,
+                            ?QUERY_FUN
+                        );
+                    {error, _} ->
+                        {error, Node0, {badrpc, <<"invalid node">>}}
+                end
         end,
     case Result of
         {error, page_limit_invalid} ->
diff --git a/apps/emqx_management/src/emqx_mgmt_api_subscriptions.erl b/apps/emqx_management/src/emqx_mgmt_api_subscriptions.erl
index 470242cfd..03b833e84 100644
--- a/apps/emqx_management/src/emqx_mgmt_api_subscriptions.erl
+++ b/apps/emqx_management/src/emqx_mgmt_api_subscriptions.erl
@@ -145,13 +145,18 @@ subscriptions(get, #{query_string := QString}) ->
                     ?QUERY_FUN
                 );
             Node0 ->
-                emqx_mgmt_api:node_query(
-                    binary_to_atom(Node0, utf8),
-                    QString,
-                    ?SUBS_QTABLE,
-                    ?SUBS_QSCHEMA,
-                    ?QUERY_FUN
-                )
+                case emqx_misc:safe_to_existing_atom(Node0) of
+                    {ok, Node1} ->
+                        emqx_mgmt_api:node_query(
+                            Node1,
+                            QString,
+                            ?SUBS_QTABLE,
+                            ?SUBS_QSCHEMA,
+                            ?QUERY_FUN
+                        );
+                    {error, _} ->
+                        {error, Node0, {badrpc, <<"invalid node">>}}
+                end
         end,
     case Response of
         {error, page_limit_invalid} ->