Просмотр исходного кода

Merge pull request #10988 from lafirest/fix/konservi_sentema

fix(resource): improve log security when resource creation fails
lafirest 2 лет назад
Родитель
Сommit
601db2b1d3

+ 1 - 1
apps/emqx_bridge/src/emqx_bridge_api.erl

@@ -603,7 +603,7 @@ create_or_update_bridge(BridgeType, BridgeName, Conf, HttpStatusCode) ->
         {ok, _} ->
             lookup_from_all_nodes(BridgeType, BridgeName, HttpStatusCode);
         {error, Reason} when is_map(Reason) ->
-            ?BAD_REQUEST(map_to_json(Reason))
+            ?BAD_REQUEST(map_to_json(emqx_utils:redact(Reason)))
     end.
 
 get_metrics_from_local_node(BridgeType, BridgeName) ->

+ 5 - 1
apps/emqx_resource/src/emqx_resource.erl

@@ -388,7 +388,11 @@ call_start(ResId, Mod, Config) ->
         throw:Error ->
             {error, Error};
         Kind:Error:Stacktrace ->
-            {error, #{exception => Kind, reason => Error, stacktrace => Stacktrace}}
+            {error, #{
+                exception => Kind,
+                reason => Error,
+                stacktrace => emqx_utils:redact(Stacktrace)
+            }}
     end.
 
 -spec call_health_check(resource_id(), module(), resource_state()) ->

+ 1 - 0
changes/ce/perf-10988.en.md

@@ -0,0 +1 @@
+Improve log security when data bridge creation fails to ensure sensitive data is always obfuscated.