[HippoCMS-scm] [Git][cms-community/hippo-cms][release/4.1] CMS-10529 [backport 11.1] fixing html character entity regex and adding test

[Oscar Scholten]

Oscar Scholten pushed to branch release/4.1 at cms-community / hippo-cms


Commits:
2dee5c81 by Oscar Scholten at 2016-11-04T12:42:21+01:00
CMS-10529 [backport 11.1] fixing html character entity regex and adding test

(cherry picked from commit d78426495715d6249f84ac1ace0deb54b855201e)

- - - - -


2 changed files:

- 
richtext/frontend/src/main/java/org/hippoecm/frontend/plugins/richtext/htmlcleaner/CharacterReferenceNormalizer.java
- 
richtext/frontend/src/test/java/org/hippoecm/frontend/plugins/richtext/htmlcleaner/CharacterReferenceNormalizerTest.java


Changes:

=====================================
richtext/frontend/src/main/java/org/hippoecm/frontend/plugins/richtext/htmlcleaner/CharacterReferenceNormalizer.java
=====================================
--- 
a/richtext/frontend/src/main/java/org/hippoecm/frontend/plugins/richtext/htmlcleaner/CharacterReferenceNormalizer.java
+++ 
b/richtext/frontend/src/main/java/org/hippoecm/frontend/plugins/richtext/htmlcleaner/CharacterReferenceNormalizer.java
@@ -70,7 +70,7 @@ class CharacterReferenceNormalizer {
 
     private static class CharacterReferenceFinder {
         private final static Pattern pattern = Pattern.compile(
-                
"&(?<entity>\\p{Alpha}+);|&#(?<dec>\\p{Digit}+);|&#0*(x|X)(?<hex>\\p{XDigit}+);");
+                
"&(?<entity>\\p{Alnum}+);|&#(?<dec>\\p{Digit}+);|&#0*(x|X)(?<hex>\\p{XDigit}+);");
                 /* Regexp with searching for 3 patterns:
                  * 1) character entity reference, e.g. &aacute;
                  * 2) decimal numeric character reference, e.g. &#225;


=====================================
richtext/frontend/src/test/java/org/hippoecm/frontend/plugins/richtext/htmlcleaner/CharacterReferenceNormalizerTest.java
=====================================
--- 
a/richtext/frontend/src/test/java/org/hippoecm/frontend/plugins/richtext/htmlcleaner/CharacterReferenceNormalizerTest.java
+++ 
b/richtext/frontend/src/test/java/org/hippoecm/frontend/plugins/richtext/htmlcleaner/CharacterReferenceNormalizerTest.java
@@ -44,6 +44,11 @@ public class CharacterReferenceNormalizerTest {
     }
 
     @Test
+    public void test_named_entities_with_numbers_are_converted() {
+        assertEquals("¾", CharacterReferenceNormalizer.normalize("&frac34;"));
+    }
+
+    @Test
     public void test_incorrect_numeric_entity_conversion() {
         assertEquals("&amp;#12ab; &amp;#x12abz;", 
CharacterReferenceNormalizer.normalize("&#12ab; &#x12abz;"));
         assertEquals("&amp;#", CharacterReferenceNormalizer.normalize("&#"));



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-cms/commit/2dee5c819305259aff02147e06ec2d8caa653f28

_______________________________________________
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn