TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-04-19 05:02:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

net/netns: don't return an error if we're not root and running the tailscale binary

Browse Source 
tailscale netcheck was broken otherwise.

We can fix this a better way later; I'm just fixing a regression in
some way because I'm trying to work on netcheck at the moment.
This commit is contained in:
Brad Fitzpatrick 2020-05-29 21:58:31 -07:00
parent 5114df415e
commit 1407540b52
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
net/netns/netns_linux.go
View File

@ -8,6 +8,8 @@ package netns
import ( import (
"fmt" "fmt"
"os"
"path/filepath"
"syscall" "syscall"
"golang.org/x/sys/unix" "golang.org/x/sys/unix"
@ -36,6 +38,13 @@ func control(network, address string, c syscall.RawConn) error {
err := c.Control(func(fd uintptr) { err := c.Control(func(fd uintptr) {
controlErr = unix.SetsockoptInt(int(fd), unix.SOL_SOCKET, unix.SO_MARK, tailscaleBypassMark) controlErr = unix.SetsockoptInt(int(fd), unix.SOL_SOCKET, unix.SO_MARK, tailscaleBypassMark)
}) })
// Before returning some fatal error, see if we're just a regular user
// running cmd/tailscale (presumably netcheck) and ignore the error if so.
if (err != nil || controlErr != nil) && os.Getuid() != 0 {
if v, _ := os.Executable(); filepath.Base(v) == "tailscale" {
return nil
}
}
if err != nil { if err != nil {
return fmt.Errorf("setting socket mark: %w", err) return fmt.Errorf("setting socket mark: %w", err)
} }