Merge branch 'master' of https://github.com/cybersonic/cfdocs

foundeo · Oct 21, 2024 · 12c9951 · 12c9951
2 parents ec7f173 + 1738c6c
commit 12c9951
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 11 deletions.
diff --git a/data/en/all.json b/data/en/all.json
diff --git a/data/en/cfswitch.json b/data/en/cfswitch.json
@@ -2,6 +2,7 @@
 	"name":"cfswitch",
 	"type":"tag",
 	"syntax":"<cfswitch expression=\"\">",
+	"script":"switch (expression) { }",
 	"related":["cfcase","cfdefaultcase"],
 	"description":"Evaluates a passed expression and passes control to the cfcase tag that matches the expression result. You can, optionally, code a cfdefaultcase tag, which receives control if there is no matching cfcase tag value. Note the difference in the tag and script syntax when providing multiple values for a case.",
 	"params": [

diff --git a/data/en/configimport.json b/data/en/configimport.json
@@ -54,17 +54,13 @@
 
     ],
     "engines": {
-        "lucee": {"minimum_version":"5.3.8.207", "notes":"", "docs":"https://docs.lucee.org/reference/functions/configimport.html"}
+        "lucee": {"minimum_version":"5.3.8", "notes":"Added in 5.3.8.207", "docs":"https://docs.lucee.org/reference/functions/configimport.html"}
     },
-    "links": [{
-        "title":"configimport",
-        "description":"Lucee Documentation for configimport",
-        "url":"https://docs.lucee.org/reference/functions/configimport.html"
-    }],
+    "links": [],
     "examples": [
         {
             "title": "Example for importing a configuration",
-            "description": "Imports a configuration based on the CFConfig format from a file using a passeword stored in an environment variable.",
+            "description": "Imports a configuration based on the CFConfig format from a file using a password stored in an environment variable.",
             "code": "configImport(\n\tpath: expandPath('/config/config.json'),\n\ttype: 'server',\n\tpassword: SERVER.system.environment.PASSWORD\n);",
             "runnable":false
         }

diff --git a/data/en/functions.json b/data/en/functions.json
diff --git a/data/en/iif.json b/data/en/iif.json
@@ -19,7 +19,11 @@
 		"openbd": {"minimum_version":"", "notes":"", "docs":"http://openbd.org/manual/?/function/iif"}
 	},
 	"links": [
-
+		{
+			"title": "ColdFusion IIF Security Guide",
+			"description": "Learn how to avoid RCE with the IIF function.",
+			"url": "https://foundeo.com/security/guide/iif/"
+		}
 	],
     "examples": [
 		{

diff --git a/data/en/index.json b/data/en/index.json
diff --git a/guides/en/system-properties.md b/guides/en/system-properties.md
@@ -63,9 +63,14 @@ Introduced with ColdFusion 2021 Update 1. It defaults to `false` but when set to
 
 Introduced in March 2024 via ColdFusion 2021 Update 13 and ColdFusion 2023 Update 7, and on these versions defaults to `false`. When set to `true` unscoped variable resolution will traverse through all the implicit scopes such as `form`, `url`, `cgi`, `cookie`, when `false` the scope needs to be specified. This change was introduced as part of a security hotfix: [APSB24-14](https://helpx.adobe.com/security/products/coldfusion/apsb24-14.html) and Adobe recommends keeping it to `false`. More [info about searchImplicitScopes here](https://www.petefreitag.com/blog/cf-searchimplicitscopes/)
 
+## `-Dcoldfusion.encryption.useCFMX_COMPATAsDefault`
+
+Added in June 2024 via ColdFusion 2021 Update 14 and CF2023 update 8. Defaults to `false`, when `true` it uses `CFMX_COMPAT` as the default algorithm for the `encrypt()` `decrypt()` and `hash()` (uses MD5) functions.
+
 # Standard Java System Properties
 
 The following system properties apply to the java runtime:
 
 * [Java Networking System Properties](https://docs.oracle.com/en/java/javase/11/docs/api/java.base/java/net/doc-files/net-properties.html)
 * [Java Crypto Related System and Security Properties](https://www.java.com/en/configure_crypto.html) 
+* [Java System Property Reference Guide](https://system-properties.com/)