diff options
| author | Alexandru Scvortov <alexandru@rabbitmq.com> | 2010-07-14 15:35:07 +0100 |
|---|---|---|
| committer | Alexandru Scvortov <alexandru@rabbitmq.com> | 2010-07-14 15:35:07 +0100 |
| commit | 2869d77ab9bbaceaf55234a140f9b1f83f663e67 (patch) | |
| tree | fddc62157fa4223c912419266074f2dda2760ad4 /src | |
| parent | 230b712847a1dd8ab1c497bee381da701f997166 (diff) | |
| parent | 78ecc347eef876669d6e848de787eaf345dd2bcd (diff) | |
| download | rabbitmq-server-git-2869d77ab9bbaceaf55234a140f9b1f83f663e67.tar.gz | |
merge bug22875 into bug22964
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_access_control.erl | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/rabbit_access_control.erl b/src/rabbit_access_control.erl index 5578e24bcc..5eb80325db 100644 --- a/src/rabbit_access_control.erl +++ b/src/rabbit_access_control.erl @@ -176,9 +176,13 @@ check_resource_access(Username, [] -> false; [#user_permission{permission = P}] -> + PermRegexp = case element(permission_index(Permission), P) of + <<"">> -> <<$^, $$>>; % <<"^$">> breaks erlang mode + RE -> RE + end, case regexp:match( binary_to_list(Name), - binary_to_list(element(permission_index(Permission), P))) of + binary_to_list(PermRegexp)) of {match, _, _} -> true; nomatch -> false end |