Skip to content

Improve FTL data resource rendering restrictions #1156

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

Merged
dixitdeepak merged 3 commits into from
May 4, 2026
Merged

Improve FTL data resource rendering restrictions #1156

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e8366c6
Improve FTL data resource rendering restrictions
dixitdeepak May 4, 2026
0dd777a
FreeMarker templates should not be rendered from text-based or link-b…
dixitdeepak May 4, 2026
f9b6d3e
Removed unused import
dixitdeepak May 4, 2026
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
24 changes: 9 additions & 15 deletions applications/content/src/main/java/org/apache/ofbiz/content/data/DataResourceWorker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,9 @@
import org.apache.ofbiz.base.util.Debug;
import org.apache.ofbiz.base.util.FileUtil;
import org.apache.ofbiz.base.util.GeneralException;
import org.apache.ofbiz.base.util.StringUtil;
import org.apache.ofbiz.base.util.UtilCodec;
import org.apache.ofbiz.base.util.UtilDateTime;
import org.apache.ofbiz.base.util.UtilGenerics;
import org.apache.ofbiz.base.util.UtilHttp;
import org.apache.ofbiz.base.util.UtilIO;
Expand Down Expand Up @@ -883,8 +885,6 @@ public static void renderDataResourceAsText(LocalDispatcher dispatcher, Delegato

// FTL template
if ("FTL".equals(dataTemplateTypeId)) {
throw new GeneralException("Error rendering template: FTL template type is no longer supported for data resources.");
/*
try {
// get the template data for rendering
String templateText = getDataResourceText(dataResource, targetMimeTypeId, locale, templateContext, delegator, cache);
Expand All @@ -894,7 +894,7 @@ public static void renderDataResourceAsText(LocalDispatcher dispatcher, Delegato
StringBuffer newTemplateText = new StringBuffer(templateText);
String webAnalyticsCode = "<script type=\"text/javascript\">";
for (GenericValue webAnalytic : webAnalytics) {
StringWrapper wrapString = StringUtil.wrapString((String) webAnalytic.get("webAnalyticsCode"));
StringUtil.StringWrapper wrapString = StringUtil.wrapString((String) webAnalytic.get("webAnalyticsCode"));
webAnalyticsCode += wrapString.toString();
}
webAnalyticsCode += "</script>";
Expand All @@ -904,24 +904,18 @@ public static void renderDataResourceAsText(LocalDispatcher dispatcher, Delegato

// render the FTL template
boolean useTemplateCache = cache && !UtilProperties.getPropertyAsBoolean("content", "disable.ftl.template.cache", false);
//Do not use dataResource.lastUpdatedStamp for dataResource template caching as it may use ftl file or electronicText
// If dataResource using ftl file use nowTimestamp to avoid freemarker caching
Timestamp lastUpdatedStamp = UtilDateTime.nowTimestamp();
//If dataResource is type of ELECTRONIC_TEXT then only use the lastUpdatedStamp of electronicText entity for freemarker caching
if ("ELECTRONIC_TEXT".equals(dataResource.getString("dataResourceTypeId"))) {
GenericValue electronicText = dataResource.getRelatedOne("ElectronicText", true);
if (electronicText != null) {
lastUpdatedStamp = electronicText.getTimestamp("lastUpdatedStamp");
}
if ("ELECTRONIC_TEXT".equals(dataResource.getString("dataResourceTypeId"))
|| "SHORT_TEXT".equalsIgnoreCase(dataResource.getString("dataResourceTypeId"))
|| "LINK".equalsIgnoreCase(dataResource.getString("dataResourceTypeId"))) {
throw new GeneralException("Error rendering template: FreeMarker templates are no longer supported for "
+ dataResource.getString("dataResourceTypeId") + " data resources.");
}

FreeMarkerWorker.renderTemplateFromString("delegator:" + delegator.getDelegatorName() + ":DataResource:"
+ dataResourceId, templateText, templateContext, out, lastUpdatedStamp.getTime(), useTemplateCache);
+ dataResourceId, templateText, templateContext, out, UtilDateTime.nowTimestamp().getTime(), useTemplateCache);
} catch (TemplateException e) {
throw new GeneralException("Error rendering FTL template", e);
}
*/

} else if ("XSLT".equals(dataTemplateTypeId)) {
File targetFileLocation = new File(System.getProperty("ofbiz.home") + "/runtime/tempfiles/docbook.css");
String defaultVisualThemeId = EntityUtilProperties.getPropertyValue("general", "VISUAL_THEME", delegator);
Expand Down
Loading