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

Take peeraddr as binary() into account

This commit is contained in:
Luke Bakken 2019-03-25 15:10:45 -07:00
parent 68c70c006a
commit 4e96813930
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
deps/rabbitmq_auth_backend_http/src/rabbit_auth_backend_http.erl vendored
View File

@ -61,8 +61,8 @@ user_login_authorization(Username, AuthProps) ->
check_vhost_access(#auth_user{username = Username, tags = Tags}, VHost, #{peeraddr := PeerAddr}) ->
bool_req(vhost_path, [{username, Username},
{vhost, VHost},
{ip, inet:ntoa(PeerAddr)},
{tags, join_tags(Tags)}]).
{ip, parse_peeraddr(PeerAddr)},
{tags, join_tags(Tags)}]).
check_resource_access(#auth_user{username = Username, tags = Tags},
#resource{virtual_host = VHost, kind = Type, name = Name},
@ -170,3 +170,11 @@ join_tags([]) -> "";
join_tags(Tags) ->
Strings = [rabbit_data_coercion:to_list(T) || T <- Tags],
string:join(Strings, " ").
parse_peeraddr(PeerAddr) ->
handle_inet_ntoa_peeraddr(inet:ntoa(PeerAddr), PeerAddr).
handle_inet_ntoa_peeraddr({error, einval}, PeerAddr) ->
rabbit_data_coercion:to_list(PeerAddr);
handle_inet_ntoa_peeraddr(PeerAddrStr, _PeerAddr0) ->
PeerAddrStr.