Make json schema validations stricter (librenms#17804)

Jellyfrog · web-flow · commit 3dcf8a219831 · 2025-06-09T13:21:47.000+02:00
diff --git a/composer.lock b/composer.lock
diff --git a/resources/definitions/config_definitions.json b/resources/definitions/config_definitions.json
@@ -1029,7 +1029,7 @@
                 "default": {}
             },
             "type": "array",
-            "validaton": {
+            "validate": {
                 "value": "array",
                 "value.*": "array"
             }
diff --git a/resources/definitions/schema/config_schema.json b/resources/definitions/schema/config_schema.json
@@ -34,8 +34,7 @@
                     },
                     "validate": {
                         "propertyNames": {
-                            "pattern": "^value",
-                            "type": "string"
+                            "pattern": "^value"
                         },
                         "required": ["value"]
                     },
@@ -134,8 +133,7 @@
                                     "directory"
                                 ]
                             }
-                        },
-                        "not": { "required": ["options"]}
+                        }
                     }
                 ],
                 "dependencies": {
diff --git a/tests/YamlSchemaTest.php b/tests/YamlSchemaTest.php
@@ -115,7 +115,7 @@ private function validateFileAgainstSchema(string $filePath, string $schema_file
             $validator->validate(
                 $data,
                 $schema,
-                Constraint::CHECK_MODE_TYPE_CAST  // | Constraint::CHECK_MODE_VALIDATE_SCHEMA
+                Constraint::CHECK_MODE_TYPE_CAST | Constraint::CHECK_MODE_VALIDATE_SCHEMA | Constraint::CHECK_MODE_EXCEPTIONS
             );
         } catch (JsonDecodingException $e) {
             // Output the filename so we know what file failed

Original file line number	Diff line number	Diff line change
`@@ -1029,7 +1029,7 @@`
`1029`	`1029`	`"default": {}`
`1030`	`1030`	`},`
`1031`	`1031`	`"type": "array",`
`1032`		`- "validaton": {`
	`1032`	`+ "validate": {`
`1033`	`1033`	`"value": "array",`
`1034`	`1034`	`"value.*": "array"`
`1035`	`1035`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,8 +34,7 @@`
`34`	`34`	`},`
`35`	`35`	`"validate": {`
`36`	`36`	`"propertyNames": {`
`37`		`- "pattern": "^value",`
`38`		`- "type": "string"`
	`37`	`+ "pattern": "^value"`
`39`	`38`	`},`
`40`	`39`	`"required": ["value"]`
`41`	`40`	`},`
`@@ -134,8 +133,7 @@`
`134`	`133`	`"directory"`
`135`	`134`	`]`
`136`	`135`	`}`
`137`		`- },`
`138`		`- "not": { "required": ["options"]}`
	`136`	`+ }`
`139`	`137`	`}`
`140`	`138`	`],`
`141`	`139`	`"dependencies": {`