mirror of
https://github.com/yggdrasil-network/yggdrasil-go.git
synced 2025-04-29 14:45:07 +03:00
Fix socks server and TCP service mapping
Signed-off-by: Vasyl Gello <vasek.gello@gmail.com>
This commit is contained in:
Vasyl Gello
parent
ac701dd9a3
commit
8177486dc8
8 changed files with 97 additions and 120 deletions
|
|
@ -1,12 +1,10 @@
|
|||
package main
|
||||
|
||||
import (
|
||||
"crypto/ed25519"
|
||||
"encoding/hex"
|
||||
"context"
|
||||
"encoding/json"
|
||||
"flag"
|
||||
"fmt"
|
||||
"net"
|
||||
"os"
|
||||
"os/signal"
|
||||
"syscall"
|
||||
|
|
@ -14,13 +12,10 @@ import (
|
|||
"github.com/gologme/log"
|
||||
gsyslog "github.com/hashicorp/go-syslog"
|
||||
"github.com/hjson/hjson-go"
|
||||
"github.com/things-go/go-socks5"
|
||||
|
||||
"github.com/yggdrasil-network/yggdrasil-go/cmd/yggstack/types"
|
||||
"github.com/yggdrasil-network/yggdrasil-go/contrib/netstack"
|
||||
"github.com/yggdrasil-network/yggdrasil-go/src/address"
|
||||
"github.com/yggdrasil-network/yggdrasil-go/src/config"
|
||||
"github.com/yggdrasil-network/yggdrasil-go/src/setup"
|
||||
"github.com/yggdrasil-network/yggdrasil-go/src/types"
|
||||
|
||||
"github.com/yggdrasil-network/yggdrasil-go/src/version"
|
||||
|
||||
|
|
@ -33,8 +28,12 @@ func main() {
|
|||
socks := flag.String("socks", "", "address to listen on for SOCKS, i.e. :1080")
|
||||
nameserver := flag.String("nameserver", "", "the Yggdrasil IPv6 address to use as a DNS server for SOCKS")
|
||||
flag.Var(&expose, "exposetcp", "TCP ports to expose to the network, e.g. 22, 2022:22, 22:192.168.1.1:2022")
|
||||
|
||||
args := setup.ParseArguments()
|
||||
|
||||
// Catch interrupts from the operating system to exit gracefully.
|
||||
ctx, _ := signal.NotifyContext(context.Background(), os.Interrupt, syscall.SIGTERM)
|
||||
|
||||
// Create a new logger that logs output to stdout.
|
||||
var logger *log.Logger
|
||||
switch args.LogTo {
|
||||
|
|
@ -104,95 +103,21 @@ func main() {
|
|||
n := setup.NewNode(cfg, logger)
|
||||
n.SetLogLevel(args.LogLevel)
|
||||
|
||||
// Have we been asked for the node address yet? If so, print it and then stop.
|
||||
getNodeKey := func() ed25519.PublicKey {
|
||||
if pubkey, err := hex.DecodeString(cfg.PrivateKey); err == nil {
|
||||
return ed25519.PrivateKey(pubkey).Public().(ed25519.PublicKey)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
switch {
|
||||
case args.GetAddr:
|
||||
if key := getNodeKey(); key != nil {
|
||||
addr := address.AddrForKey(key)
|
||||
ip := net.IP(addr[:])
|
||||
fmt.Println(ip.String())
|
||||
}
|
||||
return
|
||||
case args.GetSubnet:
|
||||
if key := getNodeKey(); key != nil {
|
||||
snet := address.SubnetForKey(key)
|
||||
ipnet := net.IPNet{
|
||||
IP: append(snet[:], 0, 0, 0, 0, 0, 0, 0, 0),
|
||||
Mask: net.CIDRMask(len(snet)*8, 128),
|
||||
}
|
||||
fmt.Println(ipnet.String())
|
||||
}
|
||||
return
|
||||
default:
|
||||
}
|
||||
|
||||
// Now start Yggdrasil - this starts the DHT, router, switch and other core
|
||||
// Now start Yggdrasil - this starts the router, switch and other core
|
||||
// components needed for Yggdrasil to operate
|
||||
if err = n.Run(args); err != nil {
|
||||
logger.Fatalln(err)
|
||||
}
|
||||
|
||||
// Make some nice output that tells us what our IPv6 address and subnet are.
|
||||
// This is just logged to stdout for the user.
|
||||
address := n.Address()
|
||||
subnet := n.Subnet()
|
||||
public := n.GetSelf().Key
|
||||
publicstr := hex.EncodeToString(public[:])
|
||||
logger.Infof("Your public key is %s", publicstr)
|
||||
logger.Infof("Your IPv6 address is %s", address.String())
|
||||
logger.Infof("Your IPv6 subnet is %s", subnet.String())
|
||||
logger.Infof("Your Yggstack resolver name is %s%s", publicstr, types.NameMappingSuffix)
|
||||
|
||||
s, err := netstack.CreateYggdrasilNetstack(&n.Core)
|
||||
// Create Yggdrasil netstack
|
||||
err = n.SetupNetstack(socks, nameserver, &expose)
|
||||
if err != nil {
|
||||
logger.Fatalln(err)
|
||||
}
|
||||
|
||||
if *socks != "" {
|
||||
resolver := types.NewNameResolver(s, *nameserver)
|
||||
server := socks5.NewServer(
|
||||
socks5.WithDial(s.DialContext),
|
||||
socks5.WithResolver(resolver),
|
||||
)
|
||||
go server.ListenAndServe("tcp", *socks) // nolint:errcheck
|
||||
}
|
||||
|
||||
for _, mapping := range expose {
|
||||
go func(mapping types.TCPMapping) {
|
||||
listener, err := s.ListenTCP(mapping.Listen)
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
logger.Infof("Mapping Yggdrasil port %d to %s", mapping.Listen.Port, mapping.Mapped)
|
||||
for {
|
||||
c, err := listener.Accept()
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
r, err := net.DialTCP("tcp", nil, mapping.Mapped)
|
||||
if err != nil {
|
||||
logger.Errorf("Failed to connect to %s: %s", mapping.Mapped, err)
|
||||
_ = c.Close()
|
||||
continue
|
||||
}
|
||||
types.ProxyTCP(n.MTU(), c, r)
|
||||
}
|
||||
}(mapping)
|
||||
}
|
||||
|
||||
term := make(chan os.Signal, 1)
|
||||
signal.Notify(term, os.Interrupt, syscall.SIGTERM)
|
||||
|
||||
select {
|
||||
case <-n.Done():
|
||||
case <-term:
|
||||
}
|
||||
// Block until we are told to shut down.
|
||||
<-ctx.Done()
|
||||
|
||||
// Shut down the node.
|
||||
n.Close()
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,68 +0,0 @@
|
|||
package types
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"net"
|
||||
"strconv"
|
||||
"strings"
|
||||
)
|
||||
|
||||
type TCPMapping struct {
|
||||
Listen *net.TCPAddr
|
||||
Mapped *net.TCPAddr
|
||||
}
|
||||
|
||||
type TCPMappings []TCPMapping
|
||||
|
||||
func (m *TCPMappings) String() string {
|
||||
return ""
|
||||
}
|
||||
|
||||
func (m *TCPMappings) Set(value string) error {
|
||||
tokens := strings.Split(value, ":")
|
||||
if len(tokens) > 2 {
|
||||
tokens = strings.SplitN(value, ":", 2)
|
||||
host, port, err := net.SplitHostPort(tokens[1])
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to split host and port: %w", err)
|
||||
}
|
||||
tokens = append(tokens[:1], host, port)
|
||||
}
|
||||
listenport, err := strconv.Atoi(tokens[0])
|
||||
if err != nil {
|
||||
return fmt.Errorf("listen port is invalid: %w", err)
|
||||
}
|
||||
if listenport == 0 {
|
||||
return fmt.Errorf("listen port must not be zero")
|
||||
}
|
||||
mapping := TCPMapping{
|
||||
Listen: &net.TCPAddr{
|
||||
Port: listenport,
|
||||
},
|
||||
Mapped: &net.TCPAddr{
|
||||
IP: net.IPv6loopback,
|
||||
Port: listenport,
|
||||
},
|
||||
}
|
||||
tokens = tokens[1:]
|
||||
if len(tokens) > 0 {
|
||||
mappedaddr := net.ParseIP(tokens[0])
|
||||
if mappedaddr == nil {
|
||||
return fmt.Errorf("invalid mapped address %q", tokens[0])
|
||||
}
|
||||
mapping.Mapped.IP = mappedaddr
|
||||
tokens = tokens[1:]
|
||||
}
|
||||
if len(tokens) > 0 {
|
||||
mappedport, err := strconv.Atoi(tokens[0])
|
||||
if err != nil {
|
||||
return fmt.Errorf("mapped port is invalid: %w", err)
|
||||
}
|
||||
if mappedport == 0 {
|
||||
return fmt.Errorf("mapped port must not be zero")
|
||||
}
|
||||
mapping.Mapped.Port = mappedport
|
||||
}
|
||||
*m = append(*m, mapping)
|
||||
return nil
|
||||
}
|
||||
|
|
@ -1,28 +0,0 @@
|
|||
package types
|
||||
|
||||
import "testing"
|
||||
|
||||
func TestEndpointMappings(t *testing.T) {
|
||||
var mappings TCPMappings
|
||||
if err := mappings.Set("1234"); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := mappings.Set("1234:192.168.1.1"); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := mappings.Set("1234:192.168.1.1:4321"); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := mappings.Set("1234:[2000::1]:4321"); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := mappings.Set("a"); err == nil {
|
||||
t.Fatal("'a' should be an invalid exposed port")
|
||||
}
|
||||
if err := mappings.Set("1234:localhost"); err == nil {
|
||||
t.Fatal("mapped address must be an IP literal")
|
||||
}
|
||||
if err := mappings.Set("1234:localhost:a"); err == nil {
|
||||
t.Fatal("'a' should be an invalid mapped port")
|
||||
}
|
||||
}
|
||||
|
|
@ -1,64 +0,0 @@
|
|||
package types
|
||||
|
||||
import (
|
||||
"context"
|
||||
"crypto/ed25519"
|
||||
"encoding/hex"
|
||||
"fmt"
|
||||
"net"
|
||||
"strings"
|
||||
|
||||
"github.com/yggdrasil-network/yggdrasil-go/contrib/netstack"
|
||||
"github.com/yggdrasil-network/yggdrasil-go/src/address"
|
||||
)
|
||||
|
||||
const NameMappingSuffix = ".pk.ygg"
|
||||
|
||||
type NameResolver struct {
|
||||
resolver *net.Resolver
|
||||
}
|
||||
|
||||
func NewNameResolver(stack *netstack.YggdrasilNetstack, nameserver string) *NameResolver {
|
||||
res := &NameResolver{
|
||||
resolver: &net.Resolver{
|
||||
PreferGo: true,
|
||||
},
|
||||
}
|
||||
if nameserver != "" {
|
||||
res.resolver.Dial = func(ctx context.Context, network, address string) (net.Conn, error) { // nolint:staticcheck
|
||||
address = fmt.Sprintf("[%s]:53", nameserver) // nolint:staticcheck
|
||||
if nameserver == "" {
|
||||
return nil, fmt.Errorf("no nameserver configured")
|
||||
}
|
||||
return stack.DialContext(ctx, network, address)
|
||||
}
|
||||
}
|
||||
return res
|
||||
}
|
||||
|
||||
func (r *NameResolver) Resolve(ctx context.Context, name string) (context.Context, net.IP, error) {
|
||||
if strings.HasSuffix(name, NameMappingSuffix) {
|
||||
name = strings.TrimSuffix(name, NameMappingSuffix)
|
||||
var pk [ed25519.PublicKeySize]byte
|
||||
if b, err := hex.DecodeString(name); err != nil {
|
||||
return nil, nil, fmt.Errorf("hex.DecodeString: %w", err)
|
||||
} else {
|
||||
copy(pk[:], b)
|
||||
return ctx, net.IP(address.AddrForKey(pk[:])[:]), nil
|
||||
}
|
||||
}
|
||||
ip := net.ParseIP(name)
|
||||
if ip == nil {
|
||||
addrs, err := r.resolver.LookupIP(ctx, "ip6", name)
|
||||
if err != nil {
|
||||
fmt.Println("failed to lookup", name, "due to error:", err)
|
||||
return nil, nil, fmt.Errorf("failed to lookup %q: %s", name, err)
|
||||
}
|
||||
if len(addrs) == 0 {
|
||||
fmt.Println("failed to lookup", name, "due to no addresses")
|
||||
return nil, nil, fmt.Errorf("no addresses for %q", name)
|
||||
}
|
||||
return ctx, addrs[0], nil
|
||||
}
|
||||
return ctx, ip, nil
|
||||
}
|
||||
|
|
@ -1,43 +0,0 @@
|
|||
package types
|
||||
|
||||
import "net"
|
||||
|
||||
func connToChan(mtu uint64, conn net.Conn) chan []byte {
|
||||
c := make(chan []byte)
|
||||
go func() {
|
||||
for {
|
||||
b := make([]byte, mtu)
|
||||
n, err := conn.Read(b[:])
|
||||
if err != nil {
|
||||
c <- nil
|
||||
return
|
||||
}
|
||||
if n > 0 {
|
||||
c <- b[:n]
|
||||
}
|
||||
}
|
||||
}()
|
||||
return c
|
||||
}
|
||||
|
||||
func ProxyTCP(mtu uint64, c1, c2 net.Conn) {
|
||||
p1, p2 := connToChan(mtu, c1), connToChan(mtu, c2)
|
||||
defer c1.Close()
|
||||
defer c2.Close()
|
||||
for {
|
||||
select {
|
||||
case b := <-p1:
|
||||
if b == nil {
|
||||
return
|
||||
} else if _, err := c2.Write(b); err != nil {
|
||||
return
|
||||
}
|
||||
case b := <-p2:
|
||||
if b == nil {
|
||||
return
|
||||
} else if _, err := c1.Write(b); err != nil {
|
||||
return
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue