Merge pull request #45 from nginxinc/nlb-3041-js-import-context

add: allow njs directives in all supported contexts

Author: valyria257

analyze.go

@@ -2115,10 +2115,10 @@ var directives = map[string][]uint{
 		ngxStreamMainConf | ngxStreamSrvConf | ngxConfTake1,
 	},
 	"js_body_filter": {
-		ngxHTTPLocConf | ngxHTTPLmtConf | ngxConfTake1,
+		ngxHTTPLocConf | ngxHTTPLifConf | ngxHTTPLmtConf | ngxConfTake1,
 	},
 	"js_content": {
-		ngxHTTPLocConf | ngxHTTPLmtConf | ngxConfTake1,
+		ngxHTTPLocConf | ngxHTTPLifConf | ngxHTTPLmtConf | ngxConfTake1,
 	},
 	"js_fetch_ciphers": {
 		ngxHTTPMainConf | ngxHTTPSrvConf | ngxHTTPLocConf | ngxConfTake1,
@@ -2140,30 +2140,30 @@ var directives = map[string][]uint{
 		ngxStreamMainConf | ngxStreamSrvConf | ngxConfTake1,
 	},
 	"js_header_filter": {
-		ngxHTTPLocConf | ngxHTTPLmtConf | ngxConfTake1,
+		ngxHTTPLocConf | ngxHTTPLifConf | ngxHTTPLmtConf | ngxConfTake1,
 	},
 	"js_import": {
-		ngxHTTPMainConf | ngxConfTake13,
-		ngxStreamMainConf | ngxConfTake13,
+		ngxHTTPMainConf | ngxHTTPSrvConf | ngxHTTPLocConf | ngxConfTake13,
+		ngxStreamMainConf | ngxStreamSrvConf | ngxConfTake13,
 	},
 	"js_include": {
 		ngxHTTPMainConf | ngxConfTake1,
 		ngxStreamMainConf | ngxConfTake1,
 	},
 	"js_path": {
-		ngxHTTPMainConf | ngxConfTake1,
-		ngxStreamMainConf | ngxConfTake1,
+		ngxHTTPMainConf | ngxHTTPSrvConf | ngxHTTPLocConf | ngxConfTake1,
+		ngxStreamMainConf | ngxStreamSrvConf | ngxConfTake1,
 	},
 	"js_preread": {
 		ngxStreamMainConf | ngxStreamSrvConf | ngxConfTake1,
 	},
 	"js_set": {
-		ngxHTTPMainConf | ngxConfTake2,
-		ngxStreamMainConf | ngxConfTake2,
+		ngxHTTPMainConf | ngxHTTPSrvConf | ngxHTTPLocConf | ngxConfTake2,
+		ngxStreamMainConf | ngxStreamSrvConf | ngxConfTake2,
 	},
 	"js_var": {
-		ngxHTTPMainConf | ngxConfTake12,
-		ngxStreamMainConf | ngxConfTake12,
+		ngxHTTPMainConf | ngxHTTPSrvConf | ngxHTTPLocConf | ngxConfTake12,
+		ngxStreamMainConf | ngxStreamSrvConf | ngxConfTake12,
 	},
 	"keyval": {
 		ngxHTTPMainConf | ngxConfTake3,

analyze_test.go

@@ -172,20 +172,30 @@ func TestAnalyze_auth_jwt_require(t *testing.T) {
 	}
 }
 
+//nolint:exhaustruct
 func TestAnalyze_njs(t *testing.T) {
 	t.Parallel()
 	testcases := map[string]struct {
 		stmt    *Directive
 		ctx     blockCtx
 		wantErr bool
 	}{
-		"js_import ok": {
+		"js_import in http location context ok": {
 			&Directive{
 				Directive: "js_import",
 				Args:      []string{"http.js"},
 				Line:      5,
 			},
-			blockCtx{"http"},
+			blockCtx{"http", "location"},
+			false,
+		},
+		"js_import in stream server context ok": {
+			&Directive{
+				Directive: "js_import",
+				Args:      []string{"http.js"},
+				Line:      5,
+			},
+			blockCtx{"stream", "server"},
 			false,
 		},
 		"js_import not ok": {
@@ -194,7 +204,25 @@ func TestAnalyze_njs(t *testing.T) {
 				Args:      []string{"http.js"},
 				Line:      5,
 			},
-			blockCtx{"http", "location"},
+			blockCtx{"http", "location", "if"},
+			true,
+		},
+		"js_content in location if context ok": {
+			&Directive{
+				Directive: "js_content",
+				Args:      []string{"function"},
+				Line:      5,
+			},
+			blockCtx{"http", "location", "if"},
+			false,
+		},
+		"js_content not ok": {
+			&Directive{
+				Directive: "js_content",
+				Args:      []string{"function"},
+				Line:      5,
+			},
+			blockCtx{"http", "server", "if"},
 			true,
 		},
 	}