qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-26 23:41:37 -07:00
Code Releases Activity

net/http/cgi: Correctly pass down the REMOTE_PORT value for CGI requests.

Browse Source 
Currently when we get a CGI or FCGI request, the remote port of the client
is hard coded to zero, despite nearly every webserver passing down the
REMOTE_PORT variable.

This was likely originally excluded because the CGI RFC (rfc3875) does not
mention anything about the remote port of the client. However every webserver
tested does pass REMOTE_PORT down. This includes Apache 2.2, Apache 2.4,
nginx and lighttpd.

Fixes #8351

Change-Id: I4c6366cb39f0ccc05e038bd31d85f93b76e8d0c8
Reviewed-on: https://go-review.googlesource.com/1750
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
This commit is contained in:
George Shammas 2014-12-17 23:22:49 -05:00 committed by Brad Fitzpatrick
parent 209dd4cdc1
commit 3ffc9756d1
2 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/net/http/cgi/child.go
View File

@ -132,9 +132,9 @@ func RequestFromMap(params map[string]string) (*http.Request, error) {
} }
// Request.RemoteAddr has its port set by Go's standard http // Request.RemoteAddr has its port set by Go's standard http
// server, so we do here too. We don't have one, though, so we // server, so we do here too.
// use a dummy one. remotePort, _ := strconv.Atoi(params["REMOTE_PORT"]) // zero if unset or invalid
r.RemoteAddr = net.JoinHostPort(params["REMOTE_ADDR"], "0") r.RemoteAddr = net.JoinHostPort(params["REMOTE_ADDR"], strconv.Itoa(remotePort))
return r, nil return r, nil
} }

21
src/net/http/cgi/child_test.go
View File

@ -22,6 +22,7 @@ func TestRequest(t *testing.T) {
"CONTENT_LENGTH": "123", "CONTENT_LENGTH": "123",
"CONTENT_TYPE": "text/xml", "CONTENT_TYPE": "text/xml",
"REMOTE_ADDR": "5.6.7.8", "REMOTE_ADDR": "5.6.7.8",
"REMOTE_PORT": "54321",
} }
req, err := RequestFromMap(env) req, err := RequestFromMap(env)
if err != nil { if err != nil {
@ -60,7 +61,7 @@ func TestRequest(t *testing.T) {
if req.TLS != nil { if req.TLS != nil {
t.Errorf("expected nil TLS") t.Errorf("expected nil TLS")
} }
if e, g := "5.6.7.8:0", req.RemoteAddr; e != g { if e, g := "5.6.7.8:54321", req.RemoteAddr; e != g {
t.Errorf("RemoteAddr: got %q; want %q", g, e) t.Errorf("RemoteAddr: got %q; want %q", g, e)
} }
} }
@ -129,3 +130,21 @@ func TestRequestWithoutRequestURI(t *testing.T) {
t.Errorf("URL = %q; want %q", g, e) t.Errorf("URL = %q; want %q", g, e)
} }
} }
func TestRequestWithoutRemotePort(t *testing.T) {
env := map[string]string{
"SERVER_PROTOCOL": "HTTP/1.1",
"HTTP_HOST": "example.com",
"REQUEST_METHOD": "GET",
"REQUEST_URI": "/path?a=b",
"CONTENT_LENGTH": "123",
"REMOTE_ADDR": "5.6.7.8",
}
req, err := RequestFromMap(env)
if err != nil {
t.Fatalf("RequestFromMap: %v", err)
}
if e, g := "5.6.7.8:0", req.RemoteAddr; e != g {
t.Errorf("RemoteAddr: got %q; want %q", g, e)
}
}