add lua validation in analyze

Author: xynicole

analyze.go

@@ -155,6 +155,28 @@ func analyze(fname string, stmt *Directive, term string, ctx blockCtx, options *
 			continue
 		}
 
+		// check if the directive is a lua block
+		////nolint:ineffassign
+		if options.LexOptions.ExternalLexers != nil {
+			for _, lexer := range options.LexOptions.ExternalLexers {
+				if _, ok := lexer.(*LuaLexer); ok {
+					if (mask&ngxConfBlock) != 0 && term != ";" { // lua block end with ; not {
+						what = fmt.Sprintf(`Lua directive "%s" has no opening "{"`, stmt.Directive)
+						continue
+					}
+					// *_by_lua_block takes ngxConfNoArgs, set_by_lua_block: ngxConfTake1
+					// but parse takes a block as an extra argument and we need to +1
+					if ((mask&ngxConfNoArgs) != 0 && len(stmt.Args) == 1) ||
+						((mask&ngxConfTake1) != 0 && len(stmt.Args) == 2) {
+						return nil
+					} else {
+						what = fmt.Sprintf(`invalid number of arguments in "%s" directive`, stmt.Directive)
+						continue
+					}
+				}
+			}
+		}
+
 		// if the directive isn't a block but should be according to the mask
 		if (mask&ngxConfBlock) != 0 && term != "{" {
 			what = fmt.Sprintf(`directive "%s" has no opening "{"`, stmt.Directive)

analyze_test.go

@@ -1947,7 +1947,7 @@ func TestAnalyze_lua(t *testing.T) {
 			blockCtx{"http", "location", "location if"},
 			false,
 		},
-		"content_by_lua_file nor ok": {
+		"content_by_lua_file not ok": {
 			&Directive{
 				Directive: "content_by_lua_file",
 				Args:      []string{"foo/bar.lua"},
@@ -1992,6 +1992,78 @@ func TestAnalyze_lua(t *testing.T) {
 			blockCtx{"http"},
 			true,
 		},
+		"set_by_lua ok": {
+			&Directive{
+				Directive: "set_by_lua",
+				Args:      []string{"$res", "' return 32 + math.cos(32) '"},
+				Line:      5,
+			},
+			blockCtx{"server"},
+			false,
+		},
+		"set_by_lua not ok": {
+			&Directive{
+				Directive: "set_by_lua",
+				Args:      []string{"' return 32 + math.cos(32) '"},
+				Line:      5,
+			},
+			blockCtx{"http"},
+			true,
+		},
+		"set_by_lua_block ok": {
+			&Directive{
+				Directive: "set_by_lua_block",
+				Args:      []string{"$res", "{ return tonumber(ngx.var.foo) + 1 }"},
+				Line:      5,
+			},
+			blockCtx{"server"},
+			false,
+		},
+		"set_by_lua_block not ok": {
+			&Directive{
+				Directive: "set_by_lua_block",
+				Args:      []string{"{ return tonumber(ngx.var.foo) + 1 }"},
+				Line:      5,
+			},
+			blockCtx{"http"},
+			true,
+		},
+		"content_by_lua ok": {
+			&Directive{
+				Directive: "content_by_lua",
+				Args:      []string{"'ngx.say('I need no extra escaping here, for example: \r\nblah')'"},
+				Line:      5,
+			},
+			blockCtx{"location"},
+			false,
+		},
+		"content_by_lua not ok": {
+			&Directive{
+				Directive: "content_by_lua",
+				Args:      []string{"'ngx.say('I need no extra escaping here, for example: \r\nblah')'"},
+				Line:      5,
+			},
+			blockCtx{"http"},
+			true,
+		},
+		"content_by_lua_block ok": {
+			&Directive{
+				Directive: "content_by_lua_block",
+				Args:      []string{"{ngx.say('I need no extra escaping here, for example: \r\nblah')}"},
+				Line:      5,
+			},
+			blockCtx{"location"},
+			false,
+		},
+		"content_by_lua_block not ok": {
+			&Directive{
+				Directive: "content_by_lua_block",
+				Args:      []string{"{ngx.say('I need no extra escaping here, for example: \r\nblah')}"},
+				Line:      5,
+			},
+			blockCtx{"http"},
+			true,
+		},
 	}
 
 	for name, tc := range testcases {
@@ -2000,6 +2072,11 @@ func TestAnalyze_lua(t *testing.T) {
 			t.Parallel()
 			err := analyze("nginx.conf", tc.stmt, ";", tc.ctx, &ParseOptions{
 				MatchFuncs: []MatchFunc{MatchLua},
+				LexOptions: LexOptions{
+					ExternalLexers: []ExtLexer{
+						&LuaLexer{},
+					},
+				},
 			})
 
 			if !tc.wantErr && err != nil {