curben
/
cloudflared-mirror
mirror of https://github.com/cloudflare/cloudflared.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: erroneous error message for host validation 

when crafting an ingress YAML file by hand its easy to write the following by mistake:
```yaml
ingress:
  - hostname: https://example.com
    service: http://localhost:50100
  - service: http_status:404
```

`cloudflared` would report the error: `Hostname cannot contain a port`

this confused me for a few minutes before i compared two configs and saw my mistake. this change introduces a check prior to port splitting to see if the hostname contains a protocol and reports a relevant error
This commit is contained in:
andrew 2023-06-27 04:42:28 -04:00
parent 31f424d589
commit 7625863638
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ingress/ingress.go
View File

@ -24,6 +24,7 @@ var (
errLastRuleNotCatchAll = errors.New("The last ingress rule must match all URLs (i.e. it should not have a hostname or path filter)") errLastRuleNotCatchAll = errors.New("The last ingress rule must match all URLs (i.e. it should not have a hostname or path filter)")
errBadWildcard = errors.New("Hostname patterns can have at most one wildcard character (\"*\") and it can only be used for subdomains, e.g. \"*.example.com\"") errBadWildcard = errors.New("Hostname patterns can have at most one wildcard character (\"*\") and it can only be used for subdomains, e.g. \"*.example.com\"")
errHostnameContainsPort = errors.New("Hostname cannot contain a port") errHostnameContainsPort = errors.New("Hostname cannot contain a port")
errHostnameContainsScheme = errors.New("Hostname cannot contain a scheme (e.g. http://, https://, etc.)")
ErrURLIncompatibleWithIngress = errors.New("You can't set the --url flag (or $TUNNEL_URL) when using multiple-origin ingress rules") ErrURLIncompatibleWithIngress = errors.New("You can't set the --url flag (or $TUNNEL_URL) when using multiple-origin ingress rules")
) )
@ -359,6 +360,10 @@ func validateIngress(ingress []config.UnvalidatedIngressRule, defaults OriginReq
} }
func validateHostname(r config.UnvalidatedIngressRule, ruleIndex, totalRules int) error { func validateHostname(r config.UnvalidatedIngressRule, ruleIndex, totalRules int) error {
// Ensure the hostname doesn't contain a scheme so a less confusing error is returned.
if u, e := url.Parse(r.Hostname); e == nil && isHTTPService(u) {
return errHostnameContainsScheme
}
// Ensure that the hostname doesn't contain port // Ensure that the hostname doesn't contain port
_, _, err := net.SplitHostPort(r.Hostname) _, _, err := net.SplitHostPort(r.Hostname)
if err == nil { if err == nil {