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

Merge 151df44104 into 0d2a7a0385

This commit is contained in:
Func 2025-11-22 22:58:30 -05:00 committed by GitHub
parent 0d2a7a0385 151df44104
commit 6d153d65cf
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cmd/cloudflared/tunnel/cmd.go
View File

@ -459,12 +459,18 @@ func StartServer(
} }
} }
userCreds, err := credentials.Read(c.String(cfdflags.OriginCert), log)
var isFEDEndpoint bool var isFEDEndpoint bool
if err != nil { // For remotely-managed tunnels: use endpoint info from token credentials
isFEDEndpoint = false if c.String(TunnelTokenFlag) != "" {
isFEDEndpoint = strings.ToLower(namedTunnel.Credentials.Endpoint) == credentials.FedEndpoint
} else { } else {
isFEDEndpoint = userCreds.IsFEDEndpoint() // For locally-managed tunnels: check origin certificate
userCreds, err := credentials.Read(c.String(cfdflags.OriginCert), log)
if err != nil {
isFEDEndpoint = false
} else {
isFEDEndpoint = userCreds.IsFEDEndpoint()
}
} }
var managementHostname string var managementHostname string