summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaweł Chmielowski <pchmielowski@process-one.net>2016-09-08 08:44:49 +0200
committerPaweł Chmielowski <pchmielowski@process-one.net>2016-09-08 08:45:10 +0200
commita8368278ecf40adc0c50fceeaf428cf753ab1a11 (patch)
tree38fe4b91c0a6239d77c61e919c9027eeb3383fba
parentEnforce pathtype use with config path (#1264) (diff)
Properly normalize resource_regexp acl rule
This fixes issue #1288.
-rw-r--r--src/acl.erl2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/acl.erl b/src/acl.erl
index 89799697..bf17e8a1 100644
--- a/src/acl.erl
+++ b/src/acl.erl
@@ -262,6 +262,7 @@ normalize_spec(Spec) ->
{server, S} -> {server, nameprep(S)};
{resource, R} -> {resource, resourceprep(R)};
{server_regexp, SR} -> {server_regexp, b(SR)};
+ {resource_regexp, R} -> {resource_regexp, b(R)};
{server_glob, S} -> {server_glob, b(S)};
{resource_glob, R} -> {resource_glob, b(R)};
{ip, {Net, Mask}} -> {ip, {Net, Mask}};
@@ -687,6 +688,7 @@ transform_options({acl, Name, Type}, Opts) ->
{server_glob, S} -> {server_glob, [b(S)]};
{ip, S} -> {ip, [b(S)]};
{resource_glob, R} -> {resource_glob, [b(R)]}
+ {resource_regexp, R} -> {resource_regexp, [b(R)]}
end,
[{acl, [{Name, [T]}]}|Opts];
transform_options({access, Name, Rules}, Opts) ->