Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Added support for index.php in subdirectories #259

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open

Added support for index.php in subdirectories #259

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
18fc8ce
Added support for index.php in nested directories
maciekpaprocki Feb 1, 2023
1f434ad
added fix for loading php files outside of document root
maciekpaprocki Feb 25, 2023
caacbd1
removed forgotten debug statement
maciekpaprocki Feb 25, 2023
3d76f9f
added check for resolution with direct file
maciekpaprocki Feb 25, 2023
150e5ec
started rewrite
maciekpaprocki Mar 10, 2023
53fb9a0
Merge branch 'main' into feature/add-index-in-subdirectories
maciekpaprocki Mar 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
44 changes: 35 additions & 9 deletions local/php/envs.go
View file
Open in desktop
Expand Up @@ -30,20 +30,46 @@ import (
"github.com/symfony-cli/symfony-cli/envs"
)

func (p *Server) generateEnv(req *http.Request) map[string]string {
scriptName := p.passthru
https := ""
if req.TLS != nil {
https = "On"
}
func (p *Server) resolveScriptName(pathInfo string) (string, string) {

pathInfo = path.Clean(pathInfo)

maciekpaprocki marked this conversation as resolved.
Show resolved Hide resolved
pathInfo := req.URL.Path
if pos := strings.Index(strings.ToLower(pathInfo), ".php"); pos != -1 {
file := path.Clean(pathInfo[:pos+4])

if _, err := os.Stat(filepath.Join(p.documentRoot, file)); err == nil {
return file, pathInfo[pos+4:]
}

}

maciekpaprocki marked this conversation as resolved.
Show resolved Hide resolved
if len(pathInfo) <= 1 {
return p.passthru, pathInfo
}

paths := strings.Split(pathInfo, "/")

for n := len(paths); n > 0; n-- {
file := filepath.Clean(filepath.Join(paths[:n]...))
if _, err := os.Stat(filepath.Join(p.documentRoot, file)); err == nil {
scriptName = file
pathInfo = pathInfo[pos+4:]
serverPath := path.Join(paths[n:]...)
if serverPath == "" && pathInfo[len(pathInfo)-1:] != "/" {
return file, ""
}
return file, "/" + serverPath
}

}

return p.passthru, pathInfo
}

func (p *Server) generateEnv(req *http.Request) map[string]string {
scriptName, pathInfo := p.resolveScriptName(req.URL.Path)

maciekpaprocki marked this conversation as resolved.
Show resolved Hide resolved
https := ""
if req.TLS != nil {
https = "On"
}

remoteAddr := req.Header.Get("X-Client-IP")
Expand Down
134 changes: 133 additions & 1 deletion local/php/envs_test.go
View file
Open in desktop
Expand Up @@ -182,6 +182,138 @@ func (s *PHPFPMSuite) TestGenerateEnv(c *C) {
"SCRIPT_NAME": "/index.php",
},
},
{
passthru: "/index.php",
uri: "/subdirectory",
expected: map[string]string{
"PATH_INFO": "",
"REQUEST_URI": "/subdirectory",
"QUERY_STRING": "",
"SCRIPT_FILENAME": testdataDir + "/public/subdirectory/index.php",
"SCRIPT_NAME": "/subdirectory/index.php",
},
},
{
passthru: "/index.php",
uri: "/subdirectory/",
expected: map[string]string{
"PATH_INFO": "/",
"REQUEST_URI": "/subdirectory/",
"QUERY_STRING": "",
"SCRIPT_FILENAME": testdataDir + "/public/subdirectory/index.php",
"SCRIPT_NAME": "/subdirectory/index.php",
},
},
{
passthru: "/index.php",
uri: "/subdirectory/unknown.php",
expected: map[string]string{
"PATH_INFO": "/unknown.php",
"REQUEST_URI": "/subdirectory/unknown.php",
"QUERY_STRING": "",
"SCRIPT_FILENAME": testdataDir + "/public/subdirectory/index.php",
"SCRIPT_NAME": "/subdirectory/index.php",
},
},
{
passthru: "/index.php",
uri: "/subdirectory/unknown.php/",
expected: map[string]string{
"PATH_INFO": "/unknown.php/",
"REQUEST_URI": "/subdirectory/unknown.php/",
"QUERY_STRING": "",
"SCRIPT_FILENAME": testdataDir + "/public/subdirectory/index.php",
"SCRIPT_NAME": "/subdirectory/index.php",
},
},
{
passthru: "/index.php",
uri: "/subdirectory/index.php/foo",
expected: map[string]string{
"PATH_INFO": "/foo",
"REQUEST_URI": "/subdirectory/index.php/foo",
"QUERY_STRING": "",
"SCRIPT_FILENAME": testdataDir + "/public/subdirectory/index.php",
"SCRIPT_NAME": "/subdirectory/index.php",
},
},
{
passthru: "/index.php",
uri: "/subdirectory/subdirectory/",
expected: map[string]string{
"PATH_INFO": "/",
"REQUEST_URI": "/subdirectory/subdirectory/",
"QUERY_STRING": "",
"SCRIPT_FILENAME": testdataDir + "/public/subdirectory/subdirectory/index.php",
"SCRIPT_NAME": "/subdirectory/subdirectory/index.php",
},
},
{
passthru: "/index.php",
uri: "///subdirectory",
expected: map[string]string{
"PATH_INFO": "///subdirectory",
"REQUEST_URI": "///subdirectory",
"QUERY_STRING": "",
"SCRIPT_FILENAME": testdataDir + "/public/index.php",
"SCRIPT_NAME": "/index.php",
},
maciekpaprocki marked this conversation as resolved.
Show resolved Hide resolved
},
{
passthru: "/index.php",
uri: "/subdirectory///subdirectory//foo/",
expected: map[string]string{
"PATH_INFO": "/subdirectory/foo/",
"REQUEST_URI": "/subdirectory/subdirectory/foo/",
"QUERY_STRING": "",
"SCRIPT_FILENAME": testdataDir + "/public/subdirectory/subdirectory/index.php",
"SCRIPT_NAME": "/subdirectory/subdirectory/index.php",
},
},
{
passthru: "/index.php",
uri: "/../index.php",
expected: map[string]string{
"PATH_INFO": "/../index.php",
"REQUEST_URI": "/../index.php",
"QUERY_STRING": "",
"SCRIPT_FILENAME": testdataDir + "/public/index.php",
"SCRIPT_NAME": "/index.php",
},
maciekpaprocki marked this conversation as resolved.
Show resolved Hide resolved
},
{
passthru: "/index.php",
uri: "/subdirectory/../../index.php",
expected: map[string]string{
"PATH_INFO": "/../../index.php",
"REQUEST_URI": "/subdirectory/../../index.php",
"QUERY_STRING": "",
"SCRIPT_FILENAME": testdataDir + "/public/subdirectory/index.php",
"SCRIPT_NAME": "/subdirectory/index.php",
},
maciekpaprocki marked this conversation as resolved.
Show resolved Hide resolved
},
{
passthru: "/index.php",
uri: "/subdirectory/subdirectory/foo/subdirectory/bar",
expected: map[string]string{
"PATH_INFO": "/foo/subdirectory/bar",
"REQUEST_URI": "/subdirectory/subdirectory/foo/subdirectory/bar",
"QUERY_STRING": "",
"SCRIPT_FILENAME": testdataDir + "/public/subdirectory/subdirectory/index.php",
"SCRIPT_NAME": "/subdirectory/subdirectory/index.php",
},
},
{
passthru: "/index.php",
uri: "/foo/../update.php",
expected: map[string]string{
"PATH_INFO": "/foo/../update.php",
"REQUEST_URI": "/foo/../update.php",
"QUERY_STRING": "",
"SCRIPT_FILENAME": testdataDir + "/public/index.php",
"SCRIPT_NAME": "/index.php",
},
maciekpaprocki marked this conversation as resolved.
Show resolved Hide resolved
},
}
for _, test := range tests {
process := &Server{
Expand All @@ -197,7 +329,7 @@ func (s *PHPFPMSuite) TestGenerateEnv(c *C) {
for k, v := range test.expected {
vv, ok := env[k]
c.Assert(ok, Equals, true)
c.Assert(vv, DeepEquals, v)
c.Assert(vv, DeepEquals, v, Commentf("#test uri:\"%s\" varName:\"%s\"", test.uri, k))
}
}
}
Empty file added local/php/testdata/index.php
View file
Open in desktop
Empty file.
Empty file added local/php/testdata/public/subdirectory/index.php
View file
Open in desktop
Empty file.
Empty file added local/php/testdata/public/subdirectory/subdirectory/index.php
View file
Open in desktop
Empty file.