root
/
rabbitmq-server
mirror of https://github.com/rabbitmq/rabbitmq-server.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Wording, naming

This commit is contained in:
Michael Klishin 2016-09-02 01:33:34 +03:00
parent e8ca3ac8ff
commit ee213084f8
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
deps/rabbitmq_mqtt/src/rabbit_mqtt_processor.erl vendored
View File

@ -96,13 +96,13 @@ process_request(?CONNECT,
_ ->
case creds(Username, Password, SSLLoginName) of
nocreds ->
rabbit_log:error("MQTT login failed - no credentials~n"),
rabbit_log:error("MQTT login failed: no credentials provided~n"),
{?CONNACK_CREDENTIALS, PState};
{bad_creds, {undefined, Pass}} when is_list(Pass) ->
rabbit_log:error("MQTT login failed - password without username is provided"),
{invalid_creds, {undefined, Pass}} when is_list(Pass) ->
rabbit_log:error("MQTT login failed: no user username is provided"),
{?CONNACK_CREDENTIALS, PState};
{bad_creds, {User, undefined}} when is_list(User) ->
rabbit_log:error("MQTT login failed for ~p no password", [User]),
{invalid_creds, {User, undefined}} when is_list(User) ->
rabbit_log:error("MQTT login failed for ~p: no password provided", [User]),
{?CONNACK_CREDENTIALS, PState};
{UserBin, PassBin} ->
case process_login(UserBin, PassBin, ProtoVersion, PState) of
@ -521,15 +521,15 @@ creds(User, Pass, SSLLoginName) ->
SSLLoginName =/= none,
case {CredentialsProvided, CorrectCredentials, SSLLoginProvided, HaveDefaultCreds} of
%% Username and password takes priority
%% Username and password take priority
{true, true, _, _} -> {list_to_binary(User),
list_to_binary(Pass)};
%% Either username or password is provided
{true, false, _, _} -> {bad_creds, {User, Pass}};
{true, false, _, _} -> {invalid_creds, {User, Pass}};
%% rabbitmq_mqtt.ssl_cert_login is true. SSL user name provided.
%% Authorising with no password.
%% Authenticating using username only.
{false, false, true, _} -> {SSLLoginName, none};
%% Anonymous
%% Anonymous connection uses default credentials
{false, false, false, true} -> {DefaultUser, DefaultPass};
_ -> nocreds
end.

16
deps/rabbitmq_mqtt/test/auth_SUITE.erl vendored
View File

@ -22,13 +22,13 @@ groups() ->
%% SSL auth will succeed, because we cannot ignore anonymous
]},
{ssl_user, [],
[anonymous_auth_fail,
[anonymous_auth_failure,
user_credentials_auth,
ssl_user_auth_success]},
{no_ssl_user, [],
[anonymous_auth_fail,
[anonymous_auth_failure,
user_credentials_auth,
ssl_user_auth_fail]}].
ssl_user_auth_failure]}].
init_per_suite(Config) ->
rabbit_ct_helpers:log_environment(),
@ -71,7 +71,7 @@ mqtt_config(no_ssl_user) ->
{allow_anonymous, false}]}.
init_per_testcase(Testcase, Config) when Testcase == ssl_user_auth_success;
Testcase == ssl_user_auth_fail ->
Testcase == ssl_user_auth_failure ->
Hostname = re:replace(os:cmd("hostname"), "\\s+", "", [global,{return,list}]),
User = "O=client,CN=" ++ Hostname,
{ok,_} = rabbit_ct_broker_helpers:rabbitmqctl(Config, 0, ["add_user", User, ""]),
@ -90,7 +90,7 @@ init_per_testcase(Testcase, Config) ->
rabbit_ct_helpers:testcase_started(Config, Testcase).
end_per_testcase(Testcase, Config) when Testcase == ssl_user_auth_success;
Testcase == ssl_user_auth_fail ->
Testcase == ssl_user_auth_failure ->
User = ?config(temp_ssl_user, Config),
{ok,_} = rabbit_ct_broker_helpers:rabbitmqctl(Config, 0, ["delete_user", User]),
rabbit_ct_helpers:testcase_finished(Config, Testcase);
@ -104,14 +104,14 @@ end_per_testcase(Testcase, Config) ->
anonymous_auth_success(Config) ->
expect_connect(fun connect_anonymous/1, Config).
anonymous_auth_fail(Config) ->
anonymous_auth_failure(Config) ->
expect_auth_error(fun connect_anonymous/1, Config).
ssl_user_auth_success(Config) ->
expect_connect(fun connect_ssl/1, Config).
ssl_user_auth_fail(Config) ->
ssl_user_auth_failure(Config) ->
expect_auth_error(fun connect_ssl/1, Config).
user_credentials_auth(Config) ->
@ -194,4 +194,4 @@ expect_auth_error(ConnectFun, Config) ->
case Result of
ok -> ok;
{error, Err} -> exit(Err)
end.
end.