mirror of
https://github.com/caddyserver/caddy.git
synced 2024-12-26 05:33:49 +03:00
fastcgi: check for CONTENT_LENGTH when sending requests (#6661)
* fastcgi: check for CONTENT_LENGTH when sending requests * order imports * use strconv.ParseUint instead of strconv.ParseInt Co-authored-by: Kévin Dunglas <kevin@dunglas.fr> --------- Co-authored-by: Kévin Dunglas <kevin@dunglas.fr>
This commit is contained in:
parent
c864b82ae1
commit
6790c0e38a
1 changed files with 11 additions and 0 deletions
|
@ -41,6 +41,8 @@ import (
|
||||||
|
|
||||||
"go.uber.org/zap"
|
"go.uber.org/zap"
|
||||||
"go.uber.org/zap/zapcore"
|
"go.uber.org/zap/zapcore"
|
||||||
|
|
||||||
|
"github.com/caddyserver/caddy/v2/modules/caddyhttp"
|
||||||
)
|
)
|
||||||
|
|
||||||
// FCGIListenSockFileno describes listen socket file number.
|
// FCGIListenSockFileno describes listen socket file number.
|
||||||
|
@ -136,6 +138,15 @@ type client struct {
|
||||||
// Do made the request and returns a io.Reader that translates the data read
|
// Do made the request and returns a io.Reader that translates the data read
|
||||||
// from fcgi responder out of fcgi packet before returning it.
|
// from fcgi responder out of fcgi packet before returning it.
|
||||||
func (c *client) Do(p map[string]string, req io.Reader) (r io.Reader, err error) {
|
func (c *client) Do(p map[string]string, req io.Reader) (r io.Reader, err error) {
|
||||||
|
// check for CONTENT_LENGTH, since the lack of it or wrong value will cause the backend to hang
|
||||||
|
if clStr, ok := p["CONTENT_LENGTH"]; !ok {
|
||||||
|
return nil, caddyhttp.Error(http.StatusLengthRequired, nil)
|
||||||
|
} else if _, err := strconv.ParseUint(clStr, 10, 64); err != nil {
|
||||||
|
// stdlib won't return a negative Content-Length, but we check just in case,
|
||||||
|
// the most likely cause is from a missing content length, which is -1
|
||||||
|
return nil, caddyhttp.Error(http.StatusLengthRequired, err)
|
||||||
|
}
|
||||||
|
|
||||||
writer := &streamWriter{c: c}
|
writer := &streamWriter{c: c}
|
||||||
writer.buf = bufPool.Get().(*bytes.Buffer)
|
writer.buf = bufPool.Get().(*bytes.Buffer)
|
||||||
writer.buf.Reset()
|
writer.buf.Reset()
|
||||||
|
|
Loading…
Reference in a new issue