Mirrors/caddy
1
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2025-02-02 06:07:21 +01:00
Code Issues Projects Releases Packages Wiki Activity

reverseproxy: refactor HTTP transport layer (#5369)

Browse source 
Co-authored-by: Francis Lavoie <lavofr@gmail.com>
Co-authored-by: Weidi Deng <weidi_deng@icloud.com>
This commit is contained in:
Mohammed Al Sahaf 2023-02-24 22:54:04 +03:00 committed by GitHub
parent be53e432fc
commit e3909cc385
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 148 additions and 140 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

268
caddytest/integration/reverseproxy_test.go
View file

@ -22,39 +22,39 @@ func TestSRVReverseProxy(t *testing.T) {
}, },
"apps": { "apps": {
"pki": { "pki": {
"certificate_authorities" : { "certificate_authorities": {
"local" : { "local": {
"install_trust": false "install_trust": false
} }
} }
}, },
"http": { "http": {
"grace_period": 1, "grace_period": 1,
"servers": { "servers": {
"srv0": { "srv0": {
"listen": [ "listen": [
":8080" ":18080"
], ],
"routes": [ "routes": [
{ {
"handle": [ "handle": [
{ {
"handler": "reverse_proxy", "handler": "reverse_proxy",
"upstreams": [ "upstreams": [
{ {
"lookup_srv": "srv.host.service.consul" "lookup_srv": "srv.host.service.consul"
} }
]
}
]
}
] ]
} }
] }
}
]
}
} }
}
} }
} }
`, "json") `, "json")
} }
func TestSRVWithDial(t *testing.T) { func TestSRVWithDial(t *testing.T) {
@ -62,39 +62,39 @@ func TestSRVWithDial(t *testing.T) {
{ {
"apps": { "apps": {
"pki": { "pki": {
"certificate_authorities" : { "certificate_authorities": {
"local" : { "local": {
"install_trust": false "install_trust": false
} }
} }
}, },
"http": { "http": {
"grace_period": 1, "grace_period": 1,
"servers": { "servers": {
"srv0": { "srv0": {
"listen": [ "listen": [
":8080" ":18080"
], ],
"routes": [ "routes": [
{ {
"handle": [ "handle": [
{ {
"handler": "reverse_proxy", "handler": "reverse_proxy",
"upstreams": [ "upstreams": [
{ {
"dial": "tcp/address.to.upstream:80", "dial": "tcp/address.to.upstream:80",
"lookup_srv": "srv.host.service.consul" "lookup_srv": "srv.host.service.consul"
} }
]
}
]
}
] ]
} }
] }
}
]
}
} }
}
} }
} }
`, "json", `upstream: specifying dial address is incompatible with lookup_srv: 0: {\"dial\": \"tcp/address.to.upstream:80\", \"lookup_srv\": \"srv.host.service.consul\"}`) `, "json", `upstream: specifying dial address is incompatible with lookup_srv: 0: {\"dial\": \"tcp/address.to.upstream:80\", \"lookup_srv\": \"srv.host.service.consul\"}`)
} }
@ -138,41 +138,41 @@ func TestDialWithPlaceholderUnix(t *testing.T) {
}, },
"apps": { "apps": {
"pki": { "pki": {
"certificate_authorities" : { "certificate_authorities": {
"local" : { "local": {
"install_trust": false "install_trust": false
} }
} }
}, },
"http": { "http": {
"grace_period": 1, "grace_period": 1,
"servers": { "servers": {
"srv0": { "srv0": {
"listen": [ "listen": [
":8080" ":18080"
], ],
"routes": [ "routes": [
{ {
"handle": [ "handle": [
{ {
"handler": "reverse_proxy", "handler": "reverse_proxy",
"upstreams": [ "upstreams": [
{ {
"dial": "unix/{http.request.header.X-Caddy-Upstream-Dial}" "dial": "unix/{http.request.header.X-Caddy-Upstream-Dial}"
} }
]
}
]
}
] ]
} }
] }
} }
]
}
}
}
} }
} }
`, "json") `, "json")
req, err := http.NewRequest(http.MethodGet, "http://localhost:8080", nil) req, err := http.NewRequest(http.MethodGet, "http://localhost:18080", nil)
if err != nil { if err != nil {
t.Fail() t.Fail()
return return
@ -190,18 +190,18 @@ func TestReverseProxyWithPlaceholderDialAddress(t *testing.T) {
}, },
"apps": { "apps": {
"pki": { "pki": {
"certificate_authorities" : { "certificate_authorities": {
"local" : { "local": {
"install_trust": false "install_trust": false
} }
} }
}, },
"http": { "http": {
"grace_period": 1, "grace_period": 1,
"servers": { "servers": {
"srv0": { "srv0": {
"listen": [ "listen": [
":8080" ":18080"
], ],
"routes": [ "routes": [
{ {
@ -264,14 +264,14 @@ func TestReverseProxyWithPlaceholderDialAddress(t *testing.T) {
} }
} }
} }
`, "json") `, "json")
req, err := http.NewRequest(http.MethodGet, "http://localhost:9080", nil) req, err := http.NewRequest(http.MethodGet, "http://localhost:9080", nil)
if err != nil { if err != nil {
t.Fail() t.Fail()
return return
} }
req.Header.Set("X-Caddy-Upstream-Dial", "localhost:8080") req.Header.Set("X-Caddy-Upstream-Dial", "localhost:18080")
tester.AssertResponse(req, 200, "Hello, World!") tester.AssertResponse(req, 200, "Hello, World!")
} }
@ -284,18 +284,18 @@ func TestReverseProxyWithPlaceholderTCPDialAddress(t *testing.T) {
}, },
"apps": { "apps": {
"pki": { "pki": {
"certificate_authorities" : { "certificate_authorities": {
"local" : { "local": {
"install_trust": false "install_trust": false
} }
} }
}, },
"http": { "http": {
"grace_period": 1, "grace_period": 1,
"servers": { "servers": {
"srv0": { "srv0": {
"listen": [ "listen": [
":8080" ":18080"
], ],
"routes": [ "routes": [
{ {
@ -340,7 +340,7 @@ func TestReverseProxyWithPlaceholderTCPDialAddress(t *testing.T) {
"handler": "reverse_proxy", "handler": "reverse_proxy",
"upstreams": [ "upstreams": [
{ {
"dial": "tcp/{http.request.header.X-Caddy-Upstream-Dial}:8080" "dial": "tcp/{http.request.header.X-Caddy-Upstream-Dial}:18080"
} }
] ]
} }
@ -358,7 +358,7 @@ func TestReverseProxyWithPlaceholderTCPDialAddress(t *testing.T) {
} }
} }
} }
`, "json") `, "json")
req, err := http.NewRequest(http.MethodGet, "http://localhost:9080", nil) req, err := http.NewRequest(http.MethodGet, "http://localhost:9080", nil)
if err != nil { if err != nil {
@ -375,42 +375,42 @@ func TestSRVWithActiveHealthcheck(t *testing.T) {
"apps": { "apps": {
"pki": { "pki": {
"certificate_authorities" : { "certificate_authorities" : {
"local" : { "local" : {
"install_trust": false "install_trust": false
} }
} }
}, },
"http": { "http": {
"grace_period": 1, "grace_period": 1,
"servers": { "servers": {
"srv0": { "srv0": {
"listen": [ "listen": [
":8080" ":18080"
], ],
"routes": [ "routes": [
{ {
"handle": [ "handle": [
{ {
"handler": "reverse_proxy", "handler": "reverse_proxy",
"health_checks": { "health_checks": {
"active": { "active": {
"path": "/ok" "path": "/ok"
}
},
"upstreams": [
{
"lookup_srv": "srv.host.service.consul"
}
]
}
]
} }
},
"upstreams": [
{
"lookup_srv": "srv.host.service.consul"
}
] ]
} }
] }
}
]
}
} }
}
} }
} }
`, "json", `upstream: lookup_srv is incompatible with active health checks: 0: {\"dial\": \"\", \"lookup_srv\": \"srv.host.service.consul\"}`) `, "json", `upstream: lookup_srv is incompatible with active health checks: 0: {\"dial\": \"\", \"lookup_srv\": \"srv.host.service.consul\"}`)
} }
@ -440,7 +440,7 @@ func TestReverseProxyHealthCheck(t *testing.T) {
health_timeout 100ms health_timeout 100ms
} }
} }
`, "caddyfile") `, "caddyfile")
time.Sleep(100 * time.Millisecond) // TODO: for some reason this test seems particularly flaky, getting 503 when it should be 200, unless we wait time.Sleep(100 * time.Millisecond) // TODO: for some reason this test seems particularly flaky, getting 503 when it should be 200, unless we wait
tester.AssertGetResponse("http://localhost:9080/", 200, "Hello, World!") tester.AssertGetResponse("http://localhost:9080/", 200, "Hello, World!")

20
modules/caddyhttp/reverseproxy/httptransport.go
View file

@ -172,12 +172,19 @@ func (h *HTTPTransport) NewTransport(caddyCtx caddy.Context) (*http.Transport, e
} }
} }
// Set up the dialer to pull the correct information from the context
dialContext := func(ctx context.Context, network, address string) (net.Conn, error) { dialContext := func(ctx context.Context, network, address string) (net.Conn, error) {
// the proper dialing information should be embedded into the request's context // For unix socket upstreams, we need to recover the dial info from
// the request's context, because the Host on the request's URL
// will have been modified by directing the request, overwriting
// the unix socket filename.
// Also, we need to avoid overwriting the address at this point
// when not necessary, because http.ProxyFromEnvironment may have
// modified the address according to the user's env proxy config.
if dialInfo, ok := GetDialInfo(ctx); ok { if dialInfo, ok := GetDialInfo(ctx); ok {
network = dialInfo.Network if strings.HasPrefix(dialInfo.Network, "unix") {
address = dialInfo.Address network = dialInfo.Network
address = dialInfo.Address
}
} }
conn, err := dialer.DialContext(ctx, network, address) conn, err := dialer.DialContext(ctx, network, address)
@ -188,8 +195,8 @@ func (h *HTTPTransport) NewTransport(caddyCtx caddy.Context) (*http.Transport, e
return nil, DialError{err} return nil, DialError{err}
} }
// if read/write timeouts are configured and this is a TCP connection, enforce the timeouts // if read/write timeouts are configured and this is a TCP connection,
// by wrapping the connection with our own type // enforce the timeouts by wrapping the connection with our own type
if tcpConn, ok := conn.(*net.TCPConn); ok && (h.ReadTimeout > 0 || h.WriteTimeout > 0) { if tcpConn, ok := conn.(*net.TCPConn); ok && (h.ReadTimeout > 0 || h.WriteTimeout > 0) {
conn = &tcpRWTimeoutConn{ conn = &tcpRWTimeoutConn{
TCPConn: tcpConn, TCPConn: tcpConn,
@ -203,6 +210,7 @@ func (h *HTTPTransport) NewTransport(caddyCtx caddy.Context) (*http.Transport, e
} }
rt := &http.Transport{ rt := &http.Transport{
Proxy: http.ProxyFromEnvironment,
DialContext: dialContext, DialContext: dialContext,
MaxConnsPerHost: h.MaxConnsPerHost, MaxConnsPerHost: h.MaxConnsPerHost,
ResponseHeaderTimeout: time.Duration(h.ResponseHeaderTimeout), ResponseHeaderTimeout: time.Duration(h.ResponseHeaderTimeout),