firest 2 лет назад
Родитель
Сommit
baeb96a6e4
2 измененных файлов с 5 добавлено и 10 удалено
  1. 4 10
      apps/emqx_resource/src/emqx_resource_manager.erl
  2. 1 0
      changes/ce/perf-10511.en.md

+ 4 - 10
apps/emqx_resource/src/emqx_resource_manager.erl

@@ -387,7 +387,7 @@ handle_event(EventType, EventData, State, Data) ->
             event_type => EventType,
             event_type => EventType,
             event_data => EventData,
             event_data => EventData,
             state => State,
             state => State,
-            data => redact_data(Data)
+            data => emqx_utils:redact(Data)
         }
         }
     ),
     ),
     keep_state_and_data.
     keep_state_and_data.
@@ -397,15 +397,15 @@ log_state_consistency(State, #data{status = State} = Data) ->
 log_state_consistency(State, Data) ->
 log_state_consistency(State, Data) ->
     ?tp(warning, "inconsistent_state", #{
     ?tp(warning, "inconsistent_state", #{
         state => State,
         state => State,
-        data => redact_data(Data)
+        data => emqx_utils:redact(Data)
     }).
     }).
 
 
 log_cache_consistency(Data, Data) ->
 log_cache_consistency(Data, Data) ->
     ok;
     ok;
 log_cache_consistency(DataCached, Data) ->
 log_cache_consistency(DataCached, Data) ->
     ?tp(warning, "inconsistent_cache", #{
     ?tp(warning, "inconsistent_cache", #{
-        cache => redact_data(DataCached),
-        data => redact_data(Data)
+        cache => emqx_utils:redact(DataCached),
+        data => emqx_utils:redact(Data)
     }).
     }).
 
 
 %%------------------------------------------------------------------------------
 %%------------------------------------------------------------------------------
@@ -661,9 +661,3 @@ safe_call(ResId, Message, Timeout) ->
         exit:{timeout, _} ->
         exit:{timeout, _} ->
             {error, timeout}
             {error, timeout}
     end.
     end.
-
-%% the config and state of a bridge often contains some sensitive data
-%% we shouldn't expose them to logs
-redact_data(Data) ->
-    Msg = <<"this data is redacted due to security reasons">>,
-    Data#data{config = Msg, state = Msg}.

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

@@ -0,0 +1 @@
+Improve the security and privacy of some resource logs by masking sensitive information in the data.