chore: exit early when failed to parse json spec

Author: reversearrow

datamodel/spec_info.go

@@ -7,10 +7,11 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"github.com/pb33f/libopenapi/utils"
-	"gopkg.in/yaml.v3"
 	"strings"
 	"time"
+
+	"github.com/pb33f/libopenapi/utils"
+	"gopkg.in/yaml.v3"
 )
 
 const (
@@ -103,18 +104,21 @@ func ExtractSpecInfoWithDocumentCheck(spec []byte, bypass bool) (*SpecInfo, erro
 	_, openAPI2 := utils.FindKeyNode(utils.OpenApi2, parsedSpec.Content)
 	_, asyncAPI := utils.FindKeyNode(utils.AsyncApi, parsedSpec.Content)
 
-	parseJSON := func(bytes []byte, spec *SpecInfo, parsedNode *yaml.Node) {
+	parseJSON := func(bytes []byte, spec *SpecInfo, parsedNode *yaml.Node) error {
 		var jsonSpec map[string]interface{}
 		if utils.IsYAML(string(bytes)) {
 			_ = parsedNode.Decode(&jsonSpec)
 			b, _ := json.Marshal(&jsonSpec)
 			spec.SpecJSONBytes = &b
 			spec.SpecJSON = &jsonSpec
 		} else {
-			_ = json.Unmarshal(bytes, &jsonSpec)
+			if err := json.Unmarshal(bytes, &jsonSpec); err != nil {
+				return err
+			}
 			spec.SpecJSONBytes = &bytes
 			spec.SpecJSON = &jsonSpec
 		}
+		return nil
 	}
 
 	//if !bypass {
@@ -148,7 +152,9 @@ func ExtractSpecInfoWithDocumentCheck(spec []byte, bypass bool) (*SpecInfo, erro
 		}
 
 		// parse JSON
-		parseJSON(spec, specInfo, &parsedSpec)
+		if err := parseJSON(spec, specInfo, &parsedSpec); err != nil {
+			return nil, fmt.Errorf("failed to parse json specification: %w", err)
+		}
 		parsed = true
 
 		// double check for the right version, people mix this up.
@@ -175,7 +181,9 @@ func ExtractSpecInfoWithDocumentCheck(spec []byte, bypass bool) (*SpecInfo, erro
 		specInfo.APISchema = OpenAPI2SchemaData
 
 		// parse JSON
-		parseJSON(spec, specInfo, &parsedSpec)
+		if err := parseJSON(spec, specInfo, &parsedSpec); err != nil {
+			return nil, fmt.Errorf("failed to parse json specification: %w", err)
+		}
 		parsed = true
 
 		// I am not certain this edge-case is very frequent, but let's make sure we handle it anyway.
@@ -199,7 +207,9 @@ func ExtractSpecInfoWithDocumentCheck(spec []byte, bypass bool) (*SpecInfo, erro
 		// TODO: format for AsyncAPI.
 
 		// parse JSON
-		parseJSON(spec, specInfo, &parsedSpec)
+		if err := parseJSON(spec, specInfo, &parsedSpec); err != nil {
+			return nil, fmt.Errorf("failed to parse json specification: %w", err)
+		}
 		parsed = true
 
 		// so far there is only 2 as a major release of AsyncAPI
@@ -214,7 +224,9 @@ func ExtractSpecInfoWithDocumentCheck(spec []byte, bypass bool) (*SpecInfo, erro
 	if specInfo.SpecType == "" {
 		// parse JSON
 		if !bypass {
-			parseJSON(spec, specInfo, &parsedSpec)
+			if err := parseJSON(spec, specInfo, &parsedSpec); err != nil {
+				return nil, fmt.Errorf("failed to parse json specification: %w", err)
+			}
 			parsed = true
 			specInfo.Error = errors.New("spec type not supported by libopenapi, sorry")
 			return specInfo, specInfo.Error
@@ -226,7 +238,9 @@ func ExtractSpecInfoWithDocumentCheck(spec []byte, bypass bool) (*SpecInfo, erro
 	//}
 
 	if !parsed {
-		parseJSON(spec, specInfo, &parsedSpec)
+		if err := parseJSON(spec, specInfo, &parsedSpec); err != nil {
+			return nil, fmt.Errorf("failed to parse json specification: %w", err)
+		}
 	}
 
 	// detect the original whitespace indentation