fix regression in IsJson function (no longer accept white space in th…

…e beginning or the end)
lucee · Nov 16, 2023 · 352ee81 · 352ee81
1 parent 84a7830
commit 352ee81
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 6 deletions.
diff --git a/core/src/main/java/lucee/commons/io/log/log4j2/layout/JsonLayout.java b/core/src/main/java/lucee/commons/io/log/log4j2/layout/JsonLayout.java
@@ -337,11 +337,11 @@ public String toSerializable(final LogEvent event) {
 	}
 
 	private static Object toJson(String strJson, Object defaultValue) {
-		if (StringUtil.isEmpty(strJson)) {
+		if (StringUtil.isEmpty(strJson, true)) {
 			return defaultValue;
 		}
-
-		if (!(strJson.startsWith("{") && strJson.endsWith("}") || strJson.startsWith("[") && strJson.endsWith("]"))) {
+		strJson = strJson.trim();
+		if ((!strJson.startsWith("{") && !strJson.startsWith("[")) || (!strJson.endsWith("}") && !strJson.endsWith("]"))) {
 			return defaultValue;
 		}
 

diff --git a/core/src/main/java/lucee/runtime/functions/conversion/IsJSON.java b/core/src/main/java/lucee/runtime/functions/conversion/IsJSON.java
@@ -28,6 +28,12 @@ public class IsJSON {
 	public static boolean call(PageContext pc, Object obj) {
 		String str = Caster.toString(obj, null);
 		if (StringUtil.isEmpty(str, true)) return false;
+
+		str = str.trim();
+		if ((!str.startsWith("{") && !str.startsWith("[")) || (!str.endsWith("}") && !str.endsWith("]"))) {
+			return false;
+		}
+
 		try {
 			new JSONExpressionInterpreter().interpret(pc, str);
 			return true;

diff --git a/loader/build.xml b/loader/build.xml
@@ -2,7 +2,7 @@
 <project default="core" basedir="." name="Lucee" 
   xmlns:resolver="antlib:org.apache.maven.resolver.ant">
 
-  <property name="version" value="6.0.1.27-SNAPSHOT"/>
+  <property name="version" value="6.0.1.28-SNAPSHOT"/>
 
   <taskdef uri="antlib:org.apache.maven.resolver.ant" resource="org/apache/maven/resolver/ant/antlib.xml">
     <classpath>

diff --git a/loader/pom.xml b/loader/pom.xml
@@ -3,7 +3,7 @@
 
   <groupId>org.lucee</groupId>
   <artifactId>lucee</artifactId>
-  <version>6.0.1.27-SNAPSHOT</version>
+  <version>6.0.1.28-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>Lucee Loader Build</name>

diff --git a/test/functions/IsJson.cfc b/test/functions/IsJson.cfc
@@ -100,5 +100,12 @@ component extends="org.lucee.cfml.test.LuceeTestCase"	{
 		assertTrue(isJson('{}'));
 		assertEquals(deserializeJson('{}'), {});
 	}
-
+	function testWhiteSpace() {
+		// we allow white space, even it is not really correct
+		assertTrue(isJson(' {a:1} '));
+		assertTrue(isJson('	{a:1}	'));
+		assertTrue(isJson('
+{a:1}
+'));
+	}
 }