diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2010-11-10 16:04:32 +0000 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2010-11-10 16:04:32 +0000 |
| commit | c338d7dff3ca45ba27d160a194d823f6b71b4da9 (patch) | |
| tree | 6cbb30a57876205290650da4ae88b5f3e3dbebdf | |
| parent | 309b707f471daca0b8a0923c411a2b978bfa65c0 (diff) | |
| download | rabbitmq-server-c338d7dff3ca45ba27d160a194d823f6b71b4da9.tar.gz | |
Reinstate user_pass_login/2, the Erlang client depends on it.
| -rw-r--r-- | src/rabbit_access_control.erl | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/src/rabbit_access_control.erl b/src/rabbit_access_control.erl index 8b677068..00cc76d1 100644 --- a/src/rabbit_access_control.erl +++ b/src/rabbit_access_control.erl @@ -33,7 +33,7 @@ -include_lib("stdlib/include/qlc.hrl"). -include("rabbit.hrl"). --export([check_user_pass_login/2, make_salt/0, +-export([user_pass_login/2, check_user_pass_login/2, make_salt/0, check_vhost_access/2, check_resource_access/3]). -export([add_user/2, delete_user/1, change_password/2, set_admin/1, clear_admin/1, list_users/0, lookup_user/1]). @@ -54,6 +54,9 @@ -type(password() :: binary()). -type(password_hash() :: binary()). -type(regexp() :: binary()). +-spec(user_pass_login/2 :: + (username(), password()) + -> rabbit_types:user() | rabbit_types:channel_exit()). -spec(check_user_pass_login/2 :: (username(), password()) -> {'ok', rabbit_types:user()} | 'refused'). @@ -94,6 +97,16 @@ %%---------------------------------------------------------------------------- +user_pass_login(User, Pass) -> + ?LOGDEBUG("Login with user ~p pass ~p~n", [User, Pass]), + case check_user_pass_login(User, Pass) of + {refused, _} -> + rabbit_misc:protocol_error( + access_refused, "login refused for user '~s'", [User]); + {ok, U} -> + U + end. + check_user_pass_login(Username, Pass) -> case lookup_user(Username) of {ok, User} -> |