mirror of
https://github.com/fnproject/fn.git
synced 2022-10-28 21:29:17 +03:00
bae13d6c29
we were using the httputil.DumpRequest when there is a perfectly good req.Write method hanging out in the stdlib, that even does the chunked thing that a few people ran into if they don't provide a content length: https://golang.org/pkg/net/http/#Request.Write -- so we shouldn't run into that issue again. I hit this in testing and it was not very fun to debug, so added a test that repro'd it on master and fixes it here. of course, adding a content length works too. tested this and it appears to work pretty well, also cleaned up the control flow a little bit in http protocol.
63 lines
1.6 KiB
Go
63 lines
1.6 KiB
Go
package protocol
|
|
|
|
import (
|
|
"bufio"
|
|
"context"
|
|
"io"
|
|
"net/http"
|
|
)
|
|
|
|
// HTTPProtocol converts stdin/stdout streams into HTTP/1.1 compliant
|
|
// communication. It relies on Content-Length to know when to stop reading from
|
|
// containers stdout. It also mandates valid HTTP headers back and forth, thus
|
|
// returning errors in case of parsing problems.
|
|
type HTTPProtocol struct {
|
|
in io.Writer
|
|
out io.Reader
|
|
}
|
|
|
|
func (p *HTTPProtocol) IsStreamable() bool { return true }
|
|
|
|
// TODO handle req.Context better with io.Copy. io.Copy could push us
|
|
// over the timeout.
|
|
func (h *HTTPProtocol) Dispatch(ctx context.Context, ci CallInfo, w io.Writer) error {
|
|
req := ci.Request()
|
|
|
|
req.RequestURI = ci.RequestURL() // force set to this, for req.Write to use (TODO? still?)
|
|
|
|
// req.Write handles if the user does not specify content length
|
|
err := req.Write(h.in)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
resp, err := http.ReadResponse(bufio.NewReader(h.out), ci.Request()) // TODO timeout
|
|
if err != nil {
|
|
return err
|
|
}
|
|
defer resp.Body.Close()
|
|
|
|
rw, ok := w.(http.ResponseWriter)
|
|
if !ok {
|
|
// async / [some] tests go through here. write a full http request to the writer
|
|
resp.Write(w) // TODO timeout
|
|
return nil
|
|
}
|
|
|
|
// if we're writing directly to the response writer, we need to set headers
|
|
// and status code, and only copy the body. resp.Write would copy a full
|
|
// http request into the response body (not what we want).
|
|
|
|
// add resp's on top of any specified on the route [on rw]
|
|
for k, vs := range resp.Header {
|
|
for _, v := range vs {
|
|
rw.Header().Add(k, v)
|
|
}
|
|
}
|
|
if resp.StatusCode > 0 {
|
|
rw.WriteHeader(resp.StatusCode)
|
|
}
|
|
io.Copy(rw, resp.Body)
|
|
return nil
|
|
}
|