TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2024-11-29 13:05:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

ipn/ipnlocal: fix log spam from now expected paths

Browse Source 
These log paths were actually unexpected until the refactor in
fe95d81b43. This moves the logs
to the callsites where they are actually unexpected.

Fixes #9670

Signed-off-by: Maisem Ali <maisem@tailscale.com>
This commit is contained in:
Maisem Ali 2023-10-05 22:20:19 -07:00 committed by Maisem Ali
parent 9d96e05267
commit 319607625f
1 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
ipn/ipnlocal/serve.go
View File

@ -160,8 +160,9 @@ func (s *serveListener) shouldWarnAboutListenError(err error) bool {
return true return true
} }
// handleServeListenersAccept accepts connections for the Listener. // handleServeListenersAccept accepts connections for the Listener. It calls the
// Calls incoming handler in a new goroutine for each accepted connection. // handler in a new goroutine for each accepted connection. This is used to
// handle local "tailscale serve" traffic originating from the machine itself.
func (s *serveListener) handleServeListenersAccept(ln net.Listener) error { func (s *serveListener) handleServeListenersAccept(ln net.Listener) error {
for { for {
conn, err := ln.Accept() conn, err := ln.Accept()
@ -171,7 +172,7 @@ func (s *serveListener) handleServeListenersAccept(ln net.Listener) error {
srcAddr := conn.RemoteAddr().(*net.TCPAddr).AddrPort() srcAddr := conn.RemoteAddr().(*net.TCPAddr).AddrPort()
handler := s.b.tcpHandlerForServe(s.ap.Port(), srcAddr) handler := s.b.tcpHandlerForServe(s.ap.Port(), srcAddr)
if handler == nil { if handler == nil {
s.b.logf("serve RST for %v", srcAddr) s.b.logf("[unexpected] local-serve: no handler for %v to port %v", srcAddr, s.ap.Port())
conn.Close() conn.Close()
continue continue
} }
@ -325,32 +326,43 @@ func (b *LocalBackend) DeleteForegroundSession(sessionID string) error {
return b.setServeConfigLocked(sc, "") return b.setServeConfigLocked(sc, "")
} }
// HandleIngressTCPConn handles a TCP connection initiated by the ingressPeer
// proxied to the local node over the PeerAPI.
// Target represents the destination HostPort of the conn.
// srcAddr represents the source AddrPort and not that of the ingressPeer.
// getConnOrReset is a callback to get the connection, or reset if the connection
// is no longer available.
// sendRST is a callback to send a TCP RST to the ingressPeer indicating that
// the connection was not accepted.
func (b *LocalBackend) HandleIngressTCPConn(ingressPeer tailcfg.NodeView, target ipn.HostPort, srcAddr netip.AddrPort, getConnOrReset func() (net.Conn, bool), sendRST func()) { func (b *LocalBackend) HandleIngressTCPConn(ingressPeer tailcfg.NodeView, target ipn.HostPort, srcAddr netip.AddrPort, getConnOrReset func() (net.Conn, bool), sendRST func()) {
b.mu.Lock() b.mu.Lock()
sc := b.serveConfig sc := b.serveConfig
b.mu.Unlock() b.mu.Unlock()
// TODO(maisem,bradfitz): make this not alloc for every conn.
logf := logger.WithPrefix(b.logf, "handleIngress: ")
if !sc.Valid() { if !sc.Valid() {
b.logf("localbackend: 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) {
b.logf("localbackend: got ingress conn for unconfigured %q; rejecting", target) logf("got ingress conn for unconfigured %q; rejecting", target)
sendRST() sendRST()
return return
} }
_, port, err := net.SplitHostPort(string(target)) _, port, err := net.SplitHostPort(string(target))
if err != nil { if err != nil {
b.logf("localbackend: 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 {
b.logf("localbackend: got ingress conn for bad target %q; rejecting", target) logf("got ingress conn for bad target %q; rejecting", target)
sendRST() sendRST()
return return
} }
@ -360,7 +372,7 @@ func (b *LocalBackend) HandleIngressTCPConn(ingressPeer tailcfg.NodeView, target
if handler != nil { if handler != nil {
c, ok := getConnOrReset() c, ok := getConnOrReset()
if !ok { if !ok {
b.logf("localbackend: 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
} }
handler(c) handler(c)
@ -371,12 +383,13 @@ func (b *LocalBackend) HandleIngressTCPConn(ingressPeer tailcfg.NodeView, target
// extend serveHTTPContext or similar. // extend serveHTTPContext or similar.
handler := b.tcpHandlerForServe(dport, srcAddr) handler := b.tcpHandlerForServe(dport, srcAddr)
if handler == nil { if handler == nil {
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 {
b.logf("localbackend: 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
} }
handler(c) handler(c)
@ -390,13 +403,11 @@ func (b *LocalBackend) tcpHandlerForServe(dport uint16, srcAddr netip.AddrPort)
b.mu.Unlock() b.mu.Unlock()
if !sc.Valid() { if !sc.Valid() {
b.logf("[unexpected] localbackend: got TCP conn w/o serveConfig; from %v to port %v", srcAddr, dport)
return nil return nil
} }
tcph, ok := sc.FindTCP(dport) tcph, ok := sc.FindTCP(dport)
if !ok { if !ok {
b.logf("[unexpected] localbackend: got TCP conn without TCP config for port %v; from %v", dport, srcAddr)
return nil return nil
} }
@ -468,7 +479,6 @@ func (b *LocalBackend) tcpHandlerForServe(dport uint16, srcAddr netip.AddrPort)
} }
} }
b.logf("closing TCP conn to port %v (from %v) with actionless TCPPortHandler", dport, srcAddr)
return nil return nil
} }