added unlinked controller; change create forwarded to createOrUpdate; added global proxy mutex

2026-04-09 12:50:26 +02:00
parent 79a991f001
commit 8b2c1d0390
8 changed files with 563 additions and 159 deletions
@@ -2,11 +2,12 @@ package rproxy

 import (
 	"context"
-	"io"
+	"fmt"
 	"math/rand"
 	"net"
 	"strconv"
 	"sync"
+	"time"

 	"helmet/app/logger"
 )
@@ -14,20 +15,27 @@ import (
 const (
 	TCP = "tcp"
 	UDP = "udp"
+
+	ForwStarted = "started"
+	ForwStopped = "stopped"
 )

 type Forwarder struct {
-	Type   string             `json:"type"   yaml:"type"`
-	listen net.Listener       `json:"-"      yaml:"-"`
-	ctx    context.Context    `json:"-"      yaml:"-"`
-	cancel context.CancelFunc `json:"-"      yaml:"-"`
-	Lport  uint32             `json:"lport"  yaml:"lport"`
-	Dport  uint32             `json:"dport"  yaml:"dport"`
-	Dests  []*Destination     `json:"dests"  yaml:"dests"`
-	log    *logger.Logger
+	State string         `json:"state"  yaml:"state"`
+	Type  string         `json:"type"   yaml:"type"`
+	Lport uint32         `json:"lport"  yaml:"lport"`
+	Dport uint32         `json:"dport"  yaml:"dport"`
+	Dests []*Destination `json:"dests"  yaml:"dests"`
+
+	listenTCP *net.TCPListener   `json:"-"      yaml:"-"`
+	listenUDP *net.UDPConn       `json:"-"      yaml:"-"`
+	ctx       context.Context    `json:"-"      yaml:"-"`
+	cancel    context.CancelFunc `json:"-"      yaml:"-"`
+	log       *logger.Logger
 }

-func NewForwarder(ctx context.Context, typ string, lport, dport uint32, addrs ...string) (*Forwarder, error) {
+func NewForwarder(ctx context.Context, proto string, lport, dport uint32, addrs ...string) (*Forwarder, error) {
+	var err error
 	ctx, cancel := context.WithCancel(context.Background())
 	forw := &Forwarder{
 		Dests:  make([]*Destination, 0),
@@ -35,33 +43,67 @@ func NewForwarder(ctx context.Context, typ string, lport, dport uint32, addrs ..
 		Dport:  dport,
 		ctx:    ctx,
 		cancel: cancel,
-		Type:   typ,
+		Type:   proto,
 	}
-	id := strconv.FormatUint(uint64(lport), 10)
+	id := forw.Type + strconv.FormatUint(uint64(lport), 10)
 	forw.log = logger.NewLogger("forwarder:" + id)
 	for _, addr := range addrs {
 		dest := NewDestination(addr)
 		forw.Dests = append(forw.Dests, dest)
 	}
-
-	portinfo := ":" + strconv.FormatUint(uint64(forw.Lport), 10)
-	laddr, err := net.ResolveTCPAddr("tcp", portinfo)
-	if err != nil {
+	switch proto {
+	case TCP:
+		portinfo := ":" + strconv.FormatUint(uint64(forw.Lport), 10)
+		laddr, err := net.ResolveTCPAddr("tcp", portinfo)
+		if err != nil {
+			return forw, err
+		}
+		listen, err := net.ListenTCP("tcp", laddr)
+		if err != nil {
+			return forw, err
+		}
+		forw.listenTCP = listen
+	case UDP:
+		portinfo := ":" + strconv.FormatUint(uint64(forw.Lport), 10)
+		laddr, err := net.ResolveUDPAddr("udp", portinfo)
+		if err != nil {
+			return forw, err
+		}
+		listen, err := net.ListenUDP("udp", laddr)
+		if err != nil {
+			return forw, err
+		}
+		forw.listenUDP = listen
+	default:
+		err = fmt.Errorf("Unknown net type: %s", proto)
 		return forw, err
 	}
-	listen, err := net.ListenTCP("tcp", laddr)
-	if err != nil {
-		return forw, err
-	}
-	forw.listen = listen
 	return forw, err
 }

+func (forw *Forwarder) Listen(wg *sync.WaitGroup) {
+	switch forw.Type {
+	case TCP:
+		if forw.listenTCP != nil {
+			forw.ListenTCP(wg)
+		}
+	case UDP:
+		if forw.listenUDP != nil {
+			forw.ListenUDP(wg)
+		}
+	}
+}
+
 func (forw *Forwarder) ListenTCP(wg *sync.WaitGroup) {
-	forw.log.Debugf("Start listening on %d", forw.Lport)
+	forw.log.Debugf("Start listening on %s:%d", forw.Type, forw.Lport)
+	forw.State = ForwStarted
 	defer wg.Done()
+	stater := func() {
+		forw.State = ForwStopped
+	}
+	defer stater()
 	for {
-		conn, err := forw.listen.Accept()
+		conn, err := forw.listenTCP.Accept()
 		if err != nil {
 			forw.log.Errorf("Listen err: %v", err)
 			return
@@ -70,8 +112,84 @@ func (forw *Forwarder) ListenTCP(wg *sync.WaitGroup) {
 	}
 }

+func (forw *Forwarder) ListenUDP(wg *sync.WaitGroup) {
+	forw.log.Debugf("Start listening on %s:%d", forw.Type, forw.Lport)
+	forw.State = ForwStarted
+	defer wg.Done()
+	stater := func() {
+		forw.State = ForwStopped
+	}
+	defer stater()
+	for {
+		buffer := make([]byte, 2048)
+		size, srcAddr, err := forw.listenUDP.ReadFromUDP(buffer)
+		if err != nil {
+			forw.log.Errorf("Error reading: %v", err)
+			continue
+		}
+		go forw.handleUDP(forw.listenUDP, srcAddr, buffer[:size])
+	}
+}
+
+func (forw *Forwarder) handleUDP(listConn *net.UDPConn, srcAddr *net.UDPAddr, data []byte) {
+	forw.log.Debugf("Handle on %d started", forw.Lport)
+	if len(forw.Dests) == 0 {
+		return
+	}
+	// Select dest address
+	addrnum := rand.Uint32() % uint32(len(forw.Dests))
+	ipaddr := forw.Dests[addrnum].Address
+	destInfo := ipaddr + ":" + strconv.FormatUint(uint64(forw.Dport), 10)
+
+	destAddr, err := net.ResolveUDPAddr("udp", destInfo)
+	if err != nil {
+		forw.log.Debugf("Error resolving server address: %v", err)
+		return
+	}
+	// Write to destination
+	destConn, err := net.DialUDP("udp", nil, destAddr)
+	if err != nil {
+		forw.log.Debugf("Error dialing: %v", err)
+		return
+	}
+	defer destConn.Close()
+	_, err = destConn.Write(data)
+	if err != nil {
+		forw.log.Debugf("Error sending message: %v", err)
+		return
+	}
+	const deadlinePeriod = 5 * time.Second
+	destConn.SetReadDeadline(time.Now().Add(deadlinePeriod))
+	// Read from destination and resend to initiator
+	const readCount = 1
+	for i := 0; i < readCount; i++ {
+		buffer := make([]byte, 1024*2)
+		size, _, err := destConn.ReadFromUDP(buffer)
+		if err != nil {
+			forw.log.Debugf("Error reading response: %v", err)
+			return
+		}
+		_, err = listConn.WriteToUDP(buffer[:size], srcAddr)
+		if err != nil {
+			forw.log.Errorf("Error writing to back: %v", err)
+			return
+		}
+	}
+}
+
 func (forw *Forwarder) Stop() error {
-	return forw.listen.Close()
+	var err error
+	switch forw.Type {
+	case TCP:
+		if forw.listenTCP != nil {
+			return forw.listenTCP.Close()
+		}
+	case UDP:
+		if forw.listenUDP != nil {
+			return forw.listenUDP.Close()
+		}
+	}
+	return err
 }

 func (forw *Forwarder) handleTCP(ctx context.Context, inconn net.Conn) {
@@ -80,23 +198,10 @@ func (forw *Forwarder) handleTCP(ctx context.Context, inconn net.Conn) {
 	if len(forw.Dests) == 0 {
 		return
 	}
+	// Select dest address
 	addrnum := rand.Uint32() % uint32(len(forw.Dests))
 	ipaddr := forw.Dests[addrnum].Address

-	/*
-		dstaddr := ipaddr + ":" + strconv.FormatUint(uint64(forw.Dport), 10)
-		outconn, err := net.Dial("tcp", dstaddr)
-		if err != nil {
-			return
-		}
-		defer outconn.Close()
-		var wg sync.WaitGroup
-		wg.Add(1)
-		go forw.stream(&wg, inconn, outconn)
-		wg.Add(1)
-		go forw.stream(&wg, outconn, inconn)
-		wg.Wait()
-	*/
 	str := NewStreamer(forw.ctx)
 	err := str.Stream(inconn, ipaddr, forw.Dport)
 	if err != nil {
@@ -105,55 +210,6 @@ func (forw *Forwarder) handleTCP(ctx context.Context, inconn net.Conn) {
 	forw.log.Debugf("Handler on %d stopped", forw.Lport)
 }

-func (forw *Forwarder) stream(wg *sync.WaitGroup, inconn io.Reader, outconn io.Writer) {
-	defer wg.Done()
-	_, err := iocopy(forw.ctx, outconn, inconn)
-	if err != nil {
-		forw.log.Errorf("Copy err: %v", err)
-	}
-}
-
-type Streamer struct {
-	ctx    context.Context
-	cancel context.CancelFunc
-	log    *logger.Logger
-}
-
-func NewStreamer(ctx context.Context) *Streamer {
-	ctx, cancel := context.WithCancel(ctx)
-	log := logger.NewLogger("streamer")
-	return &Streamer{
-		ctx:    ctx,
-		cancel: cancel,
-		log:    log,
-	}
-}
-
-func (str *Streamer) Stream(inconn net.Conn, dipaddr string, dport uint32) error {
-	var err error
-	dstaddr := dipaddr + ":" + strconv.FormatUint(uint64(dport), 10)
-	outconn, err := net.Dial("tcp", dstaddr)
-	if err != nil {
-		return err
-	}
-	defer outconn.Close()
-	var wg sync.WaitGroup
-	wg.Add(1)
-	go str.stream(&wg, inconn, outconn)
-	wg.Add(1)
-	go str.stream(&wg, outconn, inconn)
-	wg.Wait()
-	return err
-}
-
-func (str *Streamer) stream(wg *sync.WaitGroup, inconn io.Reader, outconn io.Writer) {
-	defer wg.Done()
-	_, err := iocopy(str.ctx, outconn, inconn)
-	if err != nil {
-		str.log.Errorf("Copy err: %v", err)
-	}
-}
-
 type Destination struct {
 	Address string `json:"address"  yaml:"address"`
 }
@@ -4,7 +4,6 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"io"
 	"strings"
 	"sync"

@@ -13,10 +12,11 @@ import (

 type Proxy struct {
 	Forwarders []*Forwarder       `json:"forwarders"  yaml:"forwarders"`
-	ctx        context.Context    `jsreturn errors.New("Zero dport")on:"-"           yaml:"-"`
+	ctx        context.Context    `json:"-"           yaml:"-"`
 	cancel     context.CancelFunc `json:"-"           yaml:"-"`
 	wg         sync.WaitGroup     `json:"-"           yaml:"-"`
 	log        *logger.Logger     `json:"-"           yaml:"-"`
+	mtx        sync.Mutex         `json:"-"           yaml:"-"`
 }

 func NewProxy() *Proxy {
@@ -29,106 +29,118 @@ func NewProxy() *Proxy {
 	}
 }

-func (bal *Proxy) AddForwarder(ctx context.Context, typ string, lport, dport uint32, addrs ...string) error {
+func (prox *Proxy) ListForwarders(ctx context.Context) []*Forwarder {
+	prox.mtx.Lock()
+	defer prox.mtx.Unlock()
+	forwards := make([]*Forwarder, 0)
+	for _, forw := range prox.Forwarders {
+		dests := make([]string, 0)
+		for _, dest := range forw.Dests {
+			dests = append(dests, dest.Address)
+		}
+		newForw, _ := NewForwarder(ctx, forw.Type, forw.Lport, forw.Dport, dests...)
+		forwards = append(forwards, newForw)
+	}
+	return forwards
+}
+
+func (prox *Proxy) CreateOrUpdateForwarder(ctx context.Context, proto string, lport, dport uint32, addrs ...string) error {
 	var err error
 	if lport == 0 {
-		return errors.New("Zero lport")
+		return errors.New("Zero forwarder lport")
 	}
 	if dport == 0 {
-		return errors.New("Zero dport")
+		return errors.New("Zero forwarder dport")
 	}
-	if typ == "" {
-		return errors.New("Empty type")
+	if proto == "" {
+		return errors.New("Empty forwarder type")
 	}
-	typ = strings.ToLower(typ)
-	if typ != TCP {
-		return fmt.Errorf("Unknown type %s", typ)
+	proto = strings.ToLower(proto)
+	if proto != TCP && proto != UDP {
+		return fmt.Errorf("Unknown forwarder protocol %s", proto)
 	}
-	forw, err := NewForwarder(ctx, typ, lport, dport, addrs...)
-	if err != nil {
-		return err
+	prox.mtx.Lock()
+	defer prox.mtx.Unlock()
+
+	var forw *Forwarder
+	for _, iforw := range prox.Forwarders {
+		if iforw.Lport == lport && iforw.Type == proto {
+			forw = iforw
+			break
+		}
+	}
+	switch {
+	case forw == nil:
+		prox.log.Debugf("Create rorwarder %s:%d", proto, lport)
+		forw, err = NewForwarder(ctx, proto, lport, dport, addrs...)
+		if err != nil {
+			return err
+		}
+		prox.Forwarders = append(prox.Forwarders, forw)
+		prox.wg.Add(1)
+		go forw.Listen(&prox.wg)
+	default:
+		prox.log.Debugf("Update forwarder %s:%d", proto, lport)
+		forw.Dport = dport
+		dests := make([]*Destination, 0)
+		for _, addr := range addrs {
+			dest := NewDestination(addr)
+			forw.Dests = append(dests, dest)
+		}
+		forw.Dests = dests
 	}
-	bal.Forwarders = append(bal.Forwarders, forw)
-	bal.wg.Add(1)
-	go forw.ListenTCP(&bal.wg)
 	return err
 }

-func (bal *Proxy) DeleteForwarder(ctx context.Context, lport uint32) error {
+func (prox *Proxy) DeleteForwarder(ctx context.Context, proto string, lport uint32) error {
 	var err error
 	var forw *Forwarder
-	for _, iforw := range bal.Forwarders {
-		if iforw.Lport == lport {
+	prox.mtx.Lock()
+	defer prox.mtx.Unlock()
+	for _, iforw := range prox.Forwarders {
+		if iforw.Lport == lport && iforw.Type == proto {
 			forw = iforw
 			break
 		}
 	}
 	if forw == nil {
-		bal.log.Debugf("Forwarder for lport %d not found", lport)
+		prox.log.Debugf("Forwarder for %s:%d not found", proto, lport)
 		return err
 	}
-	bal.log.Debugf("Stop forwarder for lport %d", lport)
+	prox.log.Debugf("Stop forwarder for %s:%d", proto, lport)
 	err = forw.Stop()
 	if err != nil {
 		return err
 	}
 	forwarders := make([]*Forwarder, 0)
-	for _, forw := range bal.Forwarders {
-		if forw.Lport == lport {
+	for _, forw := range prox.Forwarders {
+		if forw.Lport == lport && forw.Type == proto {
 			continue
 		}
 		forwarders = append(forwarders, forw)
 	}
-	bal.Forwarders = forwarders
+	prox.Forwarders = forwarders
 	return err
 }

-func (bal *Proxy) Start() error {
+func (prox *Proxy) Start() error {
 	var err error
-	for _, forw := range bal.Forwarders {
-		bal.wg.Add(1)
-		go forw.ListenTCP(&bal.wg)
+	prox.mtx.Lock()
+	defer prox.mtx.Unlock()
+	for _, forw := range prox.Forwarders {
+		prox.wg.Add(1)
+		go forw.Listen(&prox.wg)
 	}
-	bal.wg.Wait()
+	prox.wg.Wait()
 	return err
 }

-func (bal *Proxy) Stop() error {
+func (prox *Proxy) Stop() error {
 	var err error
-	for _, forw := range bal.Forwarders {
+	prox.mtx.Lock()
+	defer prox.mtx.Unlock()
+	for _, forw := range prox.Forwarders {
 		forw.Stop()
 	}
 	return err
 }
-
-func iocopy(ctx context.Context, writer io.Writer, reader io.Reader) (int64, error) {
-	var err error
-	var size int64
-	var halt bool
-	buffer := make([]byte, 1024*4)
-	for {
-		select {
-		case <-ctx.Done():
-			err = errors.New("Break copy by context")
-			break
-		default:
-		}
-		rsize, err := reader.Read(buffer)
-		if err == io.EOF {
-			err = nil
-			halt = true
-		}
-		if err != nil {
-			return size, err
-		}
-		wsize, err := writer.Write(buffer[0:rsize])
-		size += int64(wsize)
-		if err != nil {
-			return size, err
-		}
-		if halt {
-			break
-		}
-	}
-	return size, err
-}
@@ -0,0 +1,85 @@
+package rproxy
+
+import (
+	"context"
+	"errors"
+	"io"
+	"net"
+	"strconv"
+	"sync"
+
+	"helmet/app/logger"
+)
+
+type Streamer struct {
+	ctx    context.Context
+	cancel context.CancelFunc
+	log    *logger.Logger
+}
+
+func NewStreamer(ctx context.Context) *Streamer {
+	ctx, cancel := context.WithCancel(ctx)
+	log := logger.NewLogger("streamer")
+	return &Streamer{
+		ctx:    ctx,
+		cancel: cancel,
+		log:    log,
+	}
+}
+
+func (str *Streamer) Stream(inconn net.Conn, dipaddr string, dport uint32) error {
+	var err error
+	dstaddr := dipaddr + ":" + strconv.FormatUint(uint64(dport), 10)
+	outconn, err := net.Dial("tcp", dstaddr)
+	if err != nil {
+		return err
+	}
+	defer outconn.Close()
+	var wg sync.WaitGroup
+	wg.Add(1)
+	go str.stream(&wg, inconn, outconn)
+	wg.Add(1)
+	go str.stream(&wg, outconn, inconn)
+	wg.Wait()
+	return err
+}
+
+func (str *Streamer) stream(wg *sync.WaitGroup, inconn io.Reader, outconn io.Writer) {
+	defer wg.Done()
+	_, err := iocopy(str.ctx, outconn, inconn)
+	if err != nil {
+		str.log.Errorf("Copy err: %v", err)
+	}
+}
+
+func iocopy(ctx context.Context, writer io.Writer, reader io.Reader) (int64, error) {
+	var err error
+	var size int64
+	var halt bool
+	buffer := make([]byte, 1024*4)
+	for {
+		select {
+		case <-ctx.Done():
+			err = errors.New("Break copy by context")
+			break
+		default:
+		}
+		rsize, err := reader.Read(buffer)
+		if err == io.EOF {
+			err = nil
+			halt = true
+		}
+		if err != nil {
+			return size, err
+		}
+		wsize, err := writer.Write(buffer[0:rsize])
+		size += int64(wsize)
+		if err != nil {
+			return size, err
+		}
+		if halt {
+			break
+		}
+	}
+	return size, err
+}