src: run schema validation before option parsing

Author: mertcanaltin

src/node_config_file.cc

@@ -222,6 +222,33 @@ ParseResult ConfigReader::ParseConfig(const std::string_view& config_path) {
     return ParseResult::FileError;
   }
 
+  // Validate against JSON Schema before parsing options.
+  // ata works on the raw string independently of simdjson,
+  // so no re-parse is needed.
+  {
+    auto schema = ata::compile(kNodeConfigSchema);
+    if (schema) {
+      auto result = ata::validate(schema, file_content);
+      if (!result.valid) {
+        for (const auto& err : result.errors) {
+          if (err.code != ata::error_code::additional_property_not_allowed) {
+            FPrintF(
+                stderr, "Invalid configuration in %s:\n", config_path.data());
+            for (const auto& e : result.errors) {
+              if (e.code != ata::error_code::additional_property_not_allowed) {
+                FPrintF(stderr,
+                        "  %s: %s\n",
+                        e.path.empty() ? "/" : e.path,
+                        e.message);
+              }
+            }
+            return ParseResult::InvalidContent;
+          }
+        }
+      }
+    }
+  }
+
   // Parse the configuration file
   simdjson::ondemand::parser json_parser;
   simdjson::ondemand::document document;
@@ -325,32 +352,6 @@ ParseResult ConfigReader::ParseConfig(const std::string_view& config_path) {
     }
   }
 
-  // Validate against JSON Schema. Skip additionalProperties errors
-  // because unknown namespaces are intentionally ignored.
-  {
-    auto schema = ata::compile(kNodeConfigSchema);
-    if (schema) {
-      auto result = ata::validate(schema, file_content);
-      if (!result.valid) {
-        for (const auto& err : result.errors) {
-          if (err.code != ata::error_code::additional_property_not_allowed) {
-            FPrintF(
-                stderr, "Invalid configuration in %s:\n", config_path.data());
-            for (const auto& e : result.errors) {
-              if (e.code != ata::error_code::additional_property_not_allowed) {
-                FPrintF(stderr,
-                        "  %s: %s\n",
-                        e.path.empty() ? "/" : e.path,
-                        e.message);
-              }
-            }
-            return ParseResult::InvalidContent;
-          }
-        }
-      }
-    }
-  }
-
   return ParseResult::Valid;
 }