reproduce + fix #444: ValidateRequest for application/x-yaml (#445)

Author: fenollp

openapi3/schema.go

@@ -800,13 +800,22 @@ func (schema *Schema) visitJSON(settings *schemaValidationSettings, value interf
 		return schema.visitJSONArray(settings, value)
 	case map[string]interface{}:
 		return schema.visitJSONObject(settings, value)
-	default:
-		return &SchemaError{
-			Value:       value,
-			Schema:      schema,
-			SchemaField: "type",
-			Reason:      fmt.Sprintf("unhandled value of type %T", value),
+	case map[interface{}]interface{}: // for YAML cf. issue #444
+		values := make(map[string]interface{}, len(value))
+		for key, v := range value {
+			if k, ok := key.(string); ok {
+				values[k] = v
+			}
 		}
+		if len(value) == len(values) {
+			return schema.visitJSONObject(settings, values)
+		}
+	}
+	return &SchemaError{
+		Value:       value,
+		Schema:      schema,
+		SchemaField: "type",
+		Reason:      fmt.Sprintf("unhandled value of type %T", value),
 	}
 }
 

routers/legacy/issue444_test.go

@@ -0,0 +1,58 @@
+package legacy_test
+
+import (
+	"bytes"
+	"context"
+	"net/http/httptest"
+	"testing"
+
+	"github.com/getkin/kin-openapi/openapi3"
+	"github.com/getkin/kin-openapi/openapi3filter"
+	legacyrouter "github.com/getkin/kin-openapi/routers/legacy"
+	"github.com/stretchr/testify/require"
+)
+
+func TestIssue444(t *testing.T) {
+	loader := openapi3.NewLoader()
+	oas, err := loader.LoadFromData([]byte(`
+openapi: '3.0.0'
+info:
+  title: API
+  version: 1.0.0
+paths:
+  '/path':
+    post:
+      requestBody:
+        required: true
+        content:
+          application/x-yaml:
+            schema:
+              type: object
+      responses:
+        '200':
+          description: x
+          content:
+            application/json:
+              schema:
+                type: string
+`))
+	require.NoError(t, err)
+	router, err := legacyrouter.NewRouter(oas)
+	require.NoError(t, err)
+
+	r := httptest.NewRequest("POST", "/path", bytes.NewReader([]byte(`
+foo: bar
+`)))
+	r.Header.Set("Content-Type", "application/x-yaml")
+
+	openapi3.SchemaErrorDetailsDisabled = true
+	route, pathParams, err := router.FindRoute(r)
+	require.NoError(t, err)
+	reqValidationInput := &openapi3filter.RequestValidationInput{
+		Request:    r,
+		PathParams: pathParams,
+		Route:      route,
+	}
+	err = openapi3filter.ValidateRequest(context.Background(), reqValidationInput)
+	require.NoError(t, err)
+}