Merge pull request #720 from tdakkota/fix/non-primitive-content

fix(parser): check that content parameter style is primitive
ogen-go · Dec 13, 2022 · 4c85100 · 4c85100
2 parents 1cf9f39 + 6cb2212
commit 4c85100
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 13 deletions.
diff --git a/gen/gen_parameters.go b/gen/gen_parameters.go
@@ -181,7 +181,7 @@ func isSupportedParamStyle(param *openapi.Parameter) error {
 		return &ErrNotImplemented{Name: "spaceDelimited parameter style"}
 
 	case openapi.QueryStylePipeDelimited:
-		if param.Schema.Type == jsonschema.Object {
+		if s := param.Schema; s != nil && s.Type == jsonschema.Object {
 			return &ErrNotImplemented{Name: "pipeDelimited style for object parameters"}
 		}
 	}

diff --git a/openapi/parser/_testdata/negative/parameters/query/combination_content.json b/openapi/parser/_testdata/negative/parameters/query/combination_content.json
@@ -0,0 +1,35 @@
+{
+  "openapi": "3.0.3",
+  "info": {
+    "title": "title",
+    "version": "v0.1.0"
+  },
+  "paths": {
+    "/foo": {
+      "get": {
+        "parameters": [
+          {
+            "name": "foo",
+            "in": "query",
+            "style": "pipeDelimited",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "type": "string"
+                  }
+                }
+              }
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "User info"
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/openapi/parser/parse_header.go b/openapi/parser/parse_header.go
@@ -83,11 +83,8 @@ func (p *parser) parseHeader(name string, header *ogen.Header, ctx *jsonpointer.
 		Pointer:     locator.Pointer(p.file(ctx)),
 	}
 
-	// TODO: Validate content?
-	if header.Content == nil {
-		if err := p.validateParamStyle(op, p.file(ctx)); err != nil {
-			return nil, err
-		}
+	if err := p.validateParamStyle(op, p.file(ctx)); err != nil {
+		return nil, err
 	}
 
 	return op, nil

diff --git a/openapi/parser/parse_parameter.go b/openapi/parser/parse_parameter.go
@@ -172,11 +172,8 @@ func (p *parser) parseParameter(param *ogen.Parameter, ctx *jsonpointer.ResolveC
 		Pointer:       locator.Pointer(p.file(ctx)),
 	}
 
-	// TODO: Validate content?
-	if param.Content == nil {
-		if err := p.validateParamStyle(op, p.file(ctx)); err != nil {
-			return nil, err
-		}
+	if err := p.validateParamStyle(op, p.file(ctx)); err != nil {
+		return nil, err
 	}
 
 	return op, nil
@@ -322,8 +319,16 @@ func (p *parser) validateParamStyle(param *openapi.Parameter, file location.File
 		return nil
 	}
 
-	if err := check(param.Schema); err != nil {
-		return wrap("schema", err)
+	switch {
+	case param.Schema != nil:
+		if err := check(param.Schema); err != nil {
+			return wrap("schema", err)
+		}
+	case param.Content != nil:
+		if !allowed(primitive) {
+			err := errors.New("content parameter should be primitive")
+			return wrap("style", err)
+		}
 	}
 
 	return nil