Merge pull request #77 from Simon-Initiative/AUTHORING-2299-amp-escape

darrensiegel · web-flow · commit 36452ded169d · 2020-10-16T11:21:38.000-04:00
Authoring 2299 amp escape
diff --git a/src/main/java/edu/cmu/oli/assessment/InlineAssessmentDelivery.java b/src/main/java/edu/cmu/oli/assessment/InlineAssessmentDelivery.java
@@ -652,7 +652,7 @@ private String transformBodyContent(Resource resource, String content, String se
 
             SAXBuilder builder = new SAXBuilder(XMLReaders.NONVALIDATING);
             builder.setExpandEntities(true);
-            content = content.replaceAll("&(?!.{2,4};)", "&amp;");
+            content = AppUtils.escapeAmpersand(content);
             Document srcDoc = builder.build(new StringReader("<body unique_ref=\"m0\">" + content + "</body>"));
             root.addContent(srcDoc.getRootElement().detach());
         } catch (Exception ex) {
diff --git a/src/main/java/edu/cmu/oli/content/AppUtils.java b/src/main/java/edu/cmu/oli/content/AppUtils.java
@@ -36,6 +36,8 @@
 import java.security.SecureRandom;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
 /**
@@ -64,17 +66,20 @@ public static <T> T toClassObject(javax.json.JsonValue jsonValue, Class<T> class
     }
 
     public static String escapeAmpersand(String data) {
-        String[] split = data.split("\n");
-        StringBuilder sb = new StringBuilder();
-        for (int x = 0; x < split.length; x++) {
-            String str = split[x];
-            str = str.replaceAll("&(?!.{2,4};)", "&amp;");
-            sb.append(str);
-            if ((x + 1) < split.length) {
-                sb.append("\n");
-            }
+        String val = data.replaceAll("\\n", "``!");
+        String pattern = "(?s)(&lt;|<)!\\[CDATA\\[(.*?)\\]\\](&gt;|>)";
+        Matcher m = Pattern.compile(pattern).matcher(val);
+        List<String> cdataList = new ArrayList<>();
+        while (m.find()){
+            cdataList.add(m.group());
         }
-        return sb.toString();
+        val = val.replaceAll(pattern, "~~!");
+        val = val.replaceAll("&(?!.{2,4};)", "&amp;");
+        for(String cd : cdataList){
+            val = val.replaceFirst("~~!", cd);
+        }
+        val = val.replaceAll("``!", "\n");
+        return val;
     }
 
     public static JsonElement createJsonElement(String value) {
diff --git a/src/main/java/edu/cmu/oli/content/contentfiles/writers/ResourceToXml.java b/src/main/java/edu/cmu/oli/content/contentfiles/writers/ResourceToXml.java
@@ -5,6 +5,7 @@
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 import edu.cmu.oli.assessment.builders.Assessment2Transform;
+import edu.cmu.oli.content.AppUtils;
 import edu.cmu.oli.content.configuration.Configurations;
 import edu.cmu.oli.content.resource.builders.Json2Xml;
 import org.apache.commons.text.StringEscapeUtils;
@@ -114,12 +115,12 @@ public String resourceToXml(String type, String s) {
         cleanupGeneral(document);
 
         String data = xmlOut.outputString(document);
-
+        data = AppUtils.escapeAmpersand(data);
         String[] split = data.split("\n");
         StringBuilder sb = new StringBuilder();
         for (String str : split) {
             str = StringEscapeUtils.unescapeXml(str);
-            str = str.replaceAll("&(?!.{2,4};)", "&amp;").replaceAll("<m:math.*><!\\[CDATA\\[", "")
+            str = str.replaceAll("<m:math.*><!\\[CDATA\\[", "")
                     .replaceAll("\\]\\]>.*</m:math>", "");
             sb.append(str);
             sb.append("\n");
diff --git a/src/main/java/edu/cmu/oli/content/controllers/SVNSyncController.java b/src/main/java/edu/cmu/oli/content/controllers/SVNSyncController.java
@@ -623,7 +623,6 @@ private void createResource(String packageId, Path resourceFile, JsonObject reso
         try {
             if (jsonCapable) {
                 document = builder.build(new StringReader(fileString.trim()));
-                //.replaceAll("&", "&amp;")));
             } else {
                 document = builder.build(new StringReader(fileString.trim()));
             }
@@ -709,7 +708,6 @@ private void updateResource(String packageId, Path resourceFile, JsonObject reso
         try {
             if (jsonCapable) {
                 document = builder.build(new StringReader(fileString.trim()));
-                //.replaceAll("&", "&amp;")));
             } else {
                 document = builder.build(new StringReader(fileString.trim()));
             }
