Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fixed all testcases #103

Merged
merged 2 commits into from
Feb 17, 2025
+456 −457
Merged

fixed all testcases #103

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bf0b4dc
fixed all testcases
reeshika-h Feb 13, 2025
7516acb
replaced json data with dummy data
reeshika-h Feb 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 21 additions & 12 deletions src/main/java/com/contentstack/utils/node/NodeToHTML.java
View file
Original file line number Diff line number Diff line change
@@ -29,35 +29,44 @@ private NodeToHTML() {
*/
public static String textNodeToHTML(JSONObject nodeText, Option renderOption) {
String text = nodeText.optString("text");
text = text.replace("\n", "<br />");
//Sanitization of text
String cleanedText = escapeTextNodes(text)
.replace("\n", "<br />")
.replace("\t", "&nbsp;&nbsp;&nbsp;&nbsp;");

if (nodeText.has("superscript")) {
text = renderOption.renderMark(MarkType.SUPERSCRIPT, text);
cleanedText = renderOption.renderMark(MarkType.SUPERSCRIPT, cleanedText);
}
if (nodeText.has("subscript")) {
text = renderOption.renderMark(MarkType.SUBSCRIPT, text);
cleanedText = renderOption.renderMark(MarkType.SUBSCRIPT, cleanedText);
}
if (nodeText.has("inlineCode")) {
text = renderOption.renderMark(MarkType.INLINECODE, text);
cleanedText = renderOption.renderMark(MarkType.INLINECODE, cleanedText);
}
if (nodeText.has("strikethrough")) {
text = renderOption.renderMark(MarkType.STRIKETHROUGH, text);
cleanedText = renderOption.renderMark(MarkType.STRIKETHROUGH, cleanedText);
}
if (nodeText.has("underline")) {
text = renderOption.renderMark(MarkType.UNDERLINE, text);
cleanedText = renderOption.renderMark(MarkType.UNDERLINE, cleanedText);
}
if (nodeText.has("italic")) {
text = renderOption.renderMark(MarkType.ITALIC, text);
cleanedText = renderOption.renderMark(MarkType.ITALIC, cleanedText);
}
if (nodeText.has("bold")) {
text = renderOption.renderMark(MarkType.BOLD, text);
cleanedText = renderOption.renderMark(MarkType.BOLD, cleanedText);
}
if (nodeText.has("break")) {
if (!text.contains("<br />")) {
text = renderOption.renderMark(MarkType.BREAK, text);
if (!cleanedText.contains("<br />")) {
cleanedText = renderOption.renderMark(MarkType.BREAK, cleanedText);
}
// text = renderOption.renderMark(MarkType.BREAK, text);
// cleanedText = renderOption.renderMark(MarkType.BREAK, cleanedText);
}
return text;
return cleanedText;
}

private static String escapeTextNodes(String input) {
return input.replace("&", "&amp;")
.replace("<", "&lt;")
.replace(">", "&gt;");
}
}
70 changes: 29 additions & 41 deletions src/main/java/com/contentstack/utils/render/DefaultOption.java
View file
Original file line number Diff line number Diff line change
@@ -6,8 +6,6 @@
import com.contentstack.utils.node.MarkType;
import org.apache.commons.text.StringEscapeUtils;
import org.json.JSONObject;
import org.jsoup.Jsoup;
import org.jsoup.nodes.Document;

import java.util.*;

@@ -104,79 +102,77 @@ private String escapeInjectHtml(JSONObject nodeObj, String nodeType) {
public String renderNode(String nodeType, JSONObject nodeObject, NodeCallback callback) {
String strAttrs = strAttrs(nodeObject);
String children = callback.renderChildren(nodeObject.optJSONArray("children"));
// Jsoup sanitization
Document sanitizedChildren = Jsoup.parse(children);
String cleanChildren = sanitizedChildren.body().html();

switch (nodeType) {
case "p":
return "<p" + strAttrs + ">" + cleanChildren + "</p>";
return "<p" + strAttrs + ">" + children + "</p>";
case "a":
return "<a" + strAttrs + " href=\"" + escapeInjectHtml(nodeObject, "href") + "\">" + cleanChildren + "</a>";
return "<a" + strAttrs + " href=\"" + escapeInjectHtml(nodeObject, "href") + "\">" + children + "</a>";
case "img":
String assetLink = getNodeStr(nodeObject, "asset-link");
if (!assetLink.isEmpty()) {
JSONObject attrs = nodeObject.optJSONObject("attrs");
if (attrs.has("link")) {
return "<a href=\"" + escapeInjectHtml(nodeObject, "link") + "\" >" + "<img" + strAttrs + " src=\"" + escapeInjectHtml(nodeObject, "asset-link") + "\" />" + cleanChildren + "</a>";
return "<a href=\"" + escapeInjectHtml(nodeObject, "link") + "\" >" + "<img" + strAttrs + " src=\"" + escapeInjectHtml(nodeObject, "asset-link") + "\" />" + children + "</a>";
}
return "<img" + strAttrs + " src=\"" + escapeInjectHtml(nodeObject, "asset-link") + "\" />" + cleanChildren;
return "<img" + strAttrs + " src=\"" + escapeInjectHtml(nodeObject, "asset-link") + "\" />" + children;
}
return "<img" + strAttrs + " src=\"" + escapeInjectHtml(nodeObject, "src") + "\" />" + cleanChildren;
return "<img" + strAttrs + " src=\"" + escapeInjectHtml(nodeObject, "src") + "\" />" + children;
case "embed":
return "<iframe" + strAttrs + " src=\"" + escapeInjectHtml(nodeObject, "src") + "\"" + cleanChildren + "</iframe>";
return "<iframe" + strAttrs + " src=\"" + escapeInjectHtml(nodeObject, "src") + "\"" + children + "</iframe>";
case "h1":
return "<h1" + strAttrs + ">" + cleanChildren + "</h1>";
return "<h1" + strAttrs + ">" + children + "</h1>";
case "h2":
return "<h2" + strAttrs + ">" + cleanChildren + "</h2>";
return "<h2" + strAttrs + ">" + children + "</h2>";
case "h3":
return "<h3" + strAttrs + ">" + cleanChildren + "</h3>";
return "<h3" + strAttrs + ">" + children + "</h3>";
case "h4":
return "<h4" + strAttrs + ">" + cleanChildren + "</h4>";
return "<h4" + strAttrs + ">" + children + "</h4>";
case "h5":
return "<h5" + strAttrs + ">" + cleanChildren + "</h5>";
return "<h5" + strAttrs + ">" + children + "</h5>";
case "h6":
return "<h6" + strAttrs + ">" + cleanChildren + "</h6>";
return "<h6" + strAttrs + ">" + children + "</h6>";
case "ol":
return "<ol" + strAttrs + ">" + cleanChildren + "</ol>";
return "<ol" + strAttrs + ">" + children + "</ol>";
case "ul":
return "<ul" + strAttrs + ">" + cleanChildren + "</ul>";
return "<ul" + strAttrs + ">" + children + "</ul>";
case "li":
return "<li" + strAttrs + ">" + cleanChildren + "</li>";
return "<li" + strAttrs + ">" + children + "</li>";
case "hr":
return "<hr" + strAttrs + " />";
case "table":
return "<table " + strAttrs + ">" + cleanChildren + "</table>";
return "<table " + strAttrs + ">" + children + "</table>";
case "thead":
return "<thead " + strAttrs + ">" + cleanChildren + "</thead>";
return "<thead " + strAttrs + ">" + children + "</thead>";
case "tbody":
return "<tbody" + strAttrs + ">" + cleanChildren + "</tbody>";
return "<tbody" + strAttrs + ">" + children + "</tbody>";
case "tfoot":
return "<tfoot" + strAttrs + ">" + cleanChildren + "</tfoot>";
return "<tfoot" + strAttrs + ">" + children + "</tfoot>";
case "tr":
return "<tr" + strAttrs + ">" + cleanChildren + "</tr>";
return "<tr" + strAttrs + ">" + children + "</tr>";
case "th":{
if (nodeObject.has("attrs") && nodeObject.optJSONObject("attrs").has("void") &&
nodeObject.optJSONObject("attrs").optBoolean("void")) {
return "";
}else{
return "<th" + strAttrs + ">" + cleanChildren + "</th>";}}
return "<th" + strAttrs + ">" + children + "</th>";}}
case "td":{
if (nodeObject.has("attrs") && nodeObject.optJSONObject("attrs").has("void") &&
nodeObject.optJSONObject("attrs").optBoolean("void")) {
return "";
}else{
return "<td" + strAttrs + ">" + cleanChildren + "</td>";}}
return "<td" + strAttrs + ">" + children + "</td>";}}

