Address maintainer review findings for UDS support

- Fix socket_ends/2 tuple decomposition causing is_loopback failures (Finding #1)
- Restore {error, enoent} assertion in uds_connection_failure tests (Finding #2)
- Handle the bare atom 'local' in rabbit_misc:ntoa/1 (Finding #3)
- Drop overly strict hd(Path) guard from tcp_listener_addresses/1 (Finding #4)
- Remove 'string' from tcp and ssl listener schema datatypes (Finding #5)
- Restore {error, einval} fallback in rabbit_auth_backend_http
- Normalise track_auth_attempt_source tuple extraction in rabbit_core_metrics

Author: Piyush0049

deps/rabbit/priv/schema/rabbit.schema

@@ -23,7 +23,7 @@
 ]}.
 
 {mapping, "listeners.tcp.$name", "rabbit.tcp_listeners",[
-    {datatype, [integer, ip, string, domain_socket]}
+    {datatype, [integer, ip, domain_socket]}
 ]}.
 
 {translation, "rabbit.tcp_listeners",
@@ -46,7 +46,7 @@ end}.
 ]}.
 
 {mapping, "listeners.ssl.$name", "rabbit.ssl_listeners",[
-    {datatype, [integer, ip, string, domain_socket]}
+    {datatype, [integer, ip, domain_socket]}
 ]}.
 
 {translation, "rabbit.ssl_listeners",

deps/rabbit/src/rabbit_networking.erl

@@ -149,7 +149,7 @@ fix_ssl_options(Config) ->
 
 tcp_listener_addresses({local, Path, _Port}) ->
     [{{local, Path}, 0, local}];
-tcp_listener_addresses(Path) when is_list(Path) andalso Path =/= [] andalso (hd(Path) =:= $/ orelse hd(Path) =:= $.) ->
+tcp_listener_addresses(Path) when is_list(Path) andalso Path =/= [] ->
     [{{local, Path}, 0, local}];
 tcp_listener_addresses(Port) when is_integer(Port) ->
     tcp_listener_addresses_auto(Port);

deps/rabbit/test/unix_domain_socket_SUITE.erl

@@ -129,7 +129,7 @@ test_uds_connection_failure(Config) ->
     file:delete(SocketPath),
 
     ConnParams = #amqp_params_network{host = {local, SocketPath}, port = 0},
-    ?assertMatch({error, _}, amqp_connection:start(ConnParams)).
+    ?assertMatch({error, enoent}, amqp_connection:start(ConnParams)).
 
 %% Verifies finding #1 at the unit level: is_loopback must return true for the
 %% {local, _} tuple form that peername returns on an accepted UDS socket.

deps/rabbit_common/src/rabbit_core_metrics.erl

@@ -422,11 +422,16 @@ update_auth_attempt(RemoteAddress, Username, Protocol, Incr) ->
     %% It's up to the operator to enable them, and reset it required
     _ = case application:get_env(rabbit, track_auth_attempt_source) of
         {ok, true} ->
-            Addr = case inet:is_ip_address(RemoteAddress) of
-                       true ->
+            Addr = case RemoteAddress of
+                       {local, _Path} ->
                            list_to_binary(rabbit_misc:ntoa(RemoteAddress));
-                       false ->
-                           rabbit_data_coercion:to_binary(RemoteAddress)
+                       _ ->
+                           case inet:is_ip_address(RemoteAddress) of
+                               true ->
+                                   list_to_binary(rabbit_misc:ntoa(RemoteAddress));
+                               false ->
+                                   rabbit_data_coercion:to_binary(RemoteAddress)
+                           end
                    end,
             case {Addr, Username} of
                 {<<>>, <<>>} ->

deps/rabbit_common/src/rabbit_misc.erl

@@ -211,8 +211,8 @@
                  {bad_edge, [digraph:vertex()]}),
                 digraph:vertex(), digraph:vertex()}).
 -spec const(A) -> thunk(A).
--spec ntoa(inet:ip_address()) -> string().
--spec ntoab(inet:ip_address()) -> string().
+-spec ntoa(any()) -> string() | {error, einval}.
+-spec ntoab(any()) -> binary() | {error, einval}.
 -spec is_process_alive(pid()) -> boolean().
 
 -spec pmerge(term(), term(), [term()]) -> [term()].
@@ -801,13 +801,17 @@ const(X) -> fun () -> X end.
 %% when IPv6 is enabled but not used (i.e. 99% of the time).
 ntoa({local, Path}) ->
     rabbit_data_coercion:to_list(Path);
+ntoa(local) ->
+    "local";
 ntoa({0,0,0,0,0,16#ffff,AB,CD}) ->
     inet_parse:ntoa({AB bsr 8, AB rem 256, CD bsr 8, CD rem 256});
 ntoa(IP) ->
     inet_parse:ntoa(IP).
 
 ntoab({local, Path}) ->
     rabbit_data_coercion:to_binary(Path);
+ntoab(local) ->
+    <<"local">>;
 ntoab(IP) ->
     Str = ntoa(IP),
     case string:str(Str, ":") of

deps/rabbit_common/src/rabbit_net.erl

@@ -299,6 +299,7 @@ is_loopback(Sock) when is_port(Sock) ; ?IS_SSL(Sock) ->
 is_loopback({127,_,_,_})             -> true;
 is_loopback({0,0,0,0,0,0,0,1})       -> true;
 is_loopback({0,0,0,0,0,65535,AB,CD}) -> is_loopback(ipv4(AB, CD));
+is_loopback(local)                   -> true;
 is_loopback({local, _})              -> true;
 is_loopback(_)                       -> false.
 

deps/rabbitmq_auth_backend_http/src/rabbit_auth_backend_http.erl

@@ -294,4 +294,7 @@ join_tags(Tags) ->
 parse_peeraddr(unknown) ->
     rabbit_data_coercion:to_list(unknown);
 parse_peeraddr(PeerAddr) ->
-    rabbit_misc:ntoa(PeerAddr).
+    case rabbit_misc:ntoa(PeerAddr) of
+        {error, einval} -> rabbit_data_coercion:to_list(PeerAddr);
+        Str             -> Str
+    end.

deps/rabbitmq_mqtt/src/rabbit_mqtt_processor.erl

@@ -23,8 +23,7 @@
               send_fun/0]).
 
 -import(rabbit_mqtt_util, [mqtt_to_amqp/1,
-                           amqp_to_mqtt/1,
-                           ip_address_to_binary/1]).
+                           amqp_to_mqtt/1]).
 -import(rabbit_misc, [maps_put_truthy/3]).
 
 -include_lib("kernel/include/logger.hrl").