From: Paweł Chmielowski <pchmielowski@process-one.net>
Date: Thu, 8 Sep 2016 06:44:49 +0000 (+0200)
Subject: Properly normalize resource_regexp acl rule
X-Git-Tag: 16.09~20
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a8368278ecf40adc0c50fceeaf428cf753ab1a11;p=ejabberd

Properly normalize resource_regexp acl rule

This fixes issue #1288.
---

diff --git a/src/acl.erl b/src/acl.erl
index 897996976..bf17e8a1a 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) ->