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

feat(iotdb): accept wrapped secrets as passwords

This commit is contained in:
Andrew Mayorov 2023-11-13 14:24:57 +07:00
parent 7817502b8b
commit 7d6c9d2daa
No known key found for this signature in database
GPG Key ID: 2837C62ACFBFED5D
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apps/emqx_bridge/src/emqx_bridge_resource.erl
View File

@ -356,9 +356,10 @@ parse_confs(<<"iotdb">>, Name, Conf) ->
authentication := authentication :=
#{ #{
username := Username, username := Username,
password := Password password := Secret
} }
} = Conf, } = Conf,
Password = emqx_secret:unwrap(Secret),
BasicToken = base64:encode(<<Username/binary, ":", Password/binary>>), BasicToken = base64:encode(<<Username/binary, ":", Password/binary>>),
%% This version atom correspond to the macro ?VSN_1_1_X in %% This version atom correspond to the macro ?VSN_1_1_X in
%% emqx_bridge_iotdb.hrl. It would be better to use the macro directly, but %% emqx_bridge_iotdb.hrl. It would be better to use the macro directly, but

2
apps/emqx_bridge_iotdb/src/emqx_bridge_iotdb.app.src
View File

@ -1,7 +1,7 @@
%% -*- mode: erlang -*- %% -*- mode: erlang -*-
{application, emqx_bridge_iotdb, [ {application, emqx_bridge_iotdb, [
{description, "EMQX Enterprise Apache IoTDB Bridge"}, {description, "EMQX Enterprise Apache IoTDB Bridge"},
{vsn, "0.1.3"}, {vsn, "0.1.4"},
{modules, [ {modules, [
emqx_bridge_iotdb, emqx_bridge_iotdb,
emqx_bridge_iotdb_impl emqx_bridge_iotdb_impl

7
apps/emqx_bridge_iotdb/src/emqx_bridge_iotdb.erl
View File

@ -51,12 +51,9 @@ fields(auth_basic) ->
[ [
{username, mk(binary(), #{required => true, desc => ?DESC("config_auth_basic_username")})}, {username, mk(binary(), #{required => true, desc => ?DESC("config_auth_basic_username")})},
{password, {password,
mk(binary(), #{ emqx_schema_secret:mk(#{
required => true, required => true,
desc => ?DESC("config_auth_basic_password"), desc => ?DESC("config_auth_basic_password")
format => <<"password">>,
sensitive => true,
converter => fun emqx_schema:password_converter/2
})} })}
]. ].