chore: Handle invalid YAML files containing unterminated strings (#1970)

The old parser produced an error for these whereas the new parser just
ignores them.

Also renames the testdata directory from `protoyaml` to `parser` for
consistency.

Signed-off-by: Charith Ellawala <charith@cerbos.dev>

Signed-off-by: Charith Ellawala <charith@cerbos.dev>

internal/parser/parser.go

@@ -4,6 +4,7 @@
 package parser
 
 import (
+	"bytes"
 	"encoding/base64"
 	"errors"
 	"fmt"
@@ -107,6 +108,14 @@ func UnmarshalBytes[T proto.Message](contents []byte, factory func() T, opts ...
 	}
 
 	if len(f.Docs) == 0 {
+		if len(bytes.TrimSpace(contents)) > 0 {
+			// Special case for unterminated strings. See test case 20.
+			return nil, nil, NewUnmarshalError(&sourcev1.Error{
+				Kind:     sourcev1.Error_KIND_PARSE_ERROR,
+				Message:  "invalid document: contents are not valid YAML or JSON",
+				Position: &sourcev1.Position{Line: 1, Column: 1, Path: "$"},
+			})
+		}
 		return nil, nil, nil
 	}
 

internal/parser/parser_test.go

@@ -31,7 +31,7 @@ import (
 )
 
 func TestUnmarshal(t *testing.T) {
-	testCases := test.LoadTestCases(t, "protoyaml")
+	testCases := test.LoadTestCases(t, "parser")
 	validator, err := protovalidate.New(protovalidate.WithMessages(&policyv1.Policy{}))
 	require.NoError(t, err)
 
@@ -140,7 +140,7 @@ func loadTestCase(t *testing.T, tc test.Case) (*privatev1.ProtoYamlTestCase, io.
 
 func TestFind(t *testing.T) {
 	rnd := rand.New(rand.NewSource(42)) //nolint:gosec
-	testCases := test.LoadTestCases(t, "protoyaml")
+	testCases := test.LoadTestCases(t, "parser")
 	for _, testCase := range testCases {
 		tc, input := loadTestCase(t, testCase)
 		if len(tc.Want) == 0 {

internal/test/testdata/parser/case_020.json

@@ -0,0 +1,14 @@
+{
+    "description": "Invalid YAML file with unterminated string",
+    "wantErrors": [
+        {
+            "kind": "KIND_PARSE_ERROR",
+            "position": {
+                "line": 1,
+                "column": 1,
+                "path": "$"
+            },
+            "message": "invalid document: contents are not valid YAML or JSON"
+        }
+    ]
+}

internal/test/testdata/parser/case_020.json.input

@@ -0,0 +1 @@
+"This is not valid YAML

internal/test/testdata/parser/case_021.json

@@ -0,0 +1,32 @@
+{
+    "description": "YAML file with unterminated string",
+    "wantErrors": [
+        {
+            "kind": "KIND_PARSE_ERROR",
+            "position": {
+                "line": 4,
+                "column": 11,
+                "path": "$.variables"
+            },
+            "message": "expected map got Null"
+        }
+    ],
+    "want": [
+        {
+            "message": {
+                "apiVersion": "api.cerbos.dev/v1"
+            },
+            "errors": [
+                {
+                    "kind": "KIND_PARSE_ERROR",
+                    "position": {
+                        "line": 4,
+                        "column": 11,
+                        "path": "$.variables"
+                    },
+                    "message": "expected map got Null"
+                }
+            ]
+        }
+    ]
+}

internal/test/testdata/parser/case_021.json.input

@@ -0,0 +1,14 @@
+# yaml-language-server: $schema=../../../../../schema/jsonschema/cerbos/policy/v1/Policy.schema.json
+---
+apiVersion: api.cerbos.dev/v1
+variables:
+  "x: y
+resourcePolicy:
+  version: default
+  resource: leave_request
+  rules:
+    - actions: ['*']
+      effect: EFFECT_ALLOW
+      roles:
+        - admin
+      name: wildcard