case "blockquote":
return "<blockquote" + strAttrs + ">" + cleanChildren + "</blockquote>";
return "<blockquote" + strAttrs + ">" + children + "</blockquote>";
case "code":
return "<code" + strAttrs + ">" + cleanChildren + "</code>";
return "<code" + strAttrs + ">" + children + "</code>";
case "reference":
return "";
case "fragment":
return "<fragment" + strAttrs + ">" + cleanChildren + "</fragment>";
return "<fragment" + strAttrs + ">" + children + "</fragment>";
default:
return cleanChildren;
return children;
}
}

@@ -197,16 +193,8 @@ String strAttrs(JSONObject nodeObject) {
for (String key : attrsObject.keySet()) {
Object objValue = attrsObject.opt(key);
String value = objValue.toString();

StringBuilder escapedValue = new StringBuilder();
for (char ch : value.toCharArray()) {
if (ch == '&' || ch == '<' || ch == '>' || ch == '"' || ch == '\'') {
escapedValue.append("&#").append((int) ch).append(';');
} else {
escapedValue.append(ch);
}
}
value = escapedValue.toString();
// Escape HTML entities using StringEscapeUtils
value = StringEscapeUtils.escapeHtml4(value);
// If style is available, do styling calculations
if (Objects.equals(key, "style")) {
String resultStyle = stringifyStyles(attrsObject.optJSONObject("style"));
Loading