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

net/http: revert CL 89275 (don't sniff Content-Type when nosniff set)

Browse Source 
Also updates the bundled http2 to x/net/http2 git rev 49c15d80 for:

   http2: revert CL 107295 (don't sniff Content-type in Server when nosniff)
   https://golang.org/cl/126895

Fixes #24795

Change-Id: I6ae1a21c919947089274e816eb628d20490f83ce
Reviewed-on: https://go-review.googlesource.com/126896
Reviewed-by: Damien Neil <dneil@google.com>
This commit is contained in:
Brad Fitzpatrick 2018-07-31 17:09:49 +00:00
parent 9e2a4f4dff
commit d3c3aaa61f
4 changed files with 3 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
doc/go1.11.html
View File

@ -677,10 +677,7 @@ for k := range m {
methods will return errors after a shutdown or close. methods will return errors after a shutdown or close.
</p> </p>
<p><!-- CL 89275 --> <!-- CL 89275 was reverted before Go 1.11 -->
The HTTP server will no longer automatically set the Content-Type if a
<code>Handler</code> sets the "<code>X-Content-Type-Options</code>" header to "<code>nosniff</code>".
</p>
<p><!-- CL 93296 --> <p><!-- CL 93296 -->
The constant <code>StatusMisdirectedRequest</code> is now defined for HTTP status code 421. The constant <code>StatusMisdirectedRequest</code> is now defined for HTTP status code 421.

10
src/net/http/h2_bundle.go
View File

@ -6135,15 +6135,7 @@ func (rws *http2responseWriterState) writeChunk(p []byte) (n int, err error) {
} }
_, hasContentType := rws.snapHeader["Content-Type"] _, hasContentType := rws.snapHeader["Content-Type"]
if !hasContentType && http2bodyAllowedForStatus(rws.status) && len(p) > 0 { if !hasContentType && http2bodyAllowedForStatus(rws.status) && len(p) > 0 {
if cto := rws.snapHeader.Get("X-Content-Type-Options"); strings.EqualFold("nosniff", cto) { ctype = DetectContentType(p)
// nosniff is an explicit directive not to guess a content-type.
// Content-sniffing is no less susceptible to polyglot attacks via
// hosted content when done on the server.
ctype = "application/octet-stream"
rws.conn.logf("http2: WriteHeader called with X-Content-Type-Options:nosniff but no Content-Type")
} else {
ctype = DetectContentType(p)
}
} }
var date string var date string
if _, ok := rws.snapHeader["Date"]; !ok { if _, ok := rws.snapHeader["Date"]; !ok {

20
src/net/http/serve_test.go
View File

@ -3585,26 +3585,6 @@ func TestHeaderToWire(t *testing.T) {
return nil return nil
}, },
}, },
{
name: "Nosniff without Content-type",
handler: func(rw ResponseWriter, r *Request) {
rw.Header().Set("X-Content-Type-Options", "nosniff")
rw.WriteHeader(200)
rw.Write([]byte("<!doctype html>\n<html><head></head><body>some html</body></html>"))
},
check: func(got, logs string) error {
if !strings.Contains(got, "Content-Type: application/octet-stream\r\n") {
return errors.New("Output should have an innocuous content-type")
}
if strings.Contains(got, "text/html") {
return errors.New("Output should not have a guess")
}
if !strings.Contains(logs, "X-Content-Type-Options:nosniff but no Content-Type") {
return errors.New("Expected log message")
}
return nil
},
},
} }
for _, tc := range tests { for _, tc := range tests {
ht := newHandlerTest(HandlerFunc(tc.handler)) ht := newHandlerTest(HandlerFunc(tc.handler))

10
src/net/http/server.go
View File

@ -1360,15 +1360,7 @@ func (cw *chunkWriter) writeHeader(p []byte) {
// If no content type, apply sniffing algorithm to body. // If no content type, apply sniffing algorithm to body.
_, haveType := header["Content-Type"] _, haveType := header["Content-Type"]
if !haveType && !hasTE && len(p) > 0 { if !haveType && !hasTE && len(p) > 0 {
if cto := header.get("X-Content-Type-Options"); strings.EqualFold("nosniff", cto) { setHeader.contentType = DetectContentType(p)
// nosniff is an explicit directive not to guess a content-type.
// Content-sniffing is no less susceptible to polyglot attacks via
// hosted content when done on the server.
setHeader.contentType = "application/octet-stream"
w.conn.server.logf("http: WriteHeader called with X-Content-Type-Options:nosniff but no Content-Type")
} else {
setHeader.contentType = DetectContentType(p)
}
} }
} else { } else {
for _, k := range suppressedHeaders(code) { for _, k := range suppressedHeaders(code) {