Merge branch 'NLB-1784-update-geo' into 'master'

xynicole · xynicole · commit d31845cae58f · 2022-06-15T17:46:53.000Z
fix: add validation for geo range parameter

See merge request f5/nginx/crossplane-go!33
diff --git a/parse.go b/parse.go
@@ -443,7 +443,7 @@ func analyzeMapContents(fname string, stmt *Directive, term string) error {
 			Line: &stmt.Line,
 		}
 	}
-	if len(stmt.Args) != 1 {
+	if len(stmt.Args) != 1 && stmt.Directive != "ranges" {
 		return &ParseError{
 			What: "invalid number of parameters",
 			File: &fname,
diff --git a/parse_test.go b/parse_test.go
@@ -985,7 +985,7 @@ var parseFixtures = []parseFixture{
 			{
 				File: getTestConfigPath("invalid-map", "nginx.conf"),
 				Error: &ParseError{
-					`invalid number of the map parameters`,
+					`invalid number of parameters`,
 					pStr(getTestConfigPath("invalid-map", "nginx.conf")),
 					pInt(10),
 					nil,
@@ -995,7 +995,7 @@ var parseFixtures = []parseFixture{
 			{
 				File: getTestConfigPath("invalid-map", "nginx.conf"),
 				Error: &ParseError{
-					`invalid number of the map parameters`,
+					`invalid number of parameters`,
 					pStr(getTestConfigPath("invalid-map", "nginx.conf")),
 					pInt(14),
 					nil,
@@ -1019,7 +1019,7 @@ var parseFixtures = []parseFixture{
 					},
 					{
 						Error: &ParseError{
-							`invalid number of the map parameters`,
+							`invalid number of parameters`,
 							pStr(getTestConfigPath("invalid-map", "nginx.conf")),
 							pInt(10),
 							nil,
@@ -1028,7 +1028,7 @@ var parseFixtures = []parseFixture{
 					},
 					{
 						Error: &ParseError{
-							`invalid number of the map parameters`,
+							`invalid number of parameters`,
 							pStr(getTestConfigPath("invalid-map", "nginx.conf")),
 							pInt(14),
 							nil,
@@ -1083,7 +1083,7 @@ var parseFixtures = []parseFixture{
 		Status: "ok",
 		Config: []Config{
 			{
-				File:   getTestConfigPath("directive-with-space", "nginx.conf"),
+				File:   getTestConfigPath("geo", "nginx.conf"),
 				Status: "ok",
 				Parsed: Directives{
 					{
@@ -1108,57 +1108,63 @@ var parseFixtures = []parseFixture{
 								Args:      []string{"$geo"},
 								Line:      6,
 								Block: Directives{
+									{
+										Directive: "ranges",
+										Args:      []string{},
+										Line:      7,
+										Block:     Directives{},
+									},
 									{
 										Directive: "default",
 										Args:      []string{"0"},
-										Line:      7,
+										Line:      8,
 										Block:     Directives{},
 									},
 									{
 										Directive: "192.168.1.0/24",
 										Args:      []string{"1"},
-										Line:      8,
+										Line:      9,
 										Block:     Directives{},
 									},
 									{
 										Directive: "127.0.0.1",
 										Args:      []string{"2"},
-										Line:      9,
+										Line:      10,
 										Block:     Directives{},
 									},
 								},
 							},
 							{
 								Directive: "server",
 								Args:      []string{},
-								Line:      11,
+								Line:      12,
 								Block: Directives{
 									{
 										Directive: "listen",
 										Args:      []string{"127.0.0.1:8080"},
-										Line:      12,
+										Line:      13,
 										Block:     Directives{},
 									},
 									{
 										Directive: "server_name",
 										Args:      []string{"default_server"},
-										Line:      13,
+										Line:      14,
 										Block:     Directives{},
 									},
 									{
 										Directive: "location",
 										Args:      []string{"/"},
-										Line:      14,
+										Line:      15,
 										Block: Directives{
 											{
 												Directive: "if",
 												Args:      []string{"$geo", "=", "2"},
-												Line:      15,
+												Line:      16,
 												Block: Directives{
 													{
 														Directive: "return",
 														Args:      []string{"403"},
-														Line:      16,
+														Line:      17,
 														Block:     Directives{},
 													},
 												},
diff --git a/testdata/configs/geo/nginx.conf b/testdata/configs/geo/nginx.conf
@@ -4,6 +4,7 @@ events {
 
 http {
     geo $geo {
+        ranges;
         default        0;
         192.168.1.0/24 1;
         127.0.0.1      2;
diff --git a/testdata/configs/geo/nginx.json b/testdata/configs/geo/nginx.json
@@ -34,22 +34,27 @@
               ],
               "block": [
                 {
-                  "directive": "default",
+                  "directive": "ranges",
                   "line": 7,
+                  "args": []
+                },
+                {
+                  "directive": "default",
+                  "line": 8,
                   "args": [
                     "0"
                   ]
                 },
                 {
                   "directive": "192.168.1.0/24",
-                  "line": 8,
+                  "line": 9,
                   "args": [
                     "1"
                   ]
                 },
                 {
                   "directive": "127.0.0.1",
-                  "line": 9,
+                  "line": 10,
                   "args": [
                     "2"
                   ]
@@ -58,33 +63,33 @@
             },
             {
               "directive": "server",
-              "line": 11,
+              "line": 12,
               "args": [],
               "block": [
                 {
                   "directive": "listen",
-                  "line": 12,
+                  "line": 13,
                   "args": [
                     "127.0.0.1:8080"
                   ]
                 },
                 {
                   "directive": "server_name",
-                  "line": 13,
+                  "line": 14,
                   "args": [
                     "default_server"
                   ]
                 },
                 {
                   "directive": "location",
-                  "line": 14,
+                  "line": 15,
                   "args": [
                     "/"
                   ],
                   "block": [
                     {
                       "directive": "if",
-                      "line": 15,
+                      "line": 16,
                       "args": [
                         "$geo",
                         "=",
@@ -93,7 +98,7 @@
                       "block": [
                         {
                           "directive": "return",
-                          "line": 16,
+                          "line": 17,
                           "args": [
                             "403"
                           ]
diff --git a/testdata/configs/geo/xp.json b/testdata/configs/geo/xp.json
@@ -34,22 +34,27 @@
               ],
               "block": [
                 {
-                  "directive": "default",
+                  "directive": "ranges",
                   "line": 7,
+                  "args": []
+                },
+                {
+                  "directive": "default",
+                  "line": 8,
                   "args": [
                     "0"
                   ]
                 },
                 {
                   "directive": "192.168.1.0/24",
-                  "line": 8,
+                  "line": 9,
                   "args": [
                     "1"
                   ]
                 },
                 {
                   "directive": "127.0.0.1",
-                  "line": 9,
+                  "line": 10,
                   "args": [
                     "2"
                   ]
@@ -58,33 +63,33 @@
             },
             {
               "directive": "server",
-              "line": 11,
+              "line": 12,
               "args": [],
               "block": [
                 {
                   "directive": "listen",
-                  "line": 12,
+                  "line": 13,
                   "args": [
                     "127.0.0.1:8080"
                   ]
                 },
                 {
                   "directive": "server_name",
-                  "line": 13,
+                  "line": 14,
                   "args": [
                     "default_server"
                   ]
                 },
                 {
                   "directive": "location",
-                  "line": 14,
+                  "line": 15,
                   "args": [
                     "/"
                   ],
                   "block": [
                     {
                       "directive": "if",
-                      "line": 15,
+                      "line": 16,
                       "args": [
                         "$geo",
                         "=",
@@ -93,7 +98,7 @@
                       "block": [
                         {
                           "directive": "return",
-                          "line": 16,
+                          "line": 17,
                           "args": [
                             "403"
                           ]

Original file line number	Diff line number	Diff line change
`@@ -443,7 +443,7 @@ func analyzeMapContents(fname string, stmt *Directive, term string) error {`
`443`	`443`	`Line: &stmt.Line,`
`444`	`444`	`}`
`445`	`445`	`}`
`446`		`- if len(stmt.Args) != 1 {`
	`446`	`+ if len(stmt.Args) != 1 && stmt.Directive != "ranges" {`
`447`	`447`	`return &ParseError{`
`448`	`448`	`What: "invalid number of parameters",`
`449`	`449`	`File: &fname,`
Original file line number	Diff line number	Diff line change
`@@ -34,22 +34,27 @@`
`34`	`34`	`],`
`35`	`35`	`"block": [`
`36`	`36`	`{`
`37`		`- "directive": "default",`
	`37`	`+ "directive": "ranges",`
`38`	`38`	`"line": 7,`
	`39`	`+ "args": []`
	`40`	`+ },`
	`41`	`+ {`
	`42`	`+ "directive": "default",`
	`43`	`+ "line": 8,`
`39`	`44`	`"args": [`
`40`	`45`	`"0"`
`41`	`46`	`]`
`42`	`47`	`},`
`43`	`48`	`{`
`44`	`49`	`"directive": "192.168.1.0/24",`
`45`		`- "line": 8,`
	`50`	`+ "line": 9,`
`46`	`51`	`"args": [`
`47`	`52`	`"1"`
`48`	`53`	`]`
`49`	`54`	`},`
`50`	`55`	`{`
`51`	`56`	`"directive": "127.0.0.1",`
`52`		`- "line": 9,`
	`57`	`+ "line": 10,`
`53`	`58`	`"args": [`
`54`	`59`	`"2"`
`55`	`60`	`]`
`@@ -58,33 +63,33 @@`
`58`	`63`	`},`
`59`	`64`	`{`
`60`	`65`	`"directive": "server",`
`61`		`- "line": 11,`
	`66`	`+ "line": 12,`
`62`	`67`	`"args": [],`
`63`	`68`	`"block": [`
`64`	`69`	`{`
`65`	`70`	`"directive": "listen",`
`66`		`- "line": 12,`
	`71`	`+ "line": 13,`
`67`	`72`	`"args": [`
`68`	`73`	`"127.0.0.1:8080"`
`69`	`74`	`]`
`70`	`75`	`},`
`71`	`76`	`{`
`72`	`77`	`"directive": "server_name",`
`73`		`- "line": 13,`
	`78`	`+ "line": 14,`
`74`	`79`	`"args": [`
`75`	`80`	`"default_server"`
`76`	`81`	`]`
`77`	`82`	`},`
`78`	`83`	`{`
`79`	`84`	`"directive": "location",`
`80`		`- "line": 14,`
	`85`	`+ "line": 15,`
`81`	`86`	`"args": [`
`82`	`87`	`"/"`
`83`	`88`	`],`
`84`	`89`	`"block": [`
`85`	`90`	`{`
`86`	`91`	`"directive": "if",`
`87`		`- "line": 15,`
	`92`	`+ "line": 16,`
`88`	`93`	`"args": [`
`89`	`94`	`"$geo",`
`90`	`95`	`"=",`
`@@ -93,7 +98,7 @@`
`93`	`98`	`"block": [`
`94`	`99`	`{`
`95`	`100`	`"directive": "return",`
`96`		`- "line": 16,`
	`101`	`+ "line": 17,`
`97`	`102`	`"args": [`
`98`	`103`	`"403"`
`99`	`104`	`]`