Rework PATH_INFO computation

tucksaun · tucksaun · commit 15a91004b814 · 2022-05-13T10:36:49.000-04:00
Before we were adding PATH_INFO only when `.php` was detected in the URI. Now we always provide the PATH_INFO based on what the Go web server parsed (which excludes the query string) and if we detect `.php` we only provide the trailing bit after. This will remove any query string from PATH_INFO (fix #135), and will also always provide a PATH_INFO even if the script name is not within the URI.
diff --git a/local/php/envs.go b/local/php/envs.go
@@ -36,12 +36,12 @@ func (p *Server) generateEnv(req *http.Request) map[string]string {
 		https = "On"
 	}
 
-	pathInfo := ""
-	if pos := strings.Index(strings.ToLower(req.RequestURI), ".php"); pos != -1 {
-		file := req.RequestURI[:pos+4]
+	pathInfo := req.URL.Path
+	if pos := strings.Index(strings.ToLower(pathInfo), ".php"); pos != -1 {
+		file := pathInfo[:pos+4]
 		if _, err := os.Stat(filepath.Join(p.documentRoot, file)); err == nil {
 			scriptName = file
-			pathInfo = req.RequestURI[pos+4:]
+			pathInfo = pathInfo[pos+4:]
 		}
 	}
 
diff --git a/local/php/envs_test.go b/local/php/envs_test.go
@@ -43,13 +43,24 @@ func (s *PHPFPMSuite) TestGenerateEnv(c *C) {
 			passthru: "/index.php",
 			uri:      "/",
 			expected: map[string]string{
-				"PATH_INFO":       "",
+				"PATH_INFO":       "/",
 				"REQUEST_URI":     "/",
 				"QUERY_STRING":    "",
 				"SCRIPT_FILENAME": testdataDir + "/public/index.php",
 				"SCRIPT_NAME":     "/index.php",
 			},
 		},
+		{
+			passthru: "/index.php",
+			uri:      "/?foo=bar",
+			expected: map[string]string{
+				"PATH_INFO":       "/",
+				"REQUEST_URI":     "/",
+				"QUERY_STRING":    "foo=bar",
+				"SCRIPT_FILENAME": testdataDir + "/public/index.php",
+				"SCRIPT_NAME":     "/index.php",
+			},
+		},
 		{
 			passthru: "/index.php",
 			uri:      "/index.php",
@@ -83,6 +94,17 @@ func (s *PHPFPMSuite) TestGenerateEnv(c *C) {
 				"SCRIPT_NAME":     "/app.PHP",
 			},
 		},
+		{
+			passthru: "/index.php",
+			uri:      "/index.php/foo?foo=bar",
+			expected: map[string]string{
+				"PATH_INFO":       "/foo",
+				"REQUEST_URI":     "/index.php/foo?foo=bar",
+				"QUERY_STRING":    "foo=bar",
+				"SCRIPT_FILENAME": testdataDir + "/public/index.php",
+				"SCRIPT_NAME":     "/index.php",
+			},
+		},
 		{
 			passthru: "/index.php",
 			uri:      "/foo",

Original file line number	Diff line number	Diff line change
`@@ -36,12 +36,12 @@ func (p Server) generateEnv(req http.Request) map[string]string {`
`36`	`36`	`https = "On"`
`37`	`37`	`}`
`38`	`38`
`39`		`- pathInfo := ""`
`40`		`- if pos := strings.Index(strings.ToLower(req.RequestURI), ".php"); pos != -1 {`
`41`		`- file := req.RequestURI[:pos+4]`
	`39`	`+ pathInfo := req.URL.Path`
	`40`	`+ if pos := strings.Index(strings.ToLower(pathInfo), ".php"); pos != -1 {`
	`41`	`+ file := pathInfo[:pos+4]`
`42`	`42`	`if _, err := os.Stat(filepath.Join(p.documentRoot, file)); err == nil {`
`43`	`43`	`scriptName = file`
`44`		`- pathInfo = req.RequestURI[pos+4:]`
	`44`	`+ pathInfo = pathInfo[pos+4:]`
`45`	`45`	`}`
`46`	`46`	`}`
`47`	`47`