mirrors/uquic
1
0
Fork 0
mirror of https://github.com/refraction-networking/uquic.git synced 2025-04-04 20:57:36 +03:00
Code Issues Projects Releases Packages Wiki Activity

http3: sniff HTTP Content Type (#3715)

Browse source 
* add sniff

* add test for sniff

* fix typo in comment

* move bodyAllowedForStatus() to top of the function to aviod calling it twice

* add comments

* format with gofumpt

* fix typo and simplify the code
This commit is contained in:
Glonee 2023-02-21 09:29:45 +08:00 • committed by GitHub
parent 5b5a8e742c
commit a92238b73c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

18
http3/response_writer.go
View file

@ -80,10 +80,26 @@ func (w *responseWriter) WriteHeader(status int) {
} }
func (w *responseWriter) Write(p []byte) (int, error) { func (w *responseWriter) Write(p []byte) (int, error) {
bodyAllowed := bodyAllowedForStatus(w.status)
if !w.headerWritten { if !w.headerWritten {
// If body is not allowed, we don't need to (and we can't) sniff the content type.
if bodyAllowed {
// If no content type, apply sniffing algorithm to body.
// We can't use `w.header.Get` here since if the Content-Type was set to nil, we shoundn't do sniffing.
_, haveType := w.header["Content-Type"]
// If the Transfer-Encoding or Content-Encoding was set and is non-blank,
// we shouldn't sniff the body.
hasTE := w.header.Get("Transfer-Encoding") != ""
hasCE := w.header.Get("Content-Encoding") != ""
if !hasCE && !haveType && !hasTE && len(p) > 0 {
w.header.Set("Content-Type", http.DetectContentType(p))
}
}
w.WriteHeader(http.StatusOK) w.WriteHeader(http.StatusOK)
bodyAllowed = true
} }
if !bodyAllowedForStatus(w.status) { if !bodyAllowed {
return 0, http.ErrBodyNotAllowed return 0, http.ErrBodyNotAllowed
} }
df := &dataFrame{Length: uint64(len(p))} df := &dataFrame{Length: uint64(len(p))}

9
http3/response_writer_test.go
View file

@ -147,4 +147,13 @@ var _ = Describe("Response Writer", func() {
Expect(n).To(BeZero()) Expect(n).To(BeZero())
Expect(err).To(MatchError(http.ErrBodyNotAllowed)) Expect(err).To(MatchError(http.ErrBodyNotAllowed))
}) })
It("first call to Write sniffs if Content-Type is not set", func() {
n, err := rw.Write([]byte("<html></html>"))
Expect(n).To(Equal(13))
Expect(err).ToNot(HaveOccurred())
fields := decodeHeader(strBuf)
Expect(fields).To(HaveKeyWithValue("content-type", []string{"text/html; charset=utf-8"}))
})
}) })