From c300eb41a71b8aad842b22414b704c2b1399628d Mon Sep 17 00:00:00 2001 From: Andrew Mayorov Date: Tue, 7 Nov 2023 23:14:01 +0700 Subject: [PATCH] feat(kafka): accept wrapped secrets as passwords --- apps/emqx_bridge_kafka/src/emqx_bridge_kafka.erl | 6 ++---- apps/emqx_bridge_kafka/src/emqx_bridge_kafka_impl.erl | 4 ++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/apps/emqx_bridge_kafka/src/emqx_bridge_kafka.erl b/apps/emqx_bridge_kafka/src/emqx_bridge_kafka.erl index 5b83a6af2..800a87601 100644 --- a/apps/emqx_bridge_kafka/src/emqx_bridge_kafka.erl +++ b/apps/emqx_bridge_kafka/src/emqx_bridge_kafka.erl @@ -283,11 +283,9 @@ fields(auth_username_password) -> })}, {username, mk(binary(), #{required => true, desc => ?DESC(auth_sasl_username)})}, {password, - mk(binary(), #{ + emqx_connector_schema_lib:password_field(#{ required => true, - sensitive => true, - desc => ?DESC(auth_sasl_password), - converter => fun emqx_schema:password_converter/2 + desc => ?DESC(auth_sasl_password) })} ]; fields(auth_gssapi_kerberos) -> diff --git a/apps/emqx_bridge_kafka/src/emqx_bridge_kafka_impl.erl b/apps/emqx_bridge_kafka/src/emqx_bridge_kafka_impl.erl index b3ad2ca36..eb8f36fb5 100644 --- a/apps/emqx_bridge_kafka/src/emqx_bridge_kafka_impl.erl +++ b/apps/emqx_bridge_kafka/src/emqx_bridge_kafka_impl.erl @@ -31,8 +31,8 @@ make_client_id(BridgeType0, BridgeName0) -> sasl(none) -> undefined; -sasl(#{mechanism := Mechanism, username := Username, password := Password}) -> - {Mechanism, Username, emqx_secret:wrap(Password)}; +sasl(#{mechanism := Mechanism, username := Username, password := Secret}) -> + {Mechanism, Username, Secret}; sasl(#{ kerberos_principal := Principal, kerberos_keytab_file := KeyTabFile