Fixes

Signed-off-by: Juan Cruz Viotti <jv@jviotti.com>

Author: jviotti

src/command_compile.cc

@@ -1,6 +1,7 @@
 #include <sourcemeta/core/io.h>
 #include <sourcemeta/core/json.h>
 #include <sourcemeta/core/jsonschema.h>
+#include <sourcemeta/core/regex.h>
 #include <sourcemeta/core/yaml.h>
 
 #include <sourcemeta/blaze/compiler.h>
@@ -69,6 +70,14 @@ auto sourcemeta::jsonschema::compile(const sourcemeta::core::Options &options)
 
   if (options.contains("include") && !options.at("include").empty()) {
     std::string name{options.at("include").front()};
+
+    static const auto IDENTIFIER_PATTERN{
+        sourcemeta::core::to_regex("^[A-Za-z_][A-Za-z0-9_]*$")};
+    if (!IDENTIFIER_PATTERN.has_value() ||
+        !sourcemeta::core::matches(IDENTIFIER_PATTERN.value(), name)) {
+      throw InvalidIncludeIdentifier{name};
+    }
+
     std::transform(name.begin(), name.end(), name.begin(),
                    [](unsigned char character) -> unsigned char {
                      return static_cast<unsigned char>(std::toupper(character));

src/error.h

@@ -81,6 +81,21 @@ class InvalidLintRuleError : public std::runtime_error {
   std::string rule_;
 };
 
+class InvalidIncludeIdentifier : public std::runtime_error {
+public:
+  InvalidIncludeIdentifier(std::string identifier)
+      : std::runtime_error{"The include identifier is not a valid C/C++ "
+                           "identifier"},
+        identifier_{std::move(identifier)} {}
+
+  [[nodiscard]] auto identifier() const noexcept -> const std::string & {
+    return this->identifier_;
+  }
+
+private:
+  std::string identifier_;
+};
+
 class LintAutoFixError : public std::runtime_error {
 public:
   LintAutoFixError(std::string message, std::filesystem::path path,
@@ -316,6 +331,10 @@ inline auto try_catch(const sourcemeta::core::Options &options,
     const auto is_json{options.contains("json")};
     print_exception(is_json, error);
     return EXIT_FAILURE;
+  } catch (const InvalidIncludeIdentifier &error) {
+    const auto is_json{options.contains("json")};
+    print_exception(is_json, error);
+    return EXIT_FAILURE;
   } catch (const LintAutoFixError &error) {
     const auto is_json{options.contains("json")};
     print_exception(is_json, error);

test/CMakeLists.txt

@@ -362,6 +362,7 @@ add_jsonschema_test_unix(compile/pass_custom_extension_yaml)
 add_jsonschema_test_unix(compile/pass_include)
 add_jsonschema_test_unix(compile/pass_include_lowercase)
 add_jsonschema_test_unix(compile/pass_include_short)
+add_jsonschema_test_unix(compile/fail_include_invalid_identifier)
 
 # Canonicalize
 add_jsonschema_test_unix(canonicalize/pass_input_unmodified)

test/compile/fail_include_invalid_identifier.sh

@@ -0,0 +1,42 @@
+#!/bin/sh
+
+set -o errexit
+set -o nounset
+
+TMP="$(mktemp -d)"
+clean() { rm -rf "$TMP"; }
+trap clean EXIT
+
+cat << 'EOF' > "$TMP/schema.json"
+{
+  "$id": "https://example.com",
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
+  "type": "string"
+}
+EOF
+
+# Test with hyphen (invalid)
+"$1" compile "$TMP/schema.json" --include my-schema 2>"$TMP/stderr.txt" \
+  && CODE="$?" || CODE="$?"
+test "$CODE" = "1" || exit 1
+
+cat << 'EOF' > "$TMP/expected.txt"
+error: The include identifier is not a valid C/C++ identifier
+  at identifier my-schema
+EOF
+
+diff "$TMP/stderr.txt" "$TMP/expected.txt"
+
+# JSON error
+"$1" compile "$TMP/schema.json" --include my-schema --json > "$TMP/stdout.txt" 2>&1 \
+  && CODE="$?" || CODE="$?"
+test "$CODE" = "1" || exit 1
+
+cat << 'EOF' > "$TMP/expected.txt"
+{
+  "error": "The include identifier is not a valid C/C++ identifier",
+  "identifier": "my-schema"
+}
+EOF
+
+diff "$TMP/stdout.txt" "$TMP/expected.txt"