Merge pull request #8475 from rabbitmq/mergify/bp/v3.10.x/pr-8465

Remove '\n' from Access refused stomp log.  (backport #8462) (backport #8464) (backport #8465)

Author: michaelklishin

deps/rabbitmq_stomp/src/rabbit_stomp_processor.erl

@@ -613,7 +613,7 @@ do_login(Username, Passwd, VirtualHost, Heartbeat, AdapterInfo, Version,
         {error, {auth_failure, _}} ->
             rabbit_log:warning("STOMP login failed for user '~s': authentication failed", [Username]),
             error("Bad CONNECT", "Access refused for user '" ++
-                  binary_to_list(Username) ++ "'~n", [], State);
+                  binary_to_list(Username) ++ "'", [], State);
         {error, not_allowed} ->
             rabbit_log:warning("STOMP login failed for user '~s': "
                                "virtual host access not allowed", [Username]),

deps/rabbitmq_stomp/test/python_SUITE_data/src/connect_disconnect.py

@@ -64,11 +64,11 @@ def test_unsupported_version(self):
 
     def test_bad_username(self):
         ''' Test bad username'''
-        self.bad_connect("Access refused for user 'gust'\n", user='gust')
+        self.bad_connect("Access refused for user 'gust'", user='gust')
 
     def test_bad_password(self):
         ''' Test bad password'''
-        self.bad_connect("Access refused for user 'guest'\n", passcode='gust')
+        self.bad_connect("Access refused for user 'guest'", passcode='gust')
 
     def test_bad_vhost(self):
         ''' Test bad virtual host'''
@@ -132,4 +132,4 @@ def test_disconnect_with_receipt(self):
     modules = [
         __name__
     ]
-    test_runner.run_unittests(modules)
+    test_runner.run_unittests(modules)

deps/rabbitmq_web_stomp/test/cowboy_websocket_SUITE.erl

@@ -86,7 +86,7 @@ connection_fails(Config) ->
     WS = rfc6455_client:new(Protocol ++ "://127.0.0.1:" ++ PortStr ++ "/ws", self()),
     {ok, _} = rfc6455_client:open(WS),
     ok = raw_send(WS, "CONNECT", [{"login", "uncorrect_$55"}, {"passcode", "uncorrect_$88"}]),
-    {<<"ERROR">>, _, <<"Access refused for user 'uncorrect_$55'\n">>} = raw_recv(WS),
+    {<<"ERROR">>, _, <<"Access refused for user 'uncorrect_$55'">>} = raw_recv(WS),
     {close, _} = rfc6455_client:close(WS),
     ok.