diff options
| author | Matthias Radestock <matthias@rabbitmq.com> | 2010-07-13 08:38:10 +0100 |
|---|---|---|
| committer | Matthias Radestock <matthias@rabbitmq.com> | 2010-07-13 08:38:10 +0100 |
| commit | d39d89497e465cf9a948e038b52d53dfd5974152 (patch) | |
| tree | b3fe387c203a89b4dc440f544ea54581a681e281 | |
| parent | ff58647b81bed88a98d5d6cefb122570385afdae (diff) | |
| download | rabbitmq-server-d39d89497e465cf9a948e038b52d53dfd5974152.tar.gz | |
simplifying refactor
| -rw-r--r-- | src/rabbit_access_control.erl | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/src/rabbit_access_control.erl b/src/rabbit_access_control.erl index 9ba4758e..c19c3492 100644 --- a/src/rabbit_access_control.erl +++ b/src/rabbit_access_control.erl @@ -306,13 +306,12 @@ validate_regexp(RegexpBin) -> {error, Reason} -> throw({error, {invalid_regexp, Regexp, Reason}}) end. -set_permissions(Username, VHostPath, ConfigurePerm0, WritePerm0, ReadPerm0) -> - [ConfigurePerm, WritePerm, ReadPerm] = +set_permissions(Username, VHostPath, ConfigurePerm, WritePerm, ReadPerm) -> + [ConfigurePerm1, WritePerm1, ReadPerm1] = lists:map(fun(<<"">>) -> <<"$^">>; - (RE) -> RE - end, - [ConfigurePerm0, WritePerm0, ReadPerm0]), - lists:map(fun validate_regexp/1, [ConfigurePerm, WritePerm, ReadPerm]), + (Regexp) -> ok = validate_regexp(Regexp), + Regexp + end, [ConfigurePerm, WritePerm, ReadPerm]), rabbit_misc:execute_mnesia_transaction( rabbit_misc:with_user_and_vhost( Username, VHostPath, @@ -322,9 +321,9 @@ set_permissions(Username, VHostPath, ConfigurePerm0, WritePerm0, ReadPerm0) -> username = Username, virtual_host = VHostPath}, permission = #permission{ - configure = ConfigurePerm, - write = WritePerm, - read = ReadPerm}}, + configure = ConfigurePerm1, + write = WritePerm1, + read = ReadPerm1}}, write) end)). |