mirrors/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-12-23 18:21:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Reapply "(debugging) Lots of print statements"

Browse Source 
This reverts commit 18721591efcd1be0b16e8c3b65865cbf3559ff6e.
This commit is contained in:
Harry Harpham 2025-12-19 15:47:02 -07:00
parent 39b84281e0
commit 19f06d4784
No known key found for this signature in database
4 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ipn/ipnlocal/local.go
View File

@ -6891,13 +6891,16 @@ func (b *LocalBackend) ShouldInterceptTCPPort(port uint16) bool {
// ShouldInterceptVIPServiceTCPPort reports whether the given TCP port number // ShouldInterceptVIPServiceTCPPort reports whether the given TCP port number
// to a VIP service should be intercepted by Tailscaled and handled in-process. // to a VIP service should be intercepted by Tailscaled and handled in-process.
func (b *LocalBackend) ShouldInterceptVIPServiceTCPPort(ap netip.AddrPort) bool { func (b *LocalBackend) ShouldInterceptVIPServiceTCPPort(ap netip.AddrPort) bool {
fmt.Println("<harry> ShouldInterceptVIPServiceTCPPort: called for", ap)
if !buildfeatures.HasServe { if !buildfeatures.HasServe {
return false return false
} }
f := b.shouldInterceptVIPServicesTCPPortAtomic.Load() f := b.shouldInterceptVIPServicesTCPPortAtomic.Load()
if f == nil { if f == nil {
fmt.Println("<harry> ShouldInterceptVIPServiceTCPPort: no intercepts configured, returning false")
return false return false
} }
fmt.Println("<harry> ShouldInterceptVIPServiceTCPPort: returning", f(ap))
return f(ap) return f(ap)
} }

20
ipn/ipnlocal/serve.go
View File

@ -419,16 +419,20 @@ func (b *LocalBackend) HandleIngressTCPConn(ingressPeer tailcfg.NodeView, target
sc := b.serveConfig sc := b.serveConfig
b.mu.Unlock() b.mu.Unlock()
fmt.Println("<harry> handleIngress: target:", target)
// TODO(maisem,bradfitz): make this not alloc for every conn. // TODO(maisem,bradfitz): make this not alloc for every conn.
logf := logger.WithPrefix(b.logf, "handleIngress: ") logf := logger.WithPrefix(b.logf, "handleIngress: ")
if !sc.Valid() { if !sc.Valid() {
fmt.Println("<harry> handleIngress: no serveConfig")
logf("got ingress conn w/o serveConfig; rejecting") logf("got ingress conn w/o serveConfig; rejecting")
sendRST() sendRST()
return return
} }
if !sc.HasFunnelForTarget(target) { if !sc.HasFunnelForTarget(target) {
fmt.Println("<harry> handleIngress: no funnel config")
logf("got ingress conn for unconfigured %q; rejecting", target) logf("got ingress conn for unconfigured %q; rejecting", target)
sendRST() sendRST()
return return
@ -436,12 +440,14 @@ func (b *LocalBackend) HandleIngressTCPConn(ingressPeer tailcfg.NodeView, target
host, port, err := net.SplitHostPort(string(target)) host, port, err := net.SplitHostPort(string(target))
if err != nil { if err != nil {
fmt.Println("<harry> handleIngress: bag target 1")
logf("got ingress conn for bad target %q; rejecting", target) logf("got ingress conn for bad target %q; rejecting", target)
sendRST() sendRST()
return return
} }
port16, err := strconv.ParseUint(port, 10, 16) port16, err := strconv.ParseUint(port, 10, 16)
if err != nil { if err != nil {
fmt.Println("<harry> handleIngress: bad target 2")
logf("got ingress conn for bad target %q; rejecting", target) logf("got ingress conn for bad target %q; rejecting", target)
sendRST() sendRST()
return return
@ -452,9 +458,11 @@ func (b *LocalBackend) HandleIngressTCPConn(ingressPeer tailcfg.NodeView, target
if handler != nil { if handler != nil {
c, ok := getConnOrReset() c, ok := getConnOrReset()
if !ok { if !ok {
fmt.Println("<harry> handleIngress: getTCPHandlerForFunnelFlow: getConn error")
logf("getConn didn't complete from %v to port %v", srcAddr, dport) logf("getConn didn't complete from %v to port %v", srcAddr, dport)
return return
} }
fmt.Println("<harry> handleIngress: getTCPHandlerForFunnelFlow: handling")
handler(c) handler(c)
return return
} }
@ -464,15 +472,18 @@ func (b *LocalBackend) HandleIngressTCPConn(ingressPeer tailcfg.NodeView, target
IngressPeer: ingressPeer, IngressPeer: ingressPeer,
}) })
if handler == nil { if handler == nil {
fmt.Println("<harry> handleIngress: no TCP handler for serve")
logf("[unexpected] no matching ingress serve handler for %v to port %v", srcAddr, dport) logf("[unexpected] no matching ingress serve handler for %v to port %v", srcAddr, dport)
sendRST() sendRST()
return return
} }
c, ok := getConnOrReset() c, ok := getConnOrReset()
if !ok { if !ok {
fmt.Println("<harry> handleIngress: getConnOrReset err")
logf("getConn didn't complete from %v to port %v", srcAddr, dport) logf("getConn didn't complete from %v to port %v", srcAddr, dport)
return return
} }
fmt.Println("<harry> handleIngress: handling")
handler(c) handler(c)
} }
@ -1379,6 +1390,8 @@ func handleServeIngress(ph PeerAPIHandler, w http.ResponseWriter, r *http.Reques
h := ph.(*peerAPIHandler) h := ph.(*peerAPIHandler)
metricIngressCalls.Add(1) metricIngressCalls.Add(1)
fmt.Println("<harry> handleServeIngress called")
// http.Errors only useful if hitting endpoint manually // http.Errors only useful if hitting endpoint manually
// otherwise rely on log lines when debugging ingress connections // otherwise rely on log lines when debugging ingress connections
// as connection is hijacked for bidi and is encrypted tls // as connection is hijacked for bidi and is encrypted tls
@ -1409,11 +1422,14 @@ func handleServeIngress(ph PeerAPIHandler, w http.ResponseWriter, r *http.Reques
return return
} }
target := ipn.HostPort(r.Header.Get("Tailscale-Ingress-Target")) target := ipn.HostPort(r.Header.Get("Tailscale-Ingress-Target"))
fmt.Println("<harry> handleServeIngress: target:", target)
if target == "" { if target == "" {
fmt.Println("<harry> handleServeIngress: target not set")
bad("Tailscale-Ingress-Target header not set") bad("Tailscale-Ingress-Target header not set")
return return
} }
if _, _, err := net.SplitHostPort(string(target)); err != nil { if _, _, err := net.SplitHostPort(string(target)); err != nil {
fmt.Println("<harry> handleServeIngress: target invalid")
bad("Tailscale-Ingress-Target header invalid; want host:port") bad("Tailscale-Ingress-Target header invalid; want host:port")
return return
} }
@ -1552,6 +1568,7 @@ func (b *LocalBackend) setVIPServicesTCPPortsInterceptedLocked(svcPorts map[tail
b.shouldInterceptVIPServicesTCPPortAtomic.Store(func(netip.AddrPort) bool { return false }) b.shouldInterceptVIPServicesTCPPortAtomic.Store(func(netip.AddrPort) bool { return false })
return return
} }
fmt.Println("<harry> setVIPServicesTCPPortsInterceptedLocked: hostname:", b.currentNode().Self().Hostinfo().Hostname())
nm := b.currentNode().NetMap() nm := b.currentNode().NetMap()
if nm == nil { if nm == nil {
b.logf("can't set intercept function for Service TCP Ports, netMap is nil") b.logf("can't set intercept function for Service TCP Ports, netMap is nil")
@ -1559,6 +1576,7 @@ func (b *LocalBackend) setVIPServicesTCPPortsInterceptedLocked(svcPorts map[tail
} }
vipServiceIPMap := nm.GetVIPServiceIPMap() vipServiceIPMap := nm.GetVIPServiceIPMap()
if len(vipServiceIPMap) == 0 { if len(vipServiceIPMap) == 0 {
fmt.Println("<harry> setVIPServicesTCPPortsInterceptedLocked: no VIP service IP map, not setting intercepted ports")
// No approved VIP Services // No approved VIP Services
return return
} }
@ -1568,8 +1586,10 @@ func (b *LocalBackend) setVIPServicesTCPPortsInterceptedLocked(svcPorts map[tail
for svcName, ports := range svcPorts { for svcName, ports := range svcPorts {
addrs, ok := vipServiceIPMap[svcName] addrs, ok := vipServiceIPMap[svcName]
if !ok { if !ok {
fmt.Println("<harry> setVIPServicesTCPPortsInterceptedLocked: no VIP service map entry for", svcName)
continue continue
} }
fmt.Println("<harry> setVIPServicesTCPPortsInterceptedLocked: generating intercept function for", svcName)
interceptFn := generateInterceptTCPPortFunc(ports) interceptFn := generateInterceptTCPPortFunc(ports)
for _, addr := range addrs { for _, addr := range addrs {
svcAddrPorts[addr] = interceptFn svcAddrPorts[addr] = interceptFn

2
ipn/localapi/localapi.go
View File

@ -984,6 +984,7 @@ func (h *Handler) serveLogout(w http.ResponseWriter, r *http.Request) {
} }
func (h *Handler) servePrefs(w http.ResponseWriter, r *http.Request) { func (h *Handler) servePrefs(w http.ResponseWriter, r *http.Request) {
fmt.Println("<harry> servePrefs")
if !h.PermitRead { if !h.PermitRead {
http.Error(w, "prefs access denied", http.StatusForbidden) http.Error(w, "prefs access denied", http.StatusForbidden)
return return
@ -991,6 +992,7 @@ func (h *Handler) servePrefs(w http.ResponseWriter, r *http.Request) {
var prefs ipn.PrefsView var prefs ipn.PrefsView
switch r.Method { switch r.Method {
case httpm.PATCH: case httpm.PATCH:
fmt.Println("<harry> servePrefs: PATCH")
if !h.PermitWrite { if !h.PermitWrite {
http.Error(w, "prefs write access denied", http.StatusForbidden) http.Error(w, "prefs write access denied", http.StatusForbidden)
return return

6
wgengine/netstack/netstack.go
View File

@ -1066,6 +1066,9 @@ func (ns *Impl) shouldProcessInbound(p *packet.Parsed, t *tstun.Wrapper) bool {
isLocal := ns.isLocalIP(dstIP) isLocal := ns.isLocalIP(dstIP)
isService := ns.isVIPServiceIP(dstIP) isService := ns.isVIPServiceIP(dstIP)
fmt.Println("<harry> shouldProcessInbound: called for target", dstIP)
fmt.Println("<harry> shouldProcessInbound: isService:", isService)
// Handle TCP connection to the Tailscale IP(s) in some cases: // Handle TCP connection to the Tailscale IP(s) in some cases:
if ns.lb != nil && p.IPProto == ipproto.TCP && isLocal { if ns.lb != nil && p.IPProto == ipproto.TCP && isLocal {
var peerAPIPort uint16 var peerAPIPort uint16
@ -1095,6 +1098,7 @@ func (ns *Impl) shouldProcessInbound(p *packet.Parsed, t *tstun.Wrapper) bool {
// An assumption holds for this to work: when tun mode is on for a service, // An assumption holds for this to work: when tun mode is on for a service,
// its tcp and web are not set. This is enforced in b.setServeConfigLocked. // its tcp and web are not set. This is enforced in b.setServeConfigLocked.
if ns.lb.ShouldInterceptVIPServiceTCPPort(p.Dst) { if ns.lb.ShouldInterceptVIPServiceTCPPort(p.Dst) {
fmt.Println("<harry> shouldProcessInbound: intercepting packet for Service")
return true return true
} }
} }
@ -1188,6 +1192,8 @@ func (ns *Impl) injectInbound(p *packet.Parsed, t *tstun.Wrapper, gro *gro.GRO)
return filter.DropSilently, gro return filter.DropSilently, gro
} }
fmt.Println("<harry> wgengine/netstack.injectInbound: for", p.Dst)
if !ns.shouldProcessInbound(p, t) { if !ns.shouldProcessInbound(p, t) {
// Let the host network stack (if any) deal with it. // Let the host network stack (if any) deal with it.
return filter.Accept, gro return filter.Accept, gro