jacob.eva
/
ejabberd-contrib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ejabberd_auth_http bad argument in call to lists:keyfind (#104)

This commit is contained in:
Badlop 2015-05-25 11:59:11 +02:00
parent 98ab39f962
commit 89e0a70e44
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ejabberd_auth_http/src/ejabberd_auth_http.erl
View File

@ -37,7 +37,8 @@
-spec start(binary()) -> ok. -spec start(binary()) -> ok.
start(Host) -> start(Host) ->
AuthOpts = ejabberd_config:get_local_option(auth_opts, Host), AuthOpts = ejabberd_config:get_local_option(auth_opts, fun(A) when is_list(A) -> A end,
<<"localhost">>),
{_, AuthHost} = lists:keyfind(host, 1, AuthOpts), {_, AuthHost} = lists:keyfind(host, 1, AuthOpts),
PoolSize = proplists:get_value(connection_pool_size, AuthOpts, 10), PoolSize = proplists:get_value(connection_pool_size, AuthOpts, 10),
Opts = proplists:get_value(connection_opts, AuthOpts, []), Opts = proplists:get_value(connection_opts, AuthOpts, []),
@ -223,7 +224,8 @@ remove_user_req(LUser, LServer, Password, Method) ->
make_req(_, _, LUser, LServer, _) when LUser == error orelse LServer == error -> make_req(_, _, LUser, LServer, _) when LUser == error orelse LServer == error ->
{error, {prep_failed, LUser, LServer}}; {error, {prep_failed, LUser, LServer}};
make_req(Method, Path, LUser, LServer, Password) -> make_req(Method, Path, LUser, LServer, Password) ->
AuthOpts = ejabberd_config:get_local_option(auth_opts, LServer), AuthOpts = ejabberd_config:get_local_option(auth_opts, fun(A) when is_list(A) -> A end,
<<"localhost">>),
BasicAuth = case lists:keyfind(basic_auth, 1, AuthOpts) of BasicAuth = case lists:keyfind(basic_auth, 1, AuthOpts) of
{_, BasicAuth0} -> BasicAuth0; {_, BasicAuth0} -> BasicAuth0;
_ -> "" _ -> ""