diff --git a/apps/emqx_auth_ldap/src/emqx_auth_ldap.app.src b/apps/emqx_auth_ldap/src/emqx_auth_ldap.app.src index 119434aba..2d8123cc3 100644 --- a/apps/emqx_auth_ldap/src/emqx_auth_ldap.app.src +++ b/apps/emqx_auth_ldap/src/emqx_auth_ldap.app.src @@ -1,6 +1,6 @@ {application, emqx_auth_ldap, [{description, "EMQ X Authentication/ACL with LDAP"}, - {vsn, "4.3.1"}, % strict semver, bump manually! + {vsn, "4.3.2"}, % strict semver, bump manually! {modules, []}, {registered, [emqx_auth_ldap_sup]}, {applications, [kernel,stdlib,eldap2,ecpool]}, diff --git a/apps/emqx_auth_ldap/src/emqx_auth_ldap.appup.src b/apps/emqx_auth_ldap/src/emqx_auth_ldap.appup.src index 9750f3cf1..772a18ce5 100644 --- a/apps/emqx_auth_ldap/src/emqx_auth_ldap.appup.src +++ b/apps/emqx_auth_ldap/src/emqx_auth_ldap.appup.src @@ -1,8 +1,22 @@ -%% -*- mode: erlang -*- +%% -*-: erlang -*- {VSN, - [{"4.3.0", - [{load_module,emqx_acl_ldap,brutal_purge,soft_purge,[]}]}, - {<<".*">>,[]}], - [{"4.3.0", - [{load_module,emqx_acl_ldap,brutal_purge,soft_purge,[]}]}, - {<<".*">>,[]}]}. + [ {"4.3.0", + [ {load_module, emqx_acl_ldap, brutal_purge, soft_purge, []} + , {load_module, emqx_auth_ldap_cli, brutal_purge, soft_purge, []} + ]}, + {"4.3.1", + [ {load_module, emqx_auth_ldap_cli, brutal_purge, soft_purge, []} + ]}, + {<<".*">>, []} + ], + [ + {"4.3.0", + [ {load_module, emqx_acl_ldap, brutal_purge, soft_purge, []} + , {load_module, emqx_auth_ldap_cli, brutal_purge, soft_purge, []} + ]}, + {"4.3.1", + [ {load_module, emqx_auth_ldap_cli, brutal_purge, soft_purge, []} + ]}, + {<<".*">>, []} + ] +}. diff --git a/apps/emqx_auth_ldap/src/emqx_auth_ldap_cli.erl b/apps/emqx_auth_ldap/src/emqx_auth_ldap_cli.erl index 412754664..8e75996a4 100644 --- a/apps/emqx_auth_ldap/src/emqx_auth_ldap_cli.erl +++ b/apps/emqx_auth_ldap/src/emqx_auth_ldap_cli.erl @@ -76,8 +76,8 @@ connect(Opts) -> search(Pool, Base, Filter) -> ecpool:with_client(Pool, fun(C) -> - case application:get_env(?APP, bind_as_user) of - {ok, true} -> + case application:get_env(?APP, bind_as_user, false) of + true -> {ok, Opts} = application:get_env(?APP, ldap), BindDn = get_value(bind_dn, Opts), BindPassword = get_value(bind_password, Opts), @@ -91,7 +91,7 @@ search(Pool, Base, Filter) -> catch error:Reason -> {error, Reason} end; - {ok, false} -> + false -> eldap2:search(C, [{base, Base}, {filter, Filter}, {deref, eldap2:derefFindingBaseObj()}]) @@ -101,8 +101,8 @@ search(Pool, Base, Filter) -> search(Pool, Base, Filter, Attributes) -> ecpool:with_client(Pool, fun(C) -> - case application:get_env(?APP, bind_as_user) of - {ok, true} -> + case application:get_env(?APP, bind_as_user, false) of + true -> {ok, Opts} = application:get_env(?APP, ldap), BindDn = get_value(bind_dn, Opts), BindPassword = get_value(bind_password, Opts), @@ -117,7 +117,7 @@ search(Pool, Base, Filter, Attributes) -> catch error:Reason -> {error, Reason} end; - {ok, false} -> + false -> eldap2:search(C, [{base, Base}, {filter, Filter}, {attributes, Attributes},