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

Merge pull request #10595 from lafirest/fix/password_redact 

fix: add new sensitive keywords to redact checklist
This commit is contained in:
lafirest 2023-05-04 16:46:57 +08:00 committed by GitHub
parent a21dee441b 277deee616
commit e82623d0fb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
apps/emqx_utils/src/emqx_utils.erl
View File

@ -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") -> 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. is_sensitive_key(_) -> false.
redact(Term) -> redact(Term) ->

6
lib-ee/emqx_ee_connector/src/emqx_ee_connector_dynamo.erl
View File

@ -48,7 +48,11 @@ fields(config) ->
{aws_secret_access_key, {aws_secret_access_key,
mk( mk(
binary(), 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}, {pool_size, fun emqx_connector_schema_lib:pool_size/1},
{auto_reconnect, fun emqx_connector_schema_lib:auto_reconnect/1} {auto_reconnect, fun emqx_connector_schema_lib:auto_reconnect/1}

5
lib-ee/emqx_ee_connector/src/emqx_ee_connector_rocketmq.erl
View File

@ -52,9 +52,10 @@ fields(config) ->
{secret_key, {secret_key,
mk( mk(
binary(), 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, {sync_timeout,
mk( mk(
emqx_schema:duration(), emqx_schema:duration(),