github-mirror/caddy
2
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2025-05-30 15:58:10 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

reverseproxy: do not parse upstream address too early if it contains replaceble parts (#5695)

Browse Source 
* reverseproxy: do not parse upstream address too early if it contains replaceble parts

* remove unused method

* cleanup

* accommodate partially replaceable port
This commit is contained in:
Mohammed Al Sahaf
2023-08-05 23:30:02 +02:00
committed by GitHub
parent 9f34383c02
commit 65e33fc1ee
7 changed files with 365 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
modules/caddyhttp/reverseproxy/caddyfile.go
View File

@ -146,7 +146,7 @@ func (h *Handler) UnmarshalCaddyfile(d *caddyfile.Dispenser) error {
// appendUpstream creates an upstream for address and adds
// it to the list.
appendUpstream := func(address string) error {
dialAddr, scheme, err := parseUpstreamDialAddress(address)
pa, err := parseUpstreamDialAddress(address)
if err != nil {
return d.WrapErr(err)
}
@ -154,21 +154,27 @@ func (h *Handler) UnmarshalCaddyfile(d *caddyfile.Dispenser) error {
// the underlying JSON does not yet support different
// transports (protocols or schemes) to each backend,
// so we remember the last one we see and compare them
if commonScheme != "" && scheme != commonScheme {
if commonScheme != "" && pa.scheme != commonScheme {
return d.Errf("for now, all proxy upstreams must use the same scheme (transport protocol); expecting '%s://' but got '%s://'",
commonScheme, scheme)
commonScheme, pa.scheme)
}
commonScheme = scheme
commonScheme = pa.scheme
parsedAddr, err := caddy.ParseNetworkAddress(dialAddr)
// if the port of upstream address contains a placeholder, only wrap it with the `Upstream` struct,
// delaying actual resolution of the address until request time.
if pa.replaceablePort() {
h.Upstreams = append(h.Upstreams, &Upstream{Dial: pa.dialAddr()})
return nil
}
parsedAddr, err := caddy.ParseNetworkAddress(pa.dialAddr())
if err != nil {
return d.WrapErr(err)
}
if parsedAddr.StartPort == 0 && parsedAddr.EndPort == 0 {
if pa.isUnix() || !pa.rangedPort() {
// unix networks don't have ports
h.Upstreams = append(h.Upstreams, &Upstream{
Dial: dialAddr,
Dial: pa.dialAddr(),
})
} else {
// expand a port range into multiple upstreams