From d542afaa5c22a4e90908e5856a255ccd3831d0ff Mon Sep 17 00:00:00 2001
From: Derek Hulley <derek.hulley@alfresco.com>
Date: Fri, 5 Apr 2013 10:30:37 +0000
Subject: [PATCH] Merged DEV to HEAD    48863: ALF-18012 Error occurs on search
 by wildcards on Start Workflow page           - []{} symbols escaped in
 GetAuthoritiesCannedQuery.getPattern(String).    Also neatened the
 replacement to be self-documenting

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@48865 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../authority/GetAuthoritiesCannedQuery.java     | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/source/java/org/alfresco/repo/security/authority/GetAuthoritiesCannedQuery.java b/source/java/org/alfresco/repo/security/authority/GetAuthoritiesCannedQuery.java
index 5bcaf523bb..0308756499 100644
--- a/source/java/org/alfresco/repo/security/authority/GetAuthoritiesCannedQuery.java
+++ b/source/java/org/alfresco/repo/security/authority/GetAuthoritiesCannedQuery.java
@@ -118,10 +118,18 @@ public class GetAuthoritiesCannedQuery extends AbstractCannedQueryPermissions<Au
         {
             return null;
         }
-        
-        // Escapes: \ with \\     and     . with \.
-        // Replaces ? with .      and     * with .*
-        searchValue = "^"+searchValue.replaceAll("\\\\", "\\\\\\\\").replaceAll("\\.", "\\\\.").replaceAll("\\?", ".").replaceAll("\\*", ".*");
+
+        // Escape characters of regex expressions
+        searchValue = 
+                "^" +
+                searchValue.replaceAll("\\\\", "\\\\\\\\")
+                .replaceAll("\\.", "\\\\.")
+                .replaceAll("\\?", ".")
+                .replaceAll("\\*", ".*")
+                .replaceAll("\\{", "\\\\{")
+                .replaceAll("\\}", "\\\\}")
+                .replaceAll("\\[", "\\\\[")
+                .replaceAll("\\]", "\\\\]");
         return Pattern.compile(searchValue, Pattern.CASE_INSENSITIVE);
     }