fix: disable array request body

zeromicro · Jun 28, 2024 · 46a4367 · 46a4367
1 parent 01bbc78
commit 46a4367
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 10 deletions.
diff --git a/tools/goctl/pkg/parser/api/ast/servicestatement.go b/tools/goctl/pkg/parser/api/ast/servicestatement.go
@@ -575,3 +575,7 @@ func (e *BodyExpr) Pos() token.Position {
 }
 
 func (e *BodyExpr) exprNode() {}
+
+func (e *BodyExpr) IsArrayType() bool {
+	return e.LBrack != nil
+}
diff --git a/tools/goctl/pkg/parser/api/parser/analyzer.go b/tools/goctl/pkg/parser/api/parser/analyzer.go
@@ -255,14 +255,14 @@ func (a *Analyzer) fillService() error {
 			}
 
 			if astRoute.Route.Request != nil && astRoute.Route.Request.Body != nil {
-				requestType, err := a.getType(astRoute.Route.Request)
+				requestType, err := a.getType(astRoute.Route.Request, true)
 				if err != nil {
 					return err
 				}
 				route.RequestType = requestType
 			}
 			if astRoute.Route.Response != nil && astRoute.Route.Response.Body != nil {
-				responseType, err := a.getType(astRoute.Route.Response)
+				responseType, err := a.getType(astRoute.Route.Response, false)
 				if err != nil {
 					return err
 				}
@@ -391,8 +391,12 @@ func (a *Analyzer) findDefinedType(name string) (spec.Type, error) {
 	return nil, fmt.Errorf("type %s not defined", name)
 }
 
-func (a *Analyzer) getType(expr *ast.BodyStmt) (spec.Type, error) {
+func (a *Analyzer) getType(expr *ast.BodyStmt, req bool) (spec.Type, error) {
 	body := expr.Body
+	if req && body.IsArrayType() {
+		return nil, ast.SyntaxError(body.Pos(), "request body must be struct")
+	}
+
 	var tp spec.Type
 	var err error
 	var rawText = body.Format("")

diff --git a/tools/goctl/pkg/parser/api/parser/analyzer_test.go b/tools/goctl/pkg/parser/api/parser/analyzer_test.go
@@ -62,6 +62,10 @@ func Test_Parse(t *testing.T) {
 		for _, v := range testFile {
 			_, err := Parse(v, nil)
 			assertx.Error(t, err)
+			if err == nil {
+				data, _ := os.ReadFile(v)
+				fmt.Println(string(data))
+			}
 		}
 	})
 

diff --git a/tools/goctl/pkg/parser/api/parser/testdata/invalid.api b/tools/goctl/pkg/parser/api/parser/testdata/invalid.api
@@ -95,13 +95,6 @@ type Foo {
     Bar *map[[]int]string  `json:"bar"`
 }
 
------
-// test case:  map valu expected literal type
-syntax = "v1"
-type Foo {
-    Bar *map[string]{}  `json:"bar"`
-}
-
 -----
 // test case:  invalid slice
 syntax = "v1"
@@ -129,4 +122,20 @@ syntax = "v1"
 service example {
     @handler nestDemo
     post /example/nest (NestDemoReq) returns (NestDemoResp)
+}
+
+-----
+// test case:  unsupported array object request body
+syntax = "v1"
+service example {
+    @handler nestDemo
+    post /example/nest ([]NestDemoReq) returns (NestDemoResp)
+}
+
+-----
+    // test case:  unsupported array request body
+syntax = "v1"
+service example {
+    @handler nestDemo2
+    post /example/nest2 ([]string) returns (NestDemoResp)
 }