go-gost/gost
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add tun listener

Browse Source
This commit is contained in:
ginuerzh
2021-12-19 23:20:35 +08:00
parent 34d6e393a1
commit a853d99d92
18 changed files with 584 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
pkg/connector/http/metadata.go
View File

@ -1,13 +1,12 @@
package http
import (
"fmt"
"net/http"
"net/url"
"strings"
"time"
md "github.com/go-gost/gost/pkg/metadata"
mdata "github.com/go-gost/gost/pkg/metadata"
)
type metadata struct {
@ -16,7 +15,7 @@ type metadata struct {
header http.Header
}
func (c *httpConnector) parseMetadata(md md.Metadata) (err error) {
func (c *httpConnector) parseMetadata(md mdata.Metadata) (err error) {
const (
connectTimeout = "timeout"
user = "user"
@ -34,12 +33,12 @@ func (c *httpConnector) parseMetadata(md md.Metadata) (err error) {
}
}
if mm, _ := md.Get(header).(map[interface{}]interface{}); len(mm) > 0 {
h := http.Header{}
if mm := mdata.GetStringMapString(md, header); len(mm) > 0 {
hd := http.Header{}
for k, v := range mm {
h.Add(fmt.Sprintf("%v", k), fmt.Sprintf("%v", v))
hd.Add(k, v)
}
c.md.header = h
c.md.header = hd
}
return

25
pkg/handler/http/metadata.go
View File

@ -1,12 +1,11 @@
package http
import (
"fmt"
"net/http"
"strings"
"github.com/go-gost/gost/pkg/auth"
md "github.com/go-gost/gost/pkg/metadata"
mdata "github.com/go-gost/gost/pkg/metadata"
)
type metadata struct {
@ -18,7 +17,7 @@ type metadata struct {
header http.Header
}
func (h *httpHandler) parseMetadata(md md.Metadata) error {
func (h *httpHandler) parseMetadata(md mdata.Metadata) error {
const (
header = "header"
users = "users"
@ -29,25 +28,23 @@ func (h *httpHandler) parseMetadata(md md.Metadata) error {
enableUDP = "udp"
)
if v, _ := md.Get(users).([]interface{}); len(v) > 0 {
if auths := md.GetStrings(users); len(auths) > 0 {
authenticator := auth.NewLocalAuthenticator(nil)
for _, auth := range v {
if s, _ := auth.(string); s != "" {
ss := strings.SplitN(s, ":", 2)
if len(ss) == 1 {
authenticator.Add(ss[0], "")
} else {
authenticator.Add(ss[0], ss[1])
}
for _, auth := range auths {
ss := strings.SplitN(auth, ":", 2)
if len(ss) == 1 {
authenticator.Add(ss[0], "")
} else {
authenticator.Add(ss[0], ss[1])
}
}
h.md.authenticator = authenticator
}
if mm, _ := md.Get(header).(map[interface{}]interface{}); len(mm) > 0 {
if mm := mdata.GetStringMapString(md, header); len(mm) > 0 {
hd := http.Header{}
for k, v := range mm {
hd.Add(fmt.Sprintf("%v", k), fmt.Sprintf("%v", v))
hd.Add(k, v)
}
h.md.header = hd
}

16
pkg/handler/http2/metadata.go
View File

@ -29,16 +29,14 @@ func (h *http2Handler) parseMetadata(md md.Metadata) error {
h.md.proxyAgent = md.GetString(proxyAgent)
if v, _ := md.Get(users).([]interface{}); len(v) > 0 {
if auths := md.GetStrings(users); len(auths) > 0 {
authenticator := auth.NewLocalAuthenticator(nil)
for _, auth := range v {
if s, _ := auth.(string); s != "" {
ss := strings.SplitN(s, ":", 2)
if len(ss) == 1 {
authenticator.Add(ss[0], "")
} else {
authenticator.Add(ss[0], ss[1])
}
for _, auth := range auths {
ss := strings.SplitN(auth, ":", 2)
if len(ss) == 1 {
authenticator.Add(ss[0], "")
} else {
authenticator.Add(ss[0], ss[1])
}
}
h.md.authenticator = authenticator

17
pkg/handler/relay/metadata.go
View File

@ -27,20 +27,19 @@ func (h *relayHandler) parseMetadata(md md.Metadata) (err error) {
noDelay = "nodelay"
)
if v, _ := md.Get(users).([]interface{}); len(v) > 0 {
if auths := md.GetStrings(users); len(auths) > 0 {
authenticator := auth.NewLocalAuthenticator(nil)
for _, auth := range v {
if s, _ := auth.(string); s != "" {
ss := strings.SplitN(s, ":", 2)
if len(ss) == 1 {
authenticator.Add(ss[0], "")
} else {
authenticator.Add(ss[0], ss[1])
}
for _, auth := range auths {
ss := strings.SplitN(auth, ":", 2)
if len(ss) == 1 {
authenticator.Add(ss[0], "")
} else {
authenticator.Add(ss[0], ss[1])
}
}
h.md.authenticator = authenticator
}
h.md.readTimeout = md.GetDuration(readTimeout)
h.md.retryCount = md.GetInt(retryCount)
h.md.enableBind = md.GetBool(enableBind)

13
pkg/listener/obfs/http/metadata.go
View File

@ -1,27 +1,26 @@
package http
import (
"fmt"
"net/http"
md "github.com/go-gost/gost/pkg/metadata"
mdata "github.com/go-gost/gost/pkg/metadata"
)
type metadata struct {
header http.Header
}
func (l *obfsListener) parseMetadata(md md.Metadata) (err error) {
func (l *obfsListener) parseMetadata(md mdata.Metadata) (err error) {
const (
header = "header"
)
if mm, _ := md.Get(header).(map[interface{}]interface{}); len(mm) > 0 {
h := http.Header{}
if mm := mdata.GetStringMapString(md, header); len(mm) > 0 {
hd := http.Header{}
for k, v := range mm {
h.Add(fmt.Sprintf("%v", k), fmt.Sprintf("%v", v))
hd.Add(k, v)
}
l.md.header = h
l.md.header = hd
}
return
}

46
pkg/listener/tun/conn.go Normal file
View File

@ -0,0 +1,46 @@
package tun
import (
"errors"
"net"
"time"
"github.com/songgao/water"
)
type tunConn struct {
ifce *water.Interface
addr net.Addr
}
func (c *tunConn) Read(b []byte) (n int, err error) {
return c.ifce.Read(b)
}
func (c *tunConn) Write(b []byte) (n int, err error) {
return c.ifce.Write(b)
}
func (c *tunConn) Close() (err error) {
return c.ifce.Close()
}
func (c *tunConn) LocalAddr() net.Addr {
return c.addr
}
func (c *tunConn) RemoteAddr() net.Addr {
return &net.IPAddr{}
}
func (c *tunConn) SetDeadline(t time.Time) error {
return &net.OpError{Op: "set", Net: "tuntap", Source: nil, Addr: nil, Err: errors.New("deadline not supported")}
}
func (c *tunConn) SetReadDeadline(t time.Time) error {
return &net.OpError{Op: "set", Net: "tuntap", Source: nil, Addr: nil, Err: errors.New("deadline not supported")}
}
func (c *tunConn) SetWriteDeadline(t time.Time) error {
return &net.OpError{Op: "set", Net: "tuntap", Source: nil, Addr: nil, Err: errors.New("deadline not supported")}
}

87
pkg/listener/tun/listener.go Normal file
View File

@ -0,0 +1,87 @@
package tun
import (
"net"
"github.com/go-gost/gost/pkg/listener"
"github.com/go-gost/gost/pkg/logger"
md "github.com/go-gost/gost/pkg/metadata"
"github.com/go-gost/gost/pkg/registry"
)
// ipRoute is an IP routing entry
type ipRoute struct {
Dest net.IPNet
Gateway net.IP
}
func init() {
registry.RegisterListener("tun", NewListener)
}
type tunListener struct {
saddr string
addr net.Addr
cqueue chan net.Conn
closed chan struct{}
logger logger.Logger
md metadata
}
func NewListener(opts ...listener.Option) listener.Listener {
options := &listener.Options{}
for _, opt := range opts {
opt(options)
}
return &tunListener{
saddr: options.Addr,
logger: options.Logger,
}
}
func (l *tunListener) Init(md md.Metadata) (err error) {
if err = l.parseMetadata(md); err != nil {
return
}
conn, ifce, err := l.createTun()
if err != nil {
return
}
addrs, _ := ifce.Addrs()
l.logger.Infof("name: %s, net: %s, mtu: %d, addrs: %s",
ifce.Name, conn.LocalAddr(), ifce.MTU, addrs)
l.addr = conn.LocalAddr()
l.cqueue = make(chan net.Conn, 1)
l.closed = make(chan struct{})
l.cqueue <- conn
return
}
func (l *tunListener) Accept() (net.Conn, error) {
select {
case conn := <-l.cqueue:
return conn, nil
case <-l.closed:
}
return nil, listener.ErrClosed
}
func (l *tunListener) Addr() net.Addr {
return l.addr
}
func (l *tunListener) Close() error {
select {
case <-l.closed:
return net.ErrClosed
default:
close(l.closed)
}
return nil
}

70
pkg/listener/tun/metadata.go Normal file
View File

@ -0,0 +1,70 @@
package tun
import (
"net"
"strings"
md "github.com/go-gost/gost/pkg/metadata"
)
const (
DefaultMTU = 1350
)
type metadata struct {
name string
net string
// peer addr of point-to-point on MacOS
peer string
mtu int
routes []ipRoute
// default gateway
gateway string
tcp bool
}
func (l *tunListener) parseMetadata(md md.Metadata) (err error) {
const (
name = "name"
netKey = "net"
peer = "peer"
mtu = "mtu"
routes = "routes"
gateway = "gw"
tcp = "tcp"
)
l.md.name = md.GetString(name)
l.md.net = md.GetString(netKey)
l.md.peer = md.GetString(peer)
l.md.mtu = md.GetInt(mtu)
if l.md.mtu <= 0 {
l.md.mtu = DefaultMTU
}
l.md.gateway = md.GetString(gateway)
l.md.tcp = md.GetBool(tcp)
gw := net.ParseIP(l.md.gateway)
for _, s := range md.GetStrings(routes) {
ss := strings.SplitN(s, " ", 2)
if len(ss) == 2 {
var route ipRoute
_, ipNet, _ := net.ParseCIDR(strings.TrimSpace(ss[0]))
if ipNet == nil {
continue
}
route.Dest = *ipNet
route.Gateway = net.ParseIP(ss[1])
if route.Gateway == nil {
route.Gateway = gw
}
l.md.routes = append(l.md.routes, route)
}
}
return
}

65
pkg/listener/tun/tun_darwin.go Normal file
View File

@ -0,0 +1,65 @@
package tun
import (
"fmt"
"net"
"os/exec"
"strings"
"github.com/songgao/water"
)
func (l *tunListener) createTun() (conn net.Conn, itf *net.Interface, err error) {
ip, _, err := net.ParseCIDR(l.md.net)
if err != nil {
return
}
ifce, err := water.New(water.Config{
DeviceType: water.TUN,
})
if err != nil {
return
}
peer := l.md.peer
if peer == "" {
peer = ip.String()
}
cmd := fmt.Sprintf("ifconfig %s inet %s %s mtu %d up",
ifce.Name(), l.md.net, l.md.peer, l.md.mtu)
l.logger.Debug(cmd)
args := strings.Split(cmd, " ")
if err = exec.Command(args[0], args[1:]...).Run(); err != nil {
return
}
if err = l.addRoutes(ifce.Name(), l.md.routes...); err != nil {
return
}
itf, err = net.InterfaceByName(ifce.Name())
if err != nil {
return
}
conn = &tunConn{
ifce: ifce,
addr: &net.IPAddr{IP: ip},
}
return
}
func (l *tunListener) addRoutes(ifName string, routes ...ipRoute) error {
for _, route := range routes {
cmd := fmt.Sprintf("route add -net %s -interface %s", route.Dest.String(), ifName)
l.logger.Debug(cmd)
args := strings.Split(cmd, " ")
if err := exec.Command(args[0], args[1:]...).Run(); err != nil {
return err
}
}
return nil
}

75
pkg/listener/tun/tun_linux.go Normal file
View File

@ -0,0 +1,75 @@
package tun
import (
"errors"
"net"
"syscall"
"github.com/docker/libcontainer/netlink"
"github.com/milosgajdos/tenus"
"github.com/songgao/water"
)
func (l *tunListener) createTun() (conn net.Conn, itf *net.Interface, err error) {
ip, ipNet, err := net.ParseCIDR(l.md.net)
if err != nil {
return
}
ifce, err := water.New(water.Config{
DeviceType: water.TUN,
PlatformSpecificParams: water.PlatformSpecificParams{
Name: l.md.name,
},
})
if err != nil {
return
}
link, err := tenus.NewLinkFrom(ifce.Name())
if err != nil {
return
}
l.logger.Debugf("ip link set dev %s mtu %d", ifce.Name(), l.md.mtu)
if err = link.SetLinkMTU(l.md.mtu); err != nil {
return
}
l.logger.Debugf("ip address add %s dev %s", l.md.net, ifce.Name())
if err = link.SetLinkIp(ip, ipNet); err != nil {
return
}
l.logger.Debugf("ip link set dev %s up", ifce.Name())
if err = link.SetLinkUp(); err != nil {
return
}
if err = l.addRoutes(ifce.Name(), l.md.routes...); err != nil {
return
}
itf, err = net.InterfaceByName(ifce.Name())
if err != nil {
return
}
conn = &tunConn{
ifce: ifce,
addr: &net.IPAddr{IP: ip},
}
return
}
func (l *tunListener) addRoutes(ifName string, routes ...ipRoute) error {
for _, route := range routes {
l.logger.Debugf("ip route add %s dev %s", route.Dest.String(), ifName)
if err := netlink.AddRoute(route.Dest.String(), "", "", ifName); err != nil && !errors.Is(err, syscall.EEXIST) {
return err
}
}
return nil
}

62
pkg/listener/tun/tun_unix.go Normal file
View File

@ -0,0 +1,62 @@
//go:build !linux && !windows && !darwin
package tun
import (
"fmt"
"net"
"os/exec"
"strings"
"github.com/songgao/water"
)
func (l *tunListener) createTun() (conn net.Conn, itf *net.Interface, err error) {
ip, _, err := net.ParseCIDR(l.md.net)
if err != nil {
return
}
ifce, err := water.New(water.Config{
DeviceType: water.TUN,
})
if err != nil {
return
}
cmd := fmt.Sprintf("ifconfig %s inet %s mtu %d up",
ifce.Name(), l.md.net, l.md.mtu)
l.logger.Debug(cmd)
args := strings.Split(cmd, " ")
if er := exec.Command(args[0], args[1:]...).Run(); er != nil {
err = fmt.Errorf("%s: %v", cmd, er)
return
}
if err = l.addRoutes(ifce.Name(), l.md.routes...); err != nil {
return
}
itf, err = net.InterfaceByName(ifce.Name())
if err != nil {
return
}
conn = &tunConn{
ifce: ifce,
addr: &net.IPAddr{IP: ip},
}
return
}
func (l *tunListener) addRoutes(ifName string, routes ...ipRoute) error {
for _, route := range routes {
cmd := fmt.Sprintf("route add -net %s -interface %s", route.Dest.String(), ifName)
l.logger.Debug(cmd)
args := strings.Split(cmd, " ")
if er := exec.Command(args[0], args[1:]...).Run(); er != nil {
return fmt.Errorf("%s: %v", cmd, er)
}
}
return nil
}

85
pkg/listener/tun/tun_windows.go Normal file
View File

@ -0,0 +1,85 @@
package tun
import (
"fmt"
"net"
"os/exec"
"strings"
"github.com/songgao/water"
)
func (l *tunListener) createTun() (conn net.Conn, itf *net.Interface, err error) {
ip, ipNet, err := net.ParseCIDR(l.md.net)
if err != nil {
return
}
ifce, err := water.New(water.Config{
DeviceType: water.TUN,
PlatformSpecificParams: water.PlatformSpecificParams{
ComponentID: "tap0901",
InterfaceName: l.md.name,
Network: l.md.net,
},
})
if err != nil {
return
}
cmd := fmt.Sprintf("netsh interface ip set address name=%s "+
"source=static addr=%s mask=%s gateway=none",
ifce.Name(), ip.String(), ipMask(ipNet.Mask))
l.logger.Debug(cmd)
args := strings.Split(cmd, " ")
if er := exec.Command(args[0], args[1:]...).Run(); er != nil {
err = fmt.Errorf("%s: %v", cmd, er)
return
}
if err = l.addRoutes(ifce.Name(), l.md.gateway, l.md.routes...); err != nil {
return
}
itf, err = net.InterfaceByName(ifce.Name())
if err != nil {
return
}
conn = &tunConn{
ifce: ifce,
addr: &net.IPAddr{IP: ip},
}
return
}
func (l *tunListener) addRoutes(ifName string, gw string, routes ...ipRoute) error {
for _, route := range routes {
l.deleteRoute(ifName, route.Dest.String())
cmd := fmt.Sprintf("netsh interface ip add route prefix=%s interface=%s store=active",
route.Dest.String(), ifName)
if gw != "" {
cmd += " nexthop=" + gw
}
l.logger.Debug(cmd)
args := strings.Split(cmd, " ")
if er := exec.Command(args[0], args[1:]...).Run(); er != nil {
return fmt.Errorf("%s: %v", cmd, er)
}
}
return nil
}
func (l *tunListener) deleteRoute(ifName string, route string) error {
cmd := fmt.Sprintf("netsh interface ip delete route prefix=%s interface=%s store=active",
route, ifName)
l.logger.Debug(cmd)
args := strings.Split(cmd, " ")
return exec.Command(args[0], args[1:]...).Run()
}
func ipMask(mask net.IPMask) string {
return fmt.Sprintf("%d.%d.%d.%d", mask[0], mask[1], mask[2], mask[3])
}

14
pkg/listener/ws/metadata.go
View File

@ -2,12 +2,11 @@ package ws
import (
"crypto/tls"
"fmt"
"net/http"
"time"
tls_util "github.com/go-gost/gost/pkg/common/util/tls"
md "github.com/go-gost/gost/pkg/metadata"
mdata "github.com/go-gost/gost/pkg/metadata"
)
const (
@ -29,7 +28,7 @@ type metadata struct {
header http.Header
}
func (l *wsListener) parseMetadata(md md.Metadata) (err error) {
func (l *wsListener) parseMetadata(md mdata.Metadata) (err error) {
const (
certFile = "certFile"
keyFile = "keyFile"
@ -72,13 +71,12 @@ func (l *wsListener) parseMetadata(md md.Metadata) (err error) {
l.md.writeBufferSize = md.GetInt(writeBufferSize)
l.md.enableCompression = md.GetBool(enableCompression)
if mm, _ := md.Get(header).(map[interface{}]interface{}); len(mm) > 0 {
h := http.Header{}
if mm := mdata.GetStringMapString(md, header); len(mm) > 0 {
hd := http.Header{}
for k, v := range mm {
h.Add(fmt.Sprintf("%v", k), fmt.Sprintf("%v", v))
hd.Add(k, v)
}
l.md.header = h
l.md.header = hd
}
return
}

13
pkg/listener/ws/mux/metadata.go
View File

@ -2,12 +2,11 @@ package mux
import (
"crypto/tls"
"fmt"
"net/http"
"time"
tls_util "github.com/go-gost/gost/pkg/common/util/tls"
md "github.com/go-gost/gost/pkg/metadata"
mdata "github.com/go-gost/gost/pkg/metadata"
)
const (
@ -35,7 +34,7 @@ type metadata struct {
muxMaxStreamBuffer int
}
func (l *mwsListener) parseMetadata(md md.Metadata) (err error) {
func (l *mwsListener) parseMetadata(md mdata.Metadata) (err error) {
const (
path = "path"
backlog = "backlog"
@ -91,12 +90,12 @@ func (l *mwsListener) parseMetadata(md md.Metadata) (err error) {
l.md.muxMaxReceiveBuffer = md.GetInt(muxMaxReceiveBuffer)
l.md.muxMaxStreamBuffer = md.GetInt(muxMaxStreamBuffer)
if mm, _ := md.Get(header).(map[interface{}]interface{}); len(mm) > 0 {
h := http.Header{}
if mm := mdata.GetStringMapString(md, header); len(mm) > 0 {
hd := http.Header{}
for k, v := range mm {
h.Add(fmt.Sprintf("%v", k), fmt.Sprintf("%v", v))
hd.Add(k, v)
}
l.md.header = h
l.md.header = hd
}
return
}

39
pkg/metadata/metadata.go
View File

@ -1,6 +1,7 @@
package metadata
import (
"fmt"
"strconv"
"time"
)
@ -12,8 +13,9 @@ type Metadata interface {
GetBool(key string) bool
GetInt(key string) int
GetFloat(key string) float64
GetString(key string) string
GetDuration(key string) time.Duration
GetString(key string) string
GetStrings(key string) []string
}
type MapMetadata map[string]interface{}
@ -76,13 +78,6 @@ func (m MapMetadata) GetFloat(key string) (v float64) {
return
}
func (m MapMetadata) GetString(key string) (v string) {
if m != nil {
v, _ = m[key].(string)
}
return
}
func (m MapMetadata) GetDuration(key string) (v time.Duration) {
if m != nil {
switch vv := m[key].(type) {
@ -94,3 +89,31 @@ func (m MapMetadata) GetDuration(key string) (v time.Duration) {
}
return
}
func (m MapMetadata) GetString(key string) (v string) {
if m != nil {
v, _ = m[key].(string)
}
return
}
func (m MapMetadata) GetStrings(key string) (ss []string) {
if v, _ := m.Get(key).([]interface{}); len(v) > 0 {
for _, vv := range v {
if s, ok := vv.(string); ok {
ss = append(ss, s)
}
}
}
return
}
func GetStringMapString(md Metadata, key string) (m map[string]string) {
if mm, _ := md.Get(key).(map[interface{}]interface{}); len(mm) > 0 {
m = make(map[string]string)
for k, v := range mm {
m[fmt.Sprintf("%v", k)] = fmt.Sprintf("%v", v)
}
}
return
}