Skip to content

Commit

Permalink
fix: ensure that SERVER_PORT is always defined
Browse files Browse the repository at this point in the history
  • Loading branch information
dunglas committed Sep 17, 2023
1 parent 09b2282 commit 48908f5
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 26 deletions.
46 changes: 21 additions & 25 deletions cgi.go
Original file line number Diff line number Diff line change
Expand Up @@ -122,35 +122,31 @@ func populateEnv(request *http.Request) error {
}
}

_, serverNameOk := fc.Env["SERVER_NAME"]
_, serverPortOk := fc.Env["SERVER_PORT"]
if !serverNameOk || !serverPortOk {
reqHost, reqPort, err := net.SplitHostPort(request.Host)
if err == nil {
if !serverNameOk {
fc.Env["SERVER_NAME"] = reqHost
}
if fc.Env["SERVER_NAME"] == "" || fc.Env["SERVER_PORT"] == "" {
reqHost, reqPort, _ := net.SplitHostPort(request.Host)
if fc.Env["SERVER_NAME"] == "" {
fc.Env["SERVER_NAME"] = reqHost
}
if fc.Env["SERVER_PORT"] == "" {
fc.Env["SERVER_PORT"] = reqPort
}

// compliance with the CGI specification requires that
// SERVER_PORT should only exist if it's a valid numeric value.
// Info: https://www.ietf.org/rfc/rfc3875 Page 18
if !serverPortOk {
// compliance with the CGI specification requires that
// the SERVER_PORT variable MUST be set to the TCP/IP port number on which this request is received from the client
// even if the port is the default port for the scheme and could otherwise be omitted from a URI.
// https://tools.ietf.org/html/rfc3875#section-4.1.15
if reqPort != "" {
fc.Env["SERVER_PORT"] = reqPort
} else if fc.Env["REQUEST_SCHEME"] == "http" {
fc.Env["SERVER_PORT"] = "80"
} else if fc.Env["REQUEST_SCHEME"] == "https" {
fc.Env["SERVER_PORT"] = "443"
}
}
} else if !serverNameOk {
if fc.Env["SERVER_NAME"] == "" {
// whatever, just assume there was no port
fc.Env["SERVER_NAME"] = request.Host
}

// compliance with the CGI specification requires that
// the SERVER_PORT variable MUST be set to the TCP/IP port number on which this request is received from the client
// even if the port is the default port for the scheme and could otherwise be omitted from a URI.
// https://tools.ietf.org/html/rfc3875#section-4.1.15
if fc.Env["SERVER_PORT"] == "" {
if fc.Env["REQUEST_SCHEME"] == "https" {
fc.Env["SERVER_PORT"] = "443"
} else {
fc.Env["SERVER_PORT"] = "80"
}
}
}

// Variables defined in CGI 1.1 spec
Expand Down
2 changes: 1 addition & 1 deletion frankenphp_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ func testServerVariable(t *testing.T, opts *testOptions) {
assert.Contains(t, strBody, "[SERVER_SOFTWARE] => FrankenPHP")
assert.Contains(t, strBody, "[REQUEST_TIME_FLOAT]")
assert.Contains(t, strBody, "[REQUEST_TIME]")
assert.Contains(t, strBody, "[REQUEST_TIME]")
assert.Contains(t, strBody, "[SERVER_PORT] => 80")
}, opts)
}

Expand Down

0 comments on commit 48908f5

Please sign in to comment.