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

…e beginning or the end)
lucee · Nov 16, 2023 · ad3040c · ad3040c
1 parent e57dac2
commit ad3040c
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 8 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,8 +28,8 @@ public class IsJSON {
 	public static boolean call(PageContext pc, Object obj) {
 		String str = Caster.toString(obj, null);
 		if (StringUtil.isEmpty(str, true)) return false;
-
-		if (!(str.startsWith("{") && str.endsWith("}") || str.startsWith("[") && str.endsWith("]"))) {
+		str = str.trim();
+		if ((!str.startsWith("{") && !str.startsWith("[")) || (!str.endsWith("}") && !str.endsWith("]"))) {
 			return false;
 		}
 
@@ -41,5 +41,4 @@ public static boolean call(PageContext pc, Object obj) {
 			return false;
 		}
 	}
-
 }
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="5.4.4.34-SNAPSHOT"/>
+  <property name="version" value="5.4.4.35-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>5.4.4.34-SNAPSHOT</version>
+  <version>5.4.4.35-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>Lucee Loader Build</name>

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