slackhq/nebula
1
1
Fork 0
mirror of https://github.com/slackhq/nebula.git synced 2024-09-20 14:56:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Support unsafe_routes on mobile again (#729)

Browse source
This commit is contained in:
Nate Brown 2022-08-05 09:58:10 -05:00 committed by GitHub
parent 2adf0ca1d1
commit b1eeb5f3b8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 29 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
overlay/tun_android.go
View file

@ -8,22 +8,24 @@ import (
"io" "io"
"net" "net"
"os" "os"
"runtime"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"github.com/slackhq/nebula/cidr"
"github.com/slackhq/nebula/iputil" "github.com/slackhq/nebula/iputil"
) )
type tun struct { type tun struct {
io.ReadWriteCloser io.ReadWriteCloser
fd int fd int
cidr *net.IPNet cidr *net.IPNet
l *logrus.Logger routeTree *cidr.Tree4
l *logrus.Logger
} }
func newTunFromFd(l *logrus.Logger, deviceFd int, cidr *net.IPNet, _ int, routes []Route, _ int) (*tun, error) { func newTunFromFd(l *logrus.Logger, deviceFd int, cidr *net.IPNet, _ int, routes []Route, _ int) (*tun, error) {
if len(routes) > 0 { routeTree, err := makeRouteTree(l, routes, false)
return nil, fmt.Errorf("routes are not supported in %s", runtime.GOOS) if err != nil {
return nil, err
} }
file := os.NewFile(uintptr(deviceFd), "/dev/net/tun") file := os.NewFile(uintptr(deviceFd), "/dev/net/tun")
@ -33,6 +35,7 @@ func newTunFromFd(l *logrus.Logger, deviceFd int, cidr *net.IPNet, _ int, routes
fd: int(file.Fd()), fd: int(file.Fd()),
cidr: cidr, cidr: cidr,
l: l, l: l,
routeTree: routeTree,
}, nil }, nil
} }
@ -40,7 +43,12 @@ func newTun(_ *logrus.Logger, _ string, _ *net.IPNet, _ int, _ []Route, _ int, _
return nil, fmt.Errorf("newTun not supported in Android") return nil, fmt.Errorf("newTun not supported in Android")
} }
func (t *tun) RouteFor(iputil.VpnIp) iputil.VpnIp { func (t *tun) RouteFor(ip iputil.VpnIp) iputil.VpnIp {
r := t.routeTree.MostSpecificContains(ip)
if r != nil {
return r.(iputil.VpnIp)
}
return 0 return 0
} }

20
overlay/tun_ios.go
View file

@ -9,32 +9,35 @@ import (
"io" "io"
"net" "net"
"os" "os"
"runtime"
"sync" "sync"
"syscall" "syscall"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"github.com/slackhq/nebula/cidr"
"github.com/slackhq/nebula/iputil" "github.com/slackhq/nebula/iputil"
) )
type tun struct { type tun struct {
io.ReadWriteCloser io.ReadWriteCloser
cidr *net.IPNet cidr *net.IPNet
routeTree *cidr.Tree4
} }
func newTun(_ *logrus.Logger, _ string, _ *net.IPNet, _ int, _ []Route, _ int, _ bool) (*tun, error) { func newTun(_ *logrus.Logger, _ string, _ *net.IPNet, _ int, _ []Route, _ int, _ bool) (*tun, error) {
return nil, fmt.Errorf("newTun not supported in iOS") return nil, fmt.Errorf("newTun not supported in iOS")
} }
func newTunFromFd(_ *logrus.Logger, deviceFd int, cidr *net.IPNet, _ int, routes []Route, _ int) (*tun, error) { func newTunFromFd(l *logrus.Logger, deviceFd int, cidr *net.IPNet, _ int, routes []Route, _ int) (*tun, error) {
if len(routes) > 0 { routeTree, err := makeRouteTree(l, routes, false)
return nil, fmt.Errorf("routes are not supported in %s", runtime.GOOS) if err != nil {
return nil, err
} }
file := os.NewFile(uintptr(deviceFd), "/dev/tun") file := os.NewFile(uintptr(deviceFd), "/dev/tun")
return &tun{ return &tun{
cidr: cidr, cidr: cidr,
ReadWriteCloser: &tunReadCloser{f: file}, ReadWriteCloser: &tunReadCloser{f: file},
routeTree: routeTree,
}, nil }, nil
} }
@ -42,7 +45,12 @@ func (t *tun) Activate() error {
return nil return nil
} }
func (t *tun) RouteFor(iputil.VpnIp) iputil.VpnIp { func (t *tun) RouteFor(ip iputil.VpnIp) iputil.VpnIp {
r := t.routeTree.MostSpecificContains(ip)
if r != nil {
return r.(iputil.VpnIp)
}
return 0 return 0
} }