Merge pull request #43 from nginxinc/types-dir

fix: validate body of types directive

Author: valyria257

analyze_map.go

@@ -32,6 +32,9 @@ var mapBodies = map[string]mapParameterMasks{
 	"match": {
 		defaultMasks: ngxConf1More,
 	},
+	"types": {
+		defaultMasks: ngxConf1More,
+	},
 }
 
 // analyzeMapBody validates the body of a map-like directive. Map-like directives are block directives

analyze_map_test.go

@@ -13,7 +13,7 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-// nolint:funlen
+//nolint:funlen,exhaustruct
 func TestAnalyzeMapBody(t *testing.T) {
 	t.Parallel()
 
@@ -82,6 +82,26 @@ func TestAnalyzeMapBody(t *testing.T) {
 			},
 			term: ";",
 		},
+		"valid types": {
+			mapDirective: "types",
+			parameter: &Directive{
+				Directive: "text/html",
+				Args:      []string{"html htm shtml"},
+				Line:      5,
+				Block:     Directives{},
+			},
+			term: ";",
+		},
+		"invalid types with special parameter": {
+			mapDirective: "types",
+			parameter: &Directive{
+				Directive: "hostnames",
+				Line:      5,
+				Block:     Directives{},
+			},
+			term:    ";",
+			wantErr: &ParseError{What: "invalid number of parameters"},
+		},
 		"invalid geo proxy_recursive parameter": {
 			mapDirective: "geo",
 			parameter: &Directive{

parse_test.go

@@ -43,7 +43,7 @@ func getTestConfigPath(parts ...string) string {
 	return filepath.Join("testdata", "configs", filepath.Join(parts...))
 }
 
-// nolint:gochecknoglobals
+//nolint:gochecknoglobals,exhaustruct
 var parseFixtures = []parseFixture{
 	{"includes-regular", "", ParseOptions{}, Payload{
 		Status: "failed",
@@ -1186,6 +1186,42 @@ var parseFixtures = []parseFixture{
 			},
 		},
 	}},
+	{"types", "", ParseOptions{ErrorOnUnknownDirectives: true}, Payload{
+		Status: "ok",
+		Config: []Config{
+			{
+				File:   getTestConfigPath("types", "nginx.conf"),
+				Status: "ok",
+				Parsed: Directives{
+					{
+						Directive: "http",
+						Args:      []string{},
+						Line:      1,
+						Block: Directives{
+							{
+								Directive: "types",
+								Line:      2,
+								Block: Directives{
+									{
+										Directive: "text/html",
+										Args:      []string{"html", "htm", "shtml"},
+										Line:      3,
+										Block:     Directives{},
+									},
+									{
+										Directive: "text/css",
+										Args:      []string{"css"},
+										Line:      4,
+										Block:     Directives{},
+									},
+								},
+							},
+						},
+					},
+				},
+			},
+		},
+	}},
 }
 
 func TestParse(t *testing.T) {

testdata/configs/types/nginx.conf

@@ -0,0 +1,6 @@
+http {
+    types {
+        text/html html htm shtml;
+        text/css css;
+    }
+}