fixup! fix: detect JetBrains running on local ipv6

code-asher · code-asher · commit 3d9a75bd3c89 · 2024-01-17T13:49:29.000-09:00
diff --git a/agent/agentssh/portinspection_supported.go b/agent/agentssh/portinspection_supported.go
@@ -15,12 +15,16 @@ func getListeningPortProcessCmdline(port uint32) (string, error) {
 	acceptFn := func(s *netstat.SockTabEntry) bool {
 		return s.LocalAddr != nil && uint32(s.LocalAddr.Port) == port
 	}
-	tabs, err := netstat.TCPSocks(acceptFn)
+	tabs, err4 := netstat.TCPSocks(acceptFn)
 	tabs6, err6 := netstat.TCP6Socks(acceptFn)
 
-	// Only return the error if the other method found nothing.
-	if (err != nil && len(tabs6) == 0) || (err6 != nil && len(tabs) == 0) {
-		return "", xerrors.Errorf("inspect port %d: %w", port, errors.Join(err, err6))
+	// In the common case, we want to check ipv4 listening addresses.  If this
+	// fails, we should return an error.  We also need to check ipv6.  The
+	// assumption is, if we have an err4, and 0 ipv6 addresses listed, then we are
+	// interested in the err4 (and vice versa).  So return both errors (at least 1
+	// is non-nil) if the other list is empty.
+	if (err4 != nil && len(tabs6) == 0) || (err6 != nil && len(tabs) == 0) {
+		return "", xerrors.Errorf("inspect port %d: %w", port, errors.Join(err4, err6))
 	}
 
 	var proc *netstat.Process
@@ -41,7 +45,7 @@ func getListeningPortProcessCmdline(port uint32) (string, error) {
 	pid := proc.Pid
 	data, err := os.ReadFile(fmt.Sprintf("/proc/%d/cmdline", pid))
 	if err != nil {
-		return "", xerrors.Errorf("read /proc/%d/cmdline: %w", pid, err)
+		return "", xerrors.Errorf("read /proc/%d/cmdline: %w", pid, err4)
 	}
 	return string(data), nil
 }
