public/headscale
1
0
Fork 0
mirror of https://github.com/juanfont/headscale.git synced 2026-04-09 06:27:48 +09:00
Code Issues Packages Projects Releases Wiki Activity

integration/tsic: accept via peer-relay in non-direct ping check

Browse Source 
When WithPingUntilDirect(false) is set, the Ping helper should accept
any indirect path, but the substring check only matched "via DERP" and
"via relay". Tailscale peer relay pings output

    pong from ... via peer-relay(ip:port:vni:N) in Nms

which does not contain the "via relay" substring and was therefore
rejected as errTailscalePingNotDERP. TestGrantCapRelay Phase 4 never
passed because of this: even when the data plane was healthy the
helper returned an error.

Commit abe1a3e7 attempted to fix this by adding "via relay" alongside
"via DERP" but missed the "peer-" prefix used by peer relay output.

Add an explicit "via peer-relay" substring check so peer relay pongs
are accepted alongside DERP and plain relay pongs.

Updates #2180
This commit is contained in:
Kristoffer Dalby
2026-04-08 10:31:08 +00:00
parent 6390fcee79
commit e638cbc9b9
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
integration/tsic/tsic.go
View File

@@ -1403,7 +1403,14 @@ func (t *TailscaleInContainer) Ping(hostnameOrIP string, opts ...PingOption) err
}
if !args.direct {
if strings.Contains(result, "via DERP") || strings.Contains(result, "via relay") {
// Non-direct mode accepts any indirect path: DERP, a plain
// tailscale relay, or a peer relay. Tailscale reports peer
// relay hops as "via peer-relay(ip:port:vni:N)", which does
// not contain the "via relay" substring and was previously
// rejected here.
if strings.Contains(result, "via DERP") ||
strings.Contains(result, "via relay") ||
strings.Contains(result, "via peer-relay") {
return nil
} else {
return errTailscalePingNotDERP