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

fix mysql auth error

This commit is contained in:
Feng Lee 2015-06-02 12:52:40 +08:00
parent f3dbb7ba54
commit 5a75e59dd1
5 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
apps/emqttd/src/emqttd_access_control.erl
View File

@ -179,6 +179,7 @@ handle_call({register_mod, Type, Mod, Opts}, _From, State) ->
ets:insert(?ACCESS_CONTROL_TAB, {tab_key(Type), [{Mod, ModState}|Mods]}), ets:insert(?ACCESS_CONTROL_TAB, {tab_key(Type), [{Mod, ModState}|Mods]}),
ok; ok;
{'EXIT', Error} -> {'EXIT', Error} ->
lager:error("Access Control: register ~s error - ~p", [Mod, Error]),
{error, Error} {error, Error}
end; end;
_ -> _ ->

3
plugins/emqttd_auth_mysql/etc/plugin.config
View File

@ -9,8 +9,9 @@
]}, ]},
{emqttd_auth_mysql, [ {emqttd_auth_mysql, [
{users_table, mqtt_users}, {users_table, mqtt_users},
{password_hash, plain},
{field_mapper, [ {field_mapper, [
{username, username}, {username, username},
{password, password, plain} {password, password}
]} ]}
]} ]}

8
plugins/emqttd_auth_mysql/src/emqttd_auth_mysql.erl
View File

@ -38,15 +38,19 @@
init(Opts) -> init(Opts) ->
Mapper = proplists:get_value(field_mapper, Opts), Mapper = proplists:get_value(field_mapper, Opts),
{ok, #state{user_table = proplists:get_value(user_table, Opts, mqtt_users), {ok, #state{user_table = proplists:get_value(user_table, Opts),
name_field = proplists:get_value(username, Mapper), name_field = proplists:get_value(username, Mapper),
pass_field = proplists:get_value(password, Mapper), pass_field = proplists:get_value(password, Mapper),
pass_hash = proplists:get_value(Opts, password_hash)}}. pass_hash = proplists:get_value(password_hash, Opts)}}.
check(#mqtt_client{username = undefined}, _Password, _State) -> check(#mqtt_client{username = undefined}, _Password, _State) ->
{error, "Username undefined"}; {error, "Username undefined"};
check(#mqtt_client{username = <<>>}, _Password, _State) ->
{error, "Username undefined"};
check(_Client, undefined, _State) -> check(_Client, undefined, _State) ->
{error, "Password undefined"}; {error, "Password undefined"};
check(_Client, <<>>, _State) ->
{error, "Password undefined"};
check(#mqtt_client{username = Username}, Password, check(#mqtt_client{username = Username}, Password,
#state{user_table = UserTab, pass_hash = Type, #state{user_table = UserTab, pass_hash = Type,
name_field = NameField, pass_field = PassField}) -> name_field = NameField, pass_field = PassField}) ->

2
plugins/emqttd_auth_mysql/src/emqttd_auth_mysql_app.erl
View File

@ -40,7 +40,7 @@
start(_StartType, _StartArgs) -> start(_StartType, _StartArgs) ->
Env = application:get_all_env(), Env = application:get_all_env(),
emqttd_access_control:register_mod(auth, emqttd_auth_mysql, Env), ok = emqttd_access_control:register_mod(auth, emqttd_auth_mysql, Env),
supervisor:start_link({local, ?MODULE}, ?MODULE, []). supervisor:start_link({local, ?MODULE}, ?MODULE, []).
prep_stop(State) -> prep_stop(State) ->

7
rel/files/plugins.config
View File

@ -9,7 +9,12 @@
% {encoding, utf8} % {encoding, utf8}
% ]}, % ]},
% {emqttd_auth_mysql, [ % {emqttd_auth_mysql, [
% {user_table, mqtt_users} % {users_table, mqtt_users},
% {password_hash, plain},
% {field_mapper, [
% {username, username},
% {password, password}
% ]}
% ]} % ]}
% %
% {emqttd_dashboard, [ % {emqttd_dashboard, [