Niko/forwardproxy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Reuse the original request, avoid the abnormal ContentLength

Browse source 
Fixes: abnormal ContentLength; empty schema due to the out of position check.
Handling of  HTTP GET requests: original request and URL are now reused. `generateForwardRequest()` is removed for simplicity.
This commit is contained in:
Jim Ma 2017-12-09 05:48:49 +08:00 • committed by sergeyfrolov
parent 0aa89fbcd7
commit 12605a2195
1 changed files with 21 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

64
forwardproxy.go
View file

@ -284,11 +284,28 @@ func (fp *ForwardProxy) ServeHTTP(w http.ResponseWriter, r *http.Request) (int,
panic("There was a check for http version, yet it's incorrect")
}
} else {
outReq, err := fp.generateForwardRequest(r)
if err != nil {
return http.StatusBadRequest, err
// Scheme has to be appended to avoid `unsupported protocol scheme ""` error.
// `http://` is used, since this initial request itself is always HTTP, regardless of what client and server
// may speak afterwards.
if r.URL.Scheme == "" {
r.URL.Scheme = "http"
}
response, err := fp.httpTransport.RoundTrip(outReq)
if r.URL.Host == "" {
r.URL.Host = r.Host
}
r.RequestURI = ""
removeHopByHop(r.Header)
if !fp.hideIP {
r.Header.Add("Forwarded", "for=\""+r.RemoteAddr+"\"")
}
// https://tools.ietf.org/html/rfc7230#section-5.7.1
if !fp.hideVia {
r.Header.Add("Via", strconv.Itoa(r.ProtoMajor)+"."+strconv.Itoa(r.ProtoMinor)+" caddy")
}
response, err := fp.httpTransport.RoundTrip(r)
if err != nil {
if response != nil {
if response.StatusCode != 0 {
@ -320,45 +337,6 @@ func forwardResponse(w http.ResponseWriter, response *http.Response) error {
return err
}
// Based on http Request from client, generates new request to be forwarded to target server.
// Some fields are shallow-copied, thus genOutReq will mutate original request.
// If error is not nil - http.StatusBadRequest is to be sent to client.
func (fp *ForwardProxy) generateForwardRequest(inReq *http.Request) (*http.Request, error) {
// Scheme has to be appended to avoid `unsupported protocol scheme ""` error.
// `http://` is used, since this initial request itself is always HTTP, regardless of what client and server
// may speak afterwards.
if len(inReq.RequestURI) == 0 {
return nil, errors.New("malformed request: empty URI")
}
strUrl := inReq.RequestURI
if strUrl[0] == '/' {
strUrl = inReq.Host + strUrl
}
if !strings.Contains(strUrl, "://") {
strUrl = "http://" + strUrl
}
outReq, err := http.NewRequest(inReq.Method, strUrl, inReq.Body)
if err != nil {
return outReq, errors.New("failed to create NewRequest: " + err.Error())
}
for key, values := range inReq.Header {
for _, value := range values {
outReq.Header.Add(key, value)
}
}
removeHopByHop(outReq.Header)
if !fp.hideIP {
outReq.Header.Add("Forwarded", "for=\""+inReq.RemoteAddr+"\"")
}
// https://tools.ietf.org/html/rfc7230#section-5.7.1
if !fp.hideVia {
outReq.Header.Add("Via", strconv.Itoa(inReq.ProtoMajor)+"."+strconv.Itoa(inReq.ProtoMinor)+" caddy")
}
return outReq, nil
}
var hopByHopHeaders = []string{
"Keep-Alive",
"Proxy-Authenticate",