SAK-42559 - Support extended unicode in entitybroker (sakaiproject#7418)

fk-snyk · Oct 7, 2019 · 01300a9 · 01300a9
1 parent fb3ada8
commit 01300a9
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/entitybroker/api/src/java/org/sakaiproject/entitybroker/util/TemplateParseUtil.java b/entitybroker/api/src/java/org/sakaiproject/entitybroker/util/TemplateParseUtil.java
@@ -79,19 +79,19 @@ public class TemplateParseUtil {
    /**
     * Defines the valid chars for a replacement variable
     */
-   public static final String VALID_VAR_CHARS = "[A-Za-z0-9\\\\(\\\\)\\+\\*\\.\\-_=,:;!~@% ]";
+   public static final String VALID_VAR_CHARS = "[\\p{L}}\\p{N}\\\\(\\\\)\\+\\*\\.\\-_=,:;!~@% ]";
    /**
     * Defines the valid chars for a parser input (e.g. entity reference)
     */
-   public static final String VALID_INPUT_CHARS = "[A-Za-z0-9\\\\(\\\\)\\+\\*\\.\\-_=,:;!~@% "+SEPARATOR+"]";
+   public static final String VALID_INPUT_CHARS = "[\\p{L}\\p{N}\\\\\\(\\\\)\\+\\*\\.\\-_=,:;!~@% "+SEPARATOR+"]";
    /**
     * Defines the valid chars for a template
     */
-   public static final String VALID_TEMPLATE_CHARS = "[A-Za-z0-9\\\\(\\\\)\\+\\*\\.\\-_=,:;&!~@%"+SEPARATOR+"\\{\\}]";
+   public static final String VALID_TEMPLATE_CHARS = "[\\p{L}\\p{N}\\\\\\(\\\\)\\+\\*\\.\\-_=,:;&!~@%"+SEPARATOR+"\\{\\}]";
    /**
     * Defines the valid template chars for an outgoing template (allows ?)
     */
-   public static final String VALID_TEMPLATE_CHARS_OUTGOING = "[A-Za-z0-9\\\\(\\\\)\\+\\*\\.\\-_=,:;&!~@%"+SEPARATOR+"\\{\\}\\?]";
+   public static final String VALID_TEMPLATE_CHARS_OUTGOING = "[\\p{L}\\p{N}\\\\\\(\\\\)\\+\\*\\.\\-_=,:;&!~@%"+SEPARATOR+"\\{\\}\\?]";
 
 
    /**