mirror/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2026-06-24 07:52:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

cmd/tailscale/cli: add service support to tailscale ip

Browse Source 
Fixes #20035

Signed-off-by: Adriano Sela Aviles <adriano@tailscale.com>
This commit is contained in:
Adriano Sela Aviles
2026-06-05 14:57:52 -07:00
committed by Adriano Sela Aviles
parent c0d0621417
commit 83c8440834
1 changed files with 34 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
cmd/tailscale/cli/ip.go
View File

@@ -17,9 +17,9 @@
var ipCmd = &ffcli.Command{
Name: "ip",
ShortUsage: "tailscale ip [-1] [-4] [-6] [peer hostname or ip address]",
ShortUsage: "tailscale ip [-1] [-4] [-6] [peer or service hostname or ip address]",
ShortHelp: "Show Tailscale IP addresses",
LongHelp: "Show Tailscale IP addresses for peer. Peer defaults to the current machine.",
LongHelp: "Show Tailscale IP addresses for peer or service. Peer defaults to the current machine.",
Exec: runIP,
FlagSet: (func() *flag.FlagSet {
fs := newFlagSet("ip")
@@ -79,10 +79,20 @@ func runIP(ctx context.Context, args []string) error {
return err
}
peer, ok := peerMatchingIP(st, ip)
if !ok {
return fmt.Errorf("no peer found with IP %v", ip)
if ok {
ips = peer.TailscaleIPs
} else {
// No peer matched; check if the IP belongs to a service.
serviceIPs, err := serviceAddrsMatchingIP(ctx, ip)
if err != nil {
return err
}
if serviceIPs != nil {
ips = serviceIPs
} else {
return fmt.Errorf("no peer or service found with IP %v", ip)
}
}
ips = peer.TailscaleIPs
}
if len(ips) == 0 {
return fmt.Errorf("no current Tailscale IPs; state: %v", st.BackendState)
@@ -109,6 +119,25 @@ func runIP(ctx context.Context, args []string) error {
return nil
}
// serviceAddrsMatchingIP checks whether ipStr matches a service's VIP address
// and returns the service's addresses if so.
func serviceAddrsMatchingIP(ctx context.Context, ipStr string) ([]netip.Addr, error) {
ip, err := netip.ParseAddr(ipStr)
if err != nil {
return nil, nil
}
services, err := localClient.GetServices(ctx)
if err != nil {
return nil, err
}
for _, svc := range services {
if slices.Contains(svc.Addrs, ip) {
return svc.Addrs, nil
}
}
return nil, nil
}
func peerMatchingIP(st *ipnstate.Status, ipStr string) (ps *ipnstate.PeerStatus, ok bool) {
ip, err := netip.ParseAddr(ipStr)
if err != nil {