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

feat(kafka): accept wrapped secrets as passwords

This commit is contained in:
Andrew Mayorov 2023-11-07 23:14:01 +07:00
parent 9c5856029f
commit c300eb41a7
No known key found for this signature in database
GPG Key ID: 2837C62ACFBFED5D
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/emqx_bridge_kafka/src/emqx_bridge_kafka.erl
View File

@ -283,11 +283,9 @@ fields(auth_username_password) ->
})}, })},
{username, mk(binary(), #{required => true, desc => ?DESC(auth_sasl_username)})}, {username, mk(binary(), #{required => true, desc => ?DESC(auth_sasl_username)})},
{password, {password,
mk(binary(), #{ emqx_connector_schema_lib:password_field(#{
required => true, required => true,
sensitive => true, desc => ?DESC(auth_sasl_password)
desc => ?DESC(auth_sasl_password),
converter => fun emqx_schema:password_converter/2
})} })}
]; ];
fields(auth_gssapi_kerberos) -> fields(auth_gssapi_kerberos) ->

4
apps/emqx_bridge_kafka/src/emqx_bridge_kafka_impl.erl
View File

@ -31,8 +31,8 @@ make_client_id(BridgeType0, BridgeName0) ->
sasl(none) -> sasl(none) ->
undefined; undefined;
sasl(#{mechanism := Mechanism, username := Username, password := Password}) -> sasl(#{mechanism := Mechanism, username := Username, password := Secret}) ->
{Mechanism, Username, emqx_secret:wrap(Password)}; {Mechanism, Username, Secret};
sasl(#{ sasl(#{
kerberos_principal := Principal, kerberos_principal := Principal,
kerberos_keytab_file := KeyTabFile kerberos_keytab_file := KeyTabFile