Differentiate Authentication failures.

Adjust tests to check these.
This commit is contained in:
Steve Powell 2012-08-01 16:16:45 +01:00
parent cf95e6f5a3
commit 6436af1552
2 changed files with 8 additions and 6 deletions

View File

@ -475,15 +475,17 @@ do_login(Username, Creds, VirtualHost, Heartbeat, AdapterInfo, Version,
{error, auth_failure} ->
rabbit_log:error("STOMP login failed - auth_failure "
"(user vanished)~n"),
error("Bad CONNECT", "Authentication failure\n", State);
error("Bad CONNECT", "User failure after authentication\n", State);
{error, access_refused} ->
rabbit_log:warning("STOMP login failed - access_refused "
"(vhost access not allowed)~n"),
error("Bad CONNECT", "Authentication failure\n", State)
error("Bad CONNECT", "Virtual host '" ++
binary_to_list(VirtualHost) ++
"' access denied\n", State)
end;
{refused, Msg, Args} ->
rabbit_log:warning("STOMP login failed: " ++ Msg ++ "\n", Args),
error("Bad CONNECT", "Authentication failure\n", State)
error("Bad CONNECT", "Access refused: " ++ Msg ++ "\n", Args, State)
end.
server_header() ->

View File

@ -80,20 +80,20 @@ class TestLifecycle(base.BaseTest):
''' Test bad username'''
self.bad_connect(stomp.Connection(user="gust",
passcode="guest"),
"Authentication failure\n")
"Access refused: user 'gust' - invalid credentials\n")
def test_bad_password(self):
''' Test bad password'''
self.bad_connect(stomp.Connection(user="guest",
passcode="gust"),
"Authentication failure\n")
"Access refused: user 'guest' - invalid credentials\n")
def test_bad_vhost(self):
''' Test bad virtual host'''
self.bad_connect(stomp.Connection(user="guest",
passcode="guest",
virtual_host="//"),
"Authentication failure\n")
"Virtual host '//' access denied\n")
def bad_connect(self, new_conn, expected):
self.conn.disconnect()