Skip to content

Commit 448cc61

Browse files
committed
Revert "Convert check_vhost_access/3 to new API"
This reverts commit abe9ee7.
1 parent df6067a commit 448cc61

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

src/rabbit_auth_backend_ip_range.erl

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ user_login_authorization(_Username) ->
3131
user_login_authorization(_Username, _AuthProps) ->
3232
{ok, none}.
3333

34-
check_vhost_access(#auth_user{tags = Tags}, _VHostPath, AuthzData) ->
35-
Address = extract_address(AuthzData),
34+
check_vhost_access(#auth_user{tags = Tags}, _VHostPath, Sock) ->
35+
Address = extract_address(Sock),
3636

3737
% filter out applicable masks
3838
case lists:filtermap(
@@ -85,11 +85,10 @@ extract_address(undefined) ->
8585
extract_address(unknown) ->
8686
unknown;
8787
% for native direct connections the address is set to unknown
88-
extract_address(#authz_socket_info{peername={unknown, _Port}}) ->
89-
undefined;
90-
extract_address(#authz_socket_info{peername={Address, _Port}}) ->
91-
Address;
92-
extract_address(#{peeraddr := Address}) ->
88+
extract_address(#authz_socket_info{peername={unknown, _Port}}) -> undefined;
89+
extract_address(#authz_socket_info{peername={Address, _Port}}) -> Address;
90+
extract_address(Sock) ->
91+
{ok, {Address, _Port}} = rabbit_net:peername(Sock),
9392
Address.
9493

9594
format_masks(Masks) ->

0 commit comments

Comments
 (0)