Fixes #258 - SpringStandardDialect doesn't allow to use custom IStand…

…ardConversionService
thymeleaf · Nov 28, 2021 · fa85d69 · fa85d69
1 parent 4a04e37
commit fa85d69
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 12 deletions.
diff --git a/thymeleaf-spring3/ChangeLog.txt b/thymeleaf-spring3/ChangeLog.txt
@@ -2,6 +2,7 @@
 ======
 - Fixed CVE-2021-43466: Specific scenarios in template injection may lead to remote code execution.
 - Fixed incorrect double-unescaping of request parameters breaking processing of forms during restricted mode checks.
+- Fixed SpringStandardDialect not allowing the use of a custom IStandardConversionService.
 
 
 3.0.12

diff --git a/thymeleaf-spring3/src/main/java/org/thymeleaf/spring3/dialect/SpringStandardDialect.java b/thymeleaf-spring3/src/main/java/org/thymeleaf/spring3/dialect/SpringStandardDialect.java
@@ -92,10 +92,6 @@ public class SpringStandardDialect extends StandardDialect {
     private boolean renderHiddenMarkersBeforeCheckboxes = DEFAULT_RENDER_HIDDEN_MARKERS_BEFORE_CHECKBOXES;
 
 
-    // These variables will be initialized lazily following the model applied in the extended StandardDialect.
-    private IExpressionObjectFactory expressionObjectFactory = null;
-    private IStandardConversionService conversionService = null;
-
 
 
 
@@ -174,6 +170,12 @@ public IStandardVariableExpressionEvaluator getVariableExpressionEvaluator() {
         return SPELVariableExpressionEvaluator.INSTANCE;
     }
 
+    @Override
+    public void setVariableExpressionEvaluator(final IStandardVariableExpressionEvaluator variableExpressionEvaluator) {
+        throw new UnsupportedOperationException(
+                "Variable Expression Evaluator cannot be modified in SpringStandardDialect");
+    }
+
 
 
     @Override

diff --git a/thymeleaf-spring4/ChangeLog.txt b/thymeleaf-spring4/ChangeLog.txt
@@ -2,6 +2,7 @@
 ======
 - Fixed CVE-2021-43466: Specific scenarios in template injection may lead to remote code execution.
 - Fixed incorrect double-unescaping of request parameters breaking processing of forms during restricted mode checks.
+- Fixed SpringStandardDialect not allowing the use of a custom IStandardConversionService.
 
 
 3.0.12

diff --git a/thymeleaf-spring4/src/main/java/org/thymeleaf/spring4/dialect/SpringStandardDialect.java b/thymeleaf-spring4/src/main/java/org/thymeleaf/spring4/dialect/SpringStandardDialect.java
@@ -96,10 +96,6 @@ public class SpringStandardDialect extends StandardDialect {
     private boolean renderHiddenMarkersBeforeCheckboxes = DEFAULT_RENDER_HIDDEN_MARKERS_BEFORE_CHECKBOXES;
 
 
-    // These variables will be initialized lazily following the model applied in the extended StandardDialect.
-    private IExpressionObjectFactory expressionObjectFactory = null;
-    private IStandardConversionService conversionService = null;
-
 
 
     public SpringStandardDialect() {
@@ -231,6 +227,12 @@ public IStandardVariableExpressionEvaluator getVariableExpressionEvaluator() {
         return SPELVariableExpressionEvaluator.INSTANCE;
     }
 
+    @Override
+    public void setVariableExpressionEvaluator(final IStandardVariableExpressionEvaluator variableExpressionEvaluator) {
+        throw new UnsupportedOperationException(
+                "Variable Expression Evaluator cannot be modified in SpringStandardDialect");
+    }
+
 
 
     @Override

diff --git a/thymeleaf-spring5/ChangeLog.txt b/thymeleaf-spring5/ChangeLog.txt
@@ -2,6 +2,7 @@
 ======
 - Fixed CVE-2021-43466: Specific scenarios in template injection may lead to remote code execution.
 - Fixed incorrect double-unescaping of request parameters breaking processing of forms during restricted mode checks.
+- Fixed SpringStandardDialect not allowing the use of a custom IStandardConversionService.
 
 
 3.0.12

diff --git a/thymeleaf-spring5/src/main/java/org/thymeleaf/spring5/dialect/SpringStandardDialect.java b/thymeleaf-spring5/src/main/java/org/thymeleaf/spring5/dialect/SpringStandardDialect.java
@@ -114,10 +114,6 @@ public class SpringStandardDialect extends StandardDialect {
     private static final String WEB_SESSION_EXECUTION_ATTRIBUTE_NAME =
             "ThymeleafReactiveModelAdditions:" + SpringContextUtils.WEB_SESSION_ATTRIBUTE_NAME;
 
-    // These variables will be initialized lazily following the model applied in the extended StandardDialect.
-    private IExpressionObjectFactory expressionObjectFactory = null;
-    private IStandardConversionService conversionService = null;
-
 
 
 
@@ -286,6 +282,12 @@ public IStandardVariableExpressionEvaluator getVariableExpressionEvaluator() {
         return SPELVariableExpressionEvaluator.INSTANCE;
     }
 
+    @Override
+    public void setVariableExpressionEvaluator(final IStandardVariableExpressionEvaluator variableExpressionEvaluator) {
+        throw new UnsupportedOperationException(
+                "Variable Expression Evaluator cannot be modified in SpringStandardDialect");
+    }
+
 
 
     @Override