Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
net/http: omit invalid header value from error message
Invalid value may contain sensitive data.

Updates #43631
  • Loading branch information
AlexanderYastrebov committed Oct 14, 2021
1 parent 0400d53 commit c359542
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 9 deletions.
3 changes: 2 additions & 1 deletion src/net/http/transport.go
Expand Up @@ -525,7 +525,8 @@ func (t *Transport) roundTrip(req *Request) (*Response, error) {
for _, v := range vv {
if !httpguts.ValidHeaderFieldValue(v) {
req.closeBody()
return nil, fmt.Errorf("net/http: invalid header field value %q for key %v", v, k)
// Don't include the value in the error, because it may be sensitive.
return nil, fmt.Errorf("net/http: invalid header field value for %q", k)
}
}
}
Expand Down
16 changes: 8 additions & 8 deletions src/net/http/transport_test.go
Expand Up @@ -6060,14 +6060,14 @@ func TestTransportClosesBodyOnInvalidRequests(t *testing.T) {
Method: " ",
URL: u,
},
wantErr: "invalid method",
wantErr: `invalid method " "`,
},
{
name: "nil URL",
req: &Request{
Method: "GET",
},
wantErr: "nil Request.URL",
wantErr: `nil Request.URL`,
},
{
name: "invalid header key",
Expand All @@ -6076,7 +6076,7 @@ func TestTransportClosesBodyOnInvalidRequests(t *testing.T) {
Header: Header{"💡": {"emoji"}},
URL: u,
},
wantErr: "invalid header field name",
wantErr: `invalid header field name "💡"`,
},
{
name: "invalid header value",
Expand All @@ -6085,23 +6085,23 @@ func TestTransportClosesBodyOnInvalidRequests(t *testing.T) {
Header: Header{"key": {"\x19"}},
URL: u,
},
wantErr: "invalid header field value",
wantErr: `invalid header field value for "key"`,
},
{
name: "non HTTP(s) scheme",
req: &Request{
Method: "POST",
URL: &url.URL{Scheme: "faux"},
},
wantErr: "unsupported protocol scheme",
wantErr: `unsupported protocol scheme "faux"`,
},
{
name: "no Host in URL",
req: &Request{
Method: "POST",
URL: &url.URL{Scheme: "http"},
},
wantErr: "no Host",
wantErr: `no Host in request URL`,
},
}

Expand All @@ -6117,8 +6117,8 @@ func TestTransportClosesBodyOnInvalidRequests(t *testing.T) {
if !bc {
t.Fatal("Expected body to have been closed")
}
if g, w := err.Error(), tt.wantErr; !strings.Contains(g, w) {
t.Fatalf("Error mismatch\n\t%q\ndoes not contain\n\t%q", g, w)
if g, w := err.Error(), tt.wantErr; !strings.HasSuffix(g, w) {
t.Fatalf("Error mismatch: %q does not end with %q", g, w)
}
})
}
Expand Down

0 comments on commit c359542

Please sign in to comment.