Add --dbus-address

.travis.yml

@@ -1,7 +1,9 @@
 language: go
+dist: bionic
 go:
 - 1.13.x
 before_install:
+- sudo apt-get -y install python3-pydbus
 - go get -u github.com/mattn/goveralls
 - go get -u github.com/golangci/golangci-lint/cmd/golangci-lint
 script:

Makefile

@@ -39,7 +39,7 @@ test: $(SLIRPNETSTACKDEP)
 	SLIRPNETSTACKBIN=$(SLIRPNETSTACKBIN) \
 	PYTHONPATH=. \
 	PYTHONIOENCODING=utf-8 \
-		unshare -Ur python3 -m tests.runner tests
+		unshare -Ur dbus-run-session --config-file=tests/dbus.conf python3 -m tests.runner tests
 
 cover: bin/gocovmerge
 	@-mkdir -p .cover

addr.go

@@ -33,6 +33,7 @@ type FwdAddr struct {
 	kaEnable      bool
 	kaInterval    time.Duration
 	proxyProtocol bool
+	listener      Listener
 }
 
 type FwdAddrSlice []FwdAddr
@@ -49,7 +50,7 @@ func (f *FwdAddrSlice) String() string {
 	return strings.Join(s, " ")
 }
 
-func (f *FwdAddrSlice) Set(value string) error {
+func (fwa *FwdAddr) Set(value string) error {
 	var (
 		bindPort, bindIP string
 		network          string
@@ -67,7 +68,6 @@ func (f *FwdAddrSlice) Set(value string) error {
 		rest = p[0]
 	}
 
-	var fwa FwdAddr
 	switch network {
 	case "udprpc":
 		fwa.network = "udp"
@@ -141,19 +141,32 @@ func (f *FwdAddrSlice) Set(value string) error {
 		fwa.host.Port = uint16(port)
 	}
 
+	return nil
+}
+
+func (f *FwdAddrSlice) Set(value string) error {
+	var fwa FwdAddr
+
+	if err := fwa.Set(value); err != nil {
+		return err
+	}
+
 	*f = append(*f, fwa)
 	return nil
 }
 
+func (fa *FwdAddr) SetDefaultAddr(bindAddrDef net.IP, hostAddrDef net.IP) {
+	if fa.bind.Addr == "" {
+		fa.bind.Addr = tcpip.Address(bindAddrDef)
+	}
+	if fa.host.Addr == "" {
+		fa.host.Addr = tcpip.Address(hostAddrDef)
+	}
+}
+
 func (f *FwdAddrSlice) SetDefaultAddrs(bindAddrDef net.IP, hostAddrDef net.IP) {
 	for i, _ := range *f {
-		fa := &(*f)[i]
-		if fa.bind.Addr == "" {
-			fa.bind.Addr = tcpip.Address(bindAddrDef)
-		}
-		if fa.host.Addr == "" {
-			fa.host.Addr = tcpip.Address(hostAddrDef)
-		}
+		(*f)[i].SetDefaultAddr(bindAddrDef, hostAddrDef)
 	}
 }
 

dbus.go

@@ -0,0 +1,215 @@
+package main
+
+import (
+	"errors"
+	"fmt"
+	"os"
+	"strings"
+
+	"github.com/godbus/dbus/v5"
+	"github.com/godbus/dbus/v5/introspect"
+	"gvisor.dev/gvisor/pkg/tcpip"
+	"gvisor.dev/gvisor/pkg/tcpip/header"
+	"gvisor.dev/gvisor/pkg/tcpip/stack"
+	"gvisor.dev/gvisor/pkg/tcpip/transport/tcp"
+	"gvisor.dev/gvisor/pkg/tcpip/transport/udp"
+)
+
+func getInfo(tcpep tcpip.Endpoint) *stack.TransportEndpointInfo {
+	switch t := tcpep.Info().(type) {
+	case *stack.TransportEndpointInfo:
+		return t
+	case *tcp.EndpointInfo:
+		return &t.TransportEndpointInfo
+	default:
+		fmt.Fprintf(os.Stderr, "unexpected type %T\n", t)
+		return nil
+	}
+
+}
+
+func (s *State) GetInfo() (string, *dbus.Error) {
+	var b strings.Builder
+
+	fmt.Fprintf(&b, "Protocol[State]      Source Address  Port   Dest. Address  Port\n")
+	teps := s.stack.RegisteredEndpoints()
+	for _, tep := range teps {
+		ep := tep.(tcpip.Endpoint)
+		tepi := getInfo(ep)
+		if tepi == nil {
+			continue
+		}
+
+		transName := "unknown"
+		state := ""
+		switch tepi.TransProto {
+		case header.UDPProtocolNumber:
+			transName = "UDP"
+			state = udp.EndpointState(ep.State()).String()
+		case header.TCPProtocolNumber:
+			transName = "TCP"
+			state = tcp.EndpointState(ep.State()).String()
+		}
+
+		protocolState := transName + "[" + state + "]"
+		fmt.Fprintf(&b, "%-19v %15v %5v %15v %5v\n",
+			protocolState,
+			tepi.ID.RemoteAddress, tepi.ID.RemotePort,
+			tepi.ID.LocalAddress, tepi.ID.LocalPort)
+	}
+	return b.String(), nil
+}
+
+type forwardEntry struct {
+	Network  string
+	Addr     string
+	Port     uint16
+	HostAddr string
+	HostPort uint16
+}
+
+func (s *State) RemoveRemoteForward(addr string) *dbus.Error {
+	var fwa FwdAddr
+
+	if err := fwa.Set(addr); err != nil {
+		return dbus.MakeFailedError(err)
+	}
+
+	fwa.SetDefaultAddr(netParseIP("10.0.2.2"), netParseIP("127.0.0.1"))
+
+	if err := s.removeRemoteFwd(&fwa); err != nil {
+		return dbus.MakeFailedError(err)
+	}
+
+	return nil
+}
+
+func (s *State) AddRemoteForward(addr string) *dbus.Error {
+	var fwa FwdAddr
+
+	if err := fwa.Set(addr); err != nil {
+		return dbus.MakeFailedError(err)
+	}
+
+	fwa.SetDefaultAddr(netParseIP("10.0.2.2"), netParseIP("127.0.0.1"))
+
+	err := s.addRemoteFwd(&fwa)
+	if err != nil {
+		return dbus.MakeFailedError(err)
+	}
+	return nil
+}
+
+func (s *State) RemoveLocalForward(addr string) *dbus.Error {
+	var fwa FwdAddr
+
+	if err := fwa.Set(addr); err != nil {
+		return dbus.MakeFailedError(err)
+	}
+
+	fwa.SetDefaultAddr(netParseIP("127.0.0.1"), netParseIP("10.0.2.100"))
+
+	if err := s.removeLocalFwd(&fwa); err != nil {
+		return dbus.MakeFailedError(err)
+	}
+
+	return nil
+}
+
+func (s *State) AddLocalForward(addr string) *dbus.Error {
+	var fwa FwdAddr
+
+	if err := fwa.Set(addr); err != nil {
+		return dbus.MakeFailedError(err)
+	}
+
+	fwa.SetDefaultAddr(netParseIP("127.0.0.1"), netParseIP("10.0.2.100"))
+
+	err := s.addLocalFwd(&fwa)
+	if err != nil {
+		return dbus.MakeFailedError(err)
+	}
+	return nil
+}
+
+func getForwardList(m map[string]*FwdAddr) []forwardEntry {
+	e := []forwardEntry{}
+	for _, b := range m {
+		e = append(e, forwardEntry{
+			b.network,
+			b.bind.Addr.String(),
+			b.bind.Port,
+			b.host.Addr.String(),
+			b.host.Port,
+		})
+	}
+	return e
+}
+
+func (s *State) ListRemoteForward() ([]forwardEntry, *dbus.Error) {
+	e := getForwardList(s.remoteTcpFwd)
+	e = append(e, getForwardList(s.remoteUdpFwd)...)
+	return e, nil
+}
+
+func (s *State) ListLocalForward() ([]forwardEntry, *dbus.Error) {
+	e := getForwardList(s.localTcpFwd)
+	e = append(e, getForwardList(s.localUdpFwd)...)
+	return e, nil
+}
+
+func (s *State) Quit() *dbus.Error {
+	s.quitCh <- true
+	return nil
+}
+
+func connect(addr string) (*dbus.Conn, error) {
+	conn, err := dbus.Dial(addr)
+	if err != nil {
+		return nil, err
+	}
+	if err = conn.Auth(nil); err != nil {
+		return nil, err
+	}
+	if err = conn.Hello(); err != nil {
+		return nil, err
+	}
+
+	return conn, nil
+}
+
+func setupDBus(state *State, addr string) error {
+	if addr == "" {
+		return nil
+	}
+
+	conn, err := connect(addr)
+	if err != nil {
+		return err
+	}
+
+	conn.Export(state, "/org/freedesktop/SlirpHelper1", "org.freedesktop.SlirpHelper1")
+	n := &introspect.Node{
+		Name: "/org/freedesktop/SlirpHelper1",
+		Interfaces: []introspect.Interface{
+			introspect.IntrospectData,
+			{
+				Name:    "org.freedesktop.SlirpHelper1",
+				Methods: introspect.Methods(state),
+			},
+		},
+	}
+	conn.Export(introspect.NewIntrospectable(n), "/org/freedesktop/SlirpHelper1",
+		"org.freedesktop.DBus.Introspectable")
+
+	if reply, err := conn.RequestName(
+		fmt.Sprintf("org.freedesktop.Slirp1_%d", os.Getpid()),
+		dbus.NameFlagDoNotQueue); err != nil {
+		return err
+	} else if reply != dbus.RequestNameReplyPrimaryOwner {
+		return errors.New("DBus name already taken")
+	}
+
+	state.dbus = conn
+	return nil
+}

fwd.go

@@ -12,7 +12,7 @@ type Listener interface {
 	Addr() net.Addr
 }
 
-func LocalForwardTCP(state *State, s *stack.Stack, rf *FwdAddr, doneChannel <-chan bool) (Listener, error) {
+func LocalForwardTCP(state *State, s *stack.Stack, rf *FwdAddr) (Listener, error) {
 	tmpBind := &net.TCPAddr{
 		IP:   net.IP(rf.bind.Addr),
 		Port: int(rf.bind.Port),
@@ -28,14 +28,16 @@ func LocalForwardTCP(state *State, s *stack.Stack, rf *FwdAddr, doneChannel <-ch
 		return nil, err
 	}
 
-	go func() error {
+	go func() {
 		for {
 			nRemote, err := srv.Accept()
 			if err != nil {
-				// Not sure when Accept() can error,
-				// nor what the correct resolution
-				// is. Most likely socket is closed.
-				return err
+				// Most likely socket is closed.
+				// Not sure when Accept() can error otherwise,
+				if logConnections {
+					fmt.Printf("[!] TCP local-fwd error: %s\n", err)
+				}
+				return
 			}
 			remote := &KaTCPConn{nRemote.(*net.TCPConn)}
 
@@ -45,6 +47,10 @@ func LocalForwardTCP(state *State, s *stack.Stack, rf *FwdAddr, doneChannel <-ch
 		}
 	}()
 
+	sa := srv.Addr().(*net.TCPAddr)
+	rf.bind.Port = uint16(sa.Port)
+	rf.listener = srv
+	state.localTcpFwd[rf.HostAddr().String()] = rf
 	return srv, nil
 }
 
@@ -56,7 +62,7 @@ func (u *UDPListner) Addr() net.Addr {
 	return u.UDPConn.LocalAddr()
 }
 
-func LocalForwardUDP(state *State, s *stack.Stack, rf *FwdAddr, doneChannel <-chan bool) (Listener, error) {
+func LocalForwardUDP(state *State, s *stack.Stack, rf *FwdAddr) (Listener, error) {
 	tmpBind := &net.UDPAddr{
 		IP:   net.IP(rf.bind.Addr),
 		Port: int(rf.bind.Port),
@@ -102,7 +108,11 @@ func LocalForwardUDP(state *State, s *stack.Stack, rf *FwdAddr, doneChannel <-ch
 			}()
 		}
 	}()
-	return &UDPListner{srv}, nil
+
+	rf.listener = &UDPListner{srv}
+	state.localUdpFwd[rf.HostAddr().String()] = rf
+
+	return rf.listener, nil
 }
 
 func LocalForward(state *State, s *stack.Stack, local KaConn, gaddr net.Addr, buf []byte, proxyProtocol bool) {

go.mod

@@ -4,6 +4,7 @@ go 1.13
 
 require (
 	github.com/cenkalti/backoff v2.2.1+incompatible // indirect
+	github.com/godbus/dbus/v5 v5.0.3
 	github.com/golang/protobuf v1.3.3 // indirect
 	github.com/opencontainers/runc v0.1.1
 	github.com/opencontainers/runtime-spec v0.1.2-0.20171211145439-b2d941ef6a78

go.sum

@@ -3,6 +3,8 @@ github.com/cenkalti/backoff v0.0.0-20190506075156-2146c9339422 h1:+FKjzBIdfBHYDv
 github.com/cenkalti/backoff v0.0.0-20190506075156-2146c9339422/go.mod h1:b6Nc7NRH5C4aCISLry0tLnTjcuTEvoiqcWDdsU0sOGM=
 github.com/cenkalti/backoff v2.2.1+incompatible h1:tNowT99t7UNflLxfYYSlKYsBpXdEet03Pg2g16Swow4=
 github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM=
+github.com/godbus/dbus/v5 v5.0.3 h1:ZqHaoEF7TBzh4jzPmqVhE/5A1z9of6orkAe5uHoAeME=
+github.com/godbus/dbus/v5 v5.0.3/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
 github.com/gofrs/flock v0.6.1-0.20180915234121-886344bea079 h1:JFTFz3HZTGmgMz4E1TabNBNJljROSYgja1b4l50FNVs=
 github.com/gofrs/flock v0.6.1-0.20180915234121-886344bea079/go.mod h1:F1TvTiK9OcQqauNUHlbJvyl9Qa1QvF/gOUDKA14jxHU=
 github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y=
@@ -20,6 +22,8 @@ github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO
 github.com/google/subcommands v0.0.0-20190508160503-636abe8753b8/go.mod h1:ZjhPrFU+Olkh9WazFPsl27BQ4UPiG37m3yTrtFlrHVk=
 github.com/google/uuid v0.0.0-20171129191014-dec09d789f3d/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
+github.com/opencontainers/runc v0.1.1 h1:GlxAyO6x8rfZYN9Tt0Kti5a/cP41iuiO2yYT0IJGY8Y=
+github.com/opencontainers/runc v0.1.1/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U=
 github.com/opencontainers/runtime-spec v0.1.2-0.20171211145439-b2d941ef6a78 h1:d9F+LNYwMyi3BDN4GzZdaSiq4otb8duVEWyZjeUtOQI=
 github.com/opencontainers/runtime-spec v0.1.2-0.20171211145439-b2d941ef6a78/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
 github.com/syndtr/gocapability v0.0.0-20180916011248-d98352740cb2 h1:b6uOv7YOFK0TYG7HtkIgExQo+2RdLuwRft63jn2HWj8=