This is an automated email from the ASF dual-hosted git repository.
benjobs pushed a commit to branch dev-2.1.4
in repository https://gitbox.apache.org/repos/asf/incubator-streampark.git
The following commit(s) were added to refs/heads/dev-2.1.4 by this push:
new 97faeb9f4 [Improve] freemarker minor improvements
97faeb9f4 is described below
commit 97faeb9f4055e0c15621aaed2b668b88efc931e5
Author: benjobs <[email protected]>
AuthorDate: Tue Mar 19 00:51:07 2024 +0800
[Improve] freemarker minor improvements
---
streampark-console/streampark-console-service/pom.xml | 2 +-
.../java/org/apache/streampark/console/base/util/FreemarkerUtils.java | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/streampark-console/streampark-console-service/pom.xml
b/streampark-console/streampark-console-service/pom.xml
index 7022c2c24..f135f5b05 100644
--- a/streampark-console/streampark-console-service/pom.xml
+++ b/streampark-console/streampark-console-service/pom.xml
@@ -50,7 +50,7 @@
<jsch.version>0.2.11</jsch.version>
<shiro.version>1.10.0</shiro.version>
<p6spy.version>3.9.1</p6spy.version>
- <freemarker.version>2.3.30</freemarker.version>
+ <freemarker.version>2.3.32</freemarker.version>
<commons-email.version>1.5</commons-email.version>
<jwt.version>4.0.0</jwt.version>
<lombok.version>1.18.24</lombok.version>
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/util/FreemarkerUtils.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/util/FreemarkerUtils.java
index 518a056b4..8d7afc0db 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/util/FreemarkerUtils.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/util/FreemarkerUtils.java
@@ -18,6 +18,7 @@
package org.apache.streampark.console.base.util;
import freemarker.cache.StringTemplateLoader;
+import freemarker.core.TemplateClassResolver;
import freemarker.template.Configuration;
import freemarker.template.Template;
import freemarker.template.TemplateException;
@@ -36,6 +37,7 @@ public class FreemarkerUtils {
SpringTemplateLoader templateLoader =
new SpringTemplateLoader(new DefaultResourceLoader(),
"classpath:alert-template");
CONFIGURATION = new Configuration(Configuration.VERSION_2_3_28);
+
CONFIGURATION.setNewBuiltinClassResolver(TemplateClassResolver.SAFER_RESOLVER);
CONFIGURATION.setTemplateLoader(templateLoader);
CONFIGURATION.setDefaultEncoding("UTF-8");
}
@@ -51,6 +53,7 @@ public class FreemarkerUtils {
public static Template loadTemplateString(String template) throws Exception {
Configuration configuration = new
Configuration(Configuration.VERSION_2_3_28);
+
configuration.setNewBuiltinClassResolver(TemplateClassResolver.SAFER_RESOLVER);
StringTemplateLoader stringTemplateLoader = new StringTemplateLoader();
stringTemplateLoader.putTemplate("template", template);
configuration.setTemplateLoader(stringTemplateLoader);