yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #10511 from lafirest/fix/resource_safe_log 

fix(resource): make some logging of the resource manager more secure
This commit is contained in:
lafirest 2023-05-19 20:42:21 +08:00 committed by GitHub
parent 1aa904d019 baeb96a6e4
commit 264404e180
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apps/emqx_resource/src/emqx_resource_manager.erl
View File

@ -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 => 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 => 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 => DataCached, cache => emqx_utils:redact(DataCached),
data => Data data => emqx_utils:redact(Data)
}). }).
%%------------------------------------------------------------------------------ %%------------------------------------------------------------------------------

1
changes/ce/perf-10511.en.md Normal file
View File

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