From 277deee61636717d0e518ab0952378787568201c Mon Sep 17 00:00:00 2001 From: firest Date: Thu, 4 May 2023 16:32:32 +0800 Subject: [PATCH] fix: add new sensitive keywords to redact checklist --- apps/emqx_utils/src/emqx_utils.erl | 9 +++++++++ .../emqx_ee_connector/src/emqx_ee_connector_dynamo.erl | 6 +++++- .../emqx_ee_connector/src/emqx_ee_connector_rocketmq.erl | 5 +++-- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/apps/emqx_utils/src/emqx_utils.erl b/apps/emqx_utils/src/emqx_utils.erl index 21dbd339d..5f0aa3e64 100644 --- a/apps/emqx_utils/src/emqx_utils.erl +++ b/apps/emqx_utils/src/emqx_utils.erl @@ -581,6 +581,15 @@ is_sensitive_key(<<"password">>) -> true; is_sensitive_key(secret) -> true; is_sensitive_key("secret") -> true; is_sensitive_key(<<"secret">>) -> true; +is_sensitive_key(secret_key) -> true; +is_sensitive_key("secret_key") -> true; +is_sensitive_key(<<"secret_key">>) -> true; +is_sensitive_key(security_token) -> true; +is_sensitive_key("security_token") -> true; +is_sensitive_key(<<"security_token">>) -> true; +is_sensitive_key(aws_secret_access_key) -> true; +is_sensitive_key("aws_secret_access_key") -> true; +is_sensitive_key(<<"aws_secret_access_key">>) -> true; is_sensitive_key(_) -> false. redact(Term) -> diff --git a/lib-ee/emqx_ee_connector/src/emqx_ee_connector_dynamo.erl b/lib-ee/emqx_ee_connector/src/emqx_ee_connector_dynamo.erl index 4b8392725..9752c1866 100644 --- a/lib-ee/emqx_ee_connector/src/emqx_ee_connector_dynamo.erl +++ b/lib-ee/emqx_ee_connector/src/emqx_ee_connector_dynamo.erl @@ -48,7 +48,11 @@ fields(config) -> {aws_secret_access_key, mk( binary(), - #{required => true, desc => ?DESC("aws_secret_access_key")} + #{ + required => true, + desc => ?DESC("aws_secret_access_key"), + sensitive => true + } )}, {pool_size, fun emqx_connector_schema_lib:pool_size/1}, {auto_reconnect, fun emqx_connector_schema_lib:auto_reconnect/1} diff --git a/lib-ee/emqx_ee_connector/src/emqx_ee_connector_rocketmq.erl b/lib-ee/emqx_ee_connector/src/emqx_ee_connector_rocketmq.erl index 73f89491b..7fc67f369 100644 --- a/lib-ee/emqx_ee_connector/src/emqx_ee_connector_rocketmq.erl +++ b/lib-ee/emqx_ee_connector/src/emqx_ee_connector_rocketmq.erl @@ -52,9 +52,10 @@ fields(config) -> {secret_key, mk( binary(), - #{default => <<>>, desc => ?DESC("secret_key")} + #{default => <<>>, desc => ?DESC("secret_key"), sensitive => true} )}, - {security_token, mk(binary(), #{default => <<>>, desc => ?DESC(security_token)})}, + {security_token, + mk(binary(), #{default => <<>>, desc => ?DESC(security_token), sensitive => true})}, {sync_timeout, mk( emqx_schema:duration(),