diff options
| author | Jean-Sebastien Pedron <jean-sebastien@rabbitmq.com> | 2014-11-26 16:51:47 +0100 |
|---|---|---|
| committer | Jean-Sebastien Pedron <jean-sebastien@rabbitmq.com> | 2014-11-26 16:51:47 +0100 |
| commit | 77651e4c3fce5a622b3bb74d006fe53bc86b5c01 (patch) | |
| tree | b3101e9c79b716c2698ea0f94a9f274e9286fcf8 | |
| parent | 6373af3300b850c1d4c74ca8e5f8453c3da3eb18 (diff) | |
| download | rabbitmq-server-77651e4c3fce5a622b3bb74d006fe53bc86b5c01.tar.gz | |
Update rabbit_auth_mechanism:handle_response() spec to match the change
| -rw-r--r-- | src/rabbit_auth_mechanism.erl | 5 | ||||
| -rw-r--r-- | src/rabbit_reader.erl | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/rabbit_auth_mechanism.erl b/src/rabbit_auth_mechanism.erl index d11af095..4f771db2 100644 --- a/src/rabbit_auth_mechanism.erl +++ b/src/rabbit_auth_mechanism.erl @@ -37,12 +37,15 @@ %% {protocol_error, Msg, Args} %% Client got the protocol wrong. Log and die. %% {refused, Msg, Args} +%% (deprecated) Client failed authentication. Log and die. +%% {refused, Username, Msg, Args} %% Client failed authentication. Log and die. -callback handle_response(binary(), any()) -> {'ok', rabbit_types:user()} | {'challenge', binary(), any()} | {'protocol_error', string(), [any()]} | - {'refused', string(), [any()]}. + {'refused', string(), [any()]} | + {'refused', rabbit_types:username() | none, string(), [any()]}. -else. diff --git a/src/rabbit_reader.erl b/src/rabbit_reader.erl index a18d75d7..05ed3eda 100644 --- a/src/rabbit_reader.erl +++ b/src/rabbit_reader.erl @@ -1049,8 +1049,8 @@ auth_phase(Response, {refused, Username, Msg, Args} -> auth_fail(Username, Msg, Args, Name, State); {refused, Msg, Args} -> - %% Older auth mechanisms didn't return the username, even if - %% they reach a stage where they know it. + %% Deprecated: older auth mechanisms didn't return the + %% username, even if they reach a stage where they know it. auth_fail(none, Msg, Args, Name, State); {protocol_error, Msg, Args} -> notify_auth_result(none, user_authentication_failure, |