chore: better source tracking

client/client.go

@@ -41,5 +41,5 @@ func NewTunnel(cfg *config.ClientConfig) (*tunnel.Tunnel, error) {
 		return nil, fmt.Errorf("failed to connect: %v", err)
 	}
 
-	return tunnel.NewClientTunnel(cfg.TunnelName, cfg.TunnelTarget, serverConn)
+	return tunnel.NewClientTunnel(cfg.TunnelName, cfg.TunnelTarget, serverURL, serverConn)
 }

pkg/maps/map.go

@@ -0,0 +1,51 @@
+package maps
+
+import (
+	"iter"
+	"sync"
+)
+
+type Map[K comparable, V any] struct {
+	items map[K]V
+	mu    sync.RWMutex
+}
+
+func New[K comparable, V any]() *Map[K, V] {
+	return &Map[K, V]{items: make(map[K]V)}
+}
+
+func (m *Map[K, V]) Get(key K) (V, bool) {
+	m.mu.RLock()
+	defer m.mu.RUnlock()
+	v, ok := m.items[key]
+	return v, ok
+}
+
+func (m *Map[K, V]) Set(key K, value V) {
+	m.mu.Lock()
+	defer m.mu.Unlock()
+	m.items[key] = value
+}
+
+func (m *Map[K, V]) Delete(key K) {
+	m.mu.Lock()
+	defer m.mu.Unlock()
+	delete(m.items, key)
+}
+
+func (m *Map[K, V]) HasKey(key K) bool {
+	m.mu.RLock()
+	defer m.mu.RUnlock()
+	_, ok := m.items[key]
+	return ok
+}
+
+func (m *Map[K, V]) Entries() iter.Seq2[K, V] {
+	return func(yield func(K, V) bool) {
+		for k, v := range m.items {
+			if !yield(k, v) {
+				return
+			}
+		}
+	}
+}

server/server.go

@@ -11,12 +11,12 @@ import (
 	"net/http"
 	"net/url"
 	"strings"
-	"sync"
 	"time"
 
 	"github.com/gorilla/websocket"
 	log "github.com/sirupsen/logrus"
 	"reichard.io/conduit/config"
+	"reichard.io/conduit/pkg/maps"
 	"reichard.io/conduit/tunnel"
 )
 
@@ -33,10 +33,9 @@ type TunnelInfo struct {
 type Server struct {
 	host string
 	cfg  *config.ServerConfig
-	mu   sync.RWMutex
 
 	upgrader websocket.Upgrader
-	tunnels  map[string]*tunnel.Tunnel
+	tunnels  *maps.Map[string, *tunnel.Tunnel]
 }
 
 func NewServer(cfg *config.ServerConfig) (*Server, error) {
@@ -50,7 +49,7 @@ func NewServer(cfg *config.ServerConfig) (*Server, error) {
 	return &Server{
 		cfg:     cfg,
 		host:    serverURL.Host,
-		tunnels: make(map[string]*tunnel.Tunnel),
+		tunnels: maps.New[string, *tunnel.Tunnel](),
 		upgrader: websocket.Upgrader{
 			CheckOrigin: func(r *http.Request) bool {
 				return true
@@ -84,14 +83,12 @@ func (s *Server) Start() error {
 func (s *Server) getInfo(w http.ResponseWriter, _ *http.Request) {
 	// Get Tunnels
 	var allTunnels []TunnelInfo
-	s.mu.RLock()
+	for t, c := range s.tunnels.Entries() {
-	for t, c := range s.tunnels {
 		allTunnels = append(allTunnels, TunnelInfo{
 			Name:   t,
 			Target: c.Source(),
 		})
 	}
-	s.mu.RUnlock()
 
 	// Create Response
 	d, err := json.MarshalIndent(InfoResponse{
@@ -138,26 +135,31 @@ func (s *Server) handleRawConnection(conn net.Conn) {
 	}
 
 	// Extract Subdomain
-	subdomain := strings.TrimSuffix(strings.Replace(r.Host, s.host, "", 1), ".")
+	tunnelName := strings.TrimSuffix(strings.Replace(r.Host, s.host, "", 1), ".")
-	if strings.Count(subdomain, ".") != 0 {
+	if strings.Count(tunnelName, ".") != 0 {
 		w.WriteHeader(http.StatusBadRequest)
 		_, _ = fmt.Fprintf(w, "cannot tunnel nested subdomains: %s", r.Host)
 		return
 	}
 
+	// Get True Host
+	remoteHost := conn.RemoteAddr().String()
+	if xff := r.Header.Get("X-Forwarded-For"); xff != "" {
+		remoteHost = xff
+	}
+	r.RemoteAddr = remoteHost
+
 	// Handle Control Endpoints
-	if subdomain == "" {
+	if tunnelName == "" {
 		s.handleAsHTTP(w, r)
 		return
 	}
 
 	// Handle Tunnels
-	s.mu.RLock()
+	conduitTunnel, exists := s.tunnels.Get(tunnelName)
-	conduitTunnel, exists := s.tunnels[subdomain]
-	s.mu.RUnlock()
 	if !exists {
 		w.WriteHeader(http.StatusNotFound)
-		_, _ = fmt.Fprintf(w, "unknown tunnel: %s", subdomain)
+		_, _ = fmt.Fprintf(w, "unknown tunnel: %s", tunnelName)
 		return
 	}
 
@@ -170,8 +172,8 @@ func (s *Server) handleRawConnection(conn net.Conn) {
 		return
 	}
 
-	log.Infof("relaying %s to tunnel", subdomain)
+	log.Infof("tunnel %q connection from %s", tunnelName, r.RemoteAddr)
-	_ = conduitTunnel.StartStream(streamID)
+	_ = conduitTunnel.StartStream(streamID, r.RemoteAddr)
 }
 
 func (s *Server) handleAsHTTP(w http.ResponseWriter, r *http.Request) {
@@ -204,7 +206,7 @@ func (s *Server) createTunnel(w http.ResponseWriter, r *http.Request) {
 	}
 
 	// Validate Unique
-	if _, exists := s.tunnels[tunnelName]; exists {
+	if _, exists := s.tunnels.Get(tunnelName); exists {
 		w.WriteHeader(http.StatusConflict)
 		_, _ = w.Write([]byte("Tunnel already registered"))
 		return
@@ -219,18 +221,14 @@ func (s *Server) createTunnel(w http.ResponseWriter, r *http.Request) {
 
 	// Create Tunnel
 	conduitTunnel := tunnel.NewServerTunnel(tunnelName, wsConn)
-	s.mu.Lock()
+	s.tunnels.Set(tunnelName, conduitTunnel)
-	s.tunnels[tunnelName] = conduitTunnel
+	log.Infof("tunnel %q created from %s", tunnelName, r.RemoteAddr)
-	s.mu.Unlock()
-	log.Infof("tunnel established: %s", tunnelName)
 
 	// Start Tunnel - This is blocking
 	conduitTunnel.Start()
 
 	// Cleanup Tunnel
-	s.mu.Lock()
+	s.tunnels.Delete(tunnelName)
-	delete(s.tunnels, tunnelName)
-	s.mu.Unlock()
 	_ = wsConn.Close()
-	log.Infof("tunnel closed: %s", tunnelName)
+	log.Infof("tunnel %q closed from %s", tunnelName, r.RemoteAddr)
 }

tunnel/tunnel.go

@@ -9,6 +9,7 @@ import (
 
 	"github.com/gorilla/websocket"
 	log "github.com/sirupsen/logrus"
+	"reichard.io/conduit/pkg/maps"
 	"reichard.io/conduit/types"
 )
 
@@ -17,27 +18,33 @@ type ConnBuilder func() (conn io.ReadWriteCloser, err error)
 func NewServerTunnel(name string, wsConn *websocket.Conn) *Tunnel {
 	return &Tunnel{
 		name:    name,
+		streams: maps.New[string, io.ReadWriteCloser](),
 		wsConn:  wsConn,
-		streams: make(map[string]io.ReadWriteCloser),
 	}
 }
 
-func NewClientTunnel(name, target string, wsConn *websocket.Conn) (*Tunnel, error) {
+func NewClientTunnel(name, target string, serverURL *url.URL, wsConn *websocket.Conn) (*Tunnel, error) {
+	// Get Target URL
 	targetURL, err := url.Parse(target)
 	if err != nil {
 		return nil, err
 	}
 
+	// Derive Conduit URL
+	conduitURL := *serverURL
+	conduitURL.Host = name + "." + conduitURL.Host
+
+	// Get Connection Builder
 	var connBuilder ConnBuilder
 	switch targetURL.Scheme {
 	case "http", "https":
-		log.Infof("creating HTTP tunnel: %s -> %s", name, target)
+		log.Infof("creating HTTP tunnel: %s -> %s", conduitURL.String(), target)
 		connBuilder, err = HTTPConnectionBuilder(targetURL)
 		if err != nil {
 			return nil, err
 		}
 	default:
-		log.Infof("creating TCP tunnel: %s -> %s", name, target)
+		log.Infof("creating TCP tunnel: %s -> %s", conduitURL.String(), target)
 		connBuilder = func() (conn io.ReadWriteCloser, err error) {
 			return net.Dial("tcp", target)
 		}
@@ -46,7 +53,7 @@ func NewClientTunnel(name, target string, wsConn *websocket.Conn) (*Tunnel, erro
 	return &Tunnel{
 		name:        name,
 		wsConn:      wsConn,
-		streams:     make(map[string]io.ReadWriteCloser),
+		streams:     maps.New[string, io.ReadWriteCloser](),
 		connBuilder: connBuilder,
 	}, nil
 }
@@ -54,10 +61,10 @@ func NewClientTunnel(name, target string, wsConn *websocket.Conn) (*Tunnel, erro
 type Tunnel struct {
 	name        string
 	wsConn      *websocket.Conn
-	streams     map[string]io.ReadWriteCloser
+	streams     *maps.Map[string, io.ReadWriteCloser]
 	connBuilder ConnBuilder
 
-	wsMu, streamsMu sync.Mutex
+	mu sync.Mutex
 }
 
 func (t *Tunnel) Start() {
@@ -95,7 +102,7 @@ func (t *Tunnel) initStreamConnection(streamID string) error {
 		return nil
 	}
 
-	if _, found := t.getStream(streamID); found {
+	if _, found := t.streams.Get(streamID); found {
 		return nil
 	}
 
@@ -108,24 +115,21 @@ func (t *Tunnel) initStreamConnection(streamID string) error {
 		return err
 	}
 
-	go t.StartStream(streamID)
+	go t.StartStream(streamID, "")
 	return nil
 }
 
 func (t *Tunnel) AddStream(streamID string, conn io.ReadWriteCloser) error {
-	t.streamsMu.Lock()
+	if t.streams.HasKey(streamID) {
-	defer t.streamsMu.Unlock()
-
-	if _, found := t.streams[streamID]; found {
 		return fmt.Errorf("stream %s already exists", streamID)
 	}
-	t.streams[streamID] = conn
+	t.streams.Set(streamID, conn)
 	return nil
 }
 
-func (t *Tunnel) StartStream(streamID string) error {
+func (t *Tunnel) StartStream(streamID string, sourceAddr string) error {
 	// Get Stream
-	conn, found := t.getStream(streamID)
+	conn, found := t.streams.Get(streamID)
 	if !found {
 		return fmt.Errorf("stream %s does not exist", streamID)
 	}
@@ -133,8 +137,9 @@ func (t *Tunnel) StartStream(streamID string) error {
 	// Close Stream
 	defer func() {
 		_ = t.sendWS(&types.Message{
-			Type:     types.MessageTypeClose,
+			Type:       types.MessageTypeClose,
-			StreamID: streamID,
+			StreamID:   streamID,
+			SourceAddr: sourceAddr,
 		})
 
 		t.CloseStream(streamID)
@@ -149,9 +154,10 @@ func (t *Tunnel) StartStream(streamID string) error {
 		}
 
 		if err := t.sendWS(&types.Message{
-			Type:     types.MessageTypeData,
+			Type:       types.MessageTypeData,
-			Data:     buffer[:n],
+			StreamID:   streamID,
-			StreamID: streamID,
+			Data:       buffer[:n],
+			SourceAddr: sourceAddr,
 		}); err != nil {
 			return err
 		}
@@ -160,7 +166,7 @@ func (t *Tunnel) StartStream(streamID string) error {
 
 func (t *Tunnel) WriteStream(streamID string, data []byte) error {
 	// Get Stream
-	conn, found := t.getStream(streamID)
+	conn, found := t.streams.Get(streamID)
 	if !found {
 		return fmt.Errorf("stream %s does not exist", streamID)
 	}
@@ -170,10 +176,8 @@ func (t *Tunnel) WriteStream(streamID string, data []byte) error {
 }
 
 func (t *Tunnel) CloseStream(streamID string) error {
-	t.streamsMu.Lock()
+	if conn, ok := t.streams.Get(streamID); ok {
-	defer t.streamsMu.Unlock()
+		t.streams.Delete(streamID)
-	if conn, ok := t.streams[streamID]; ok {
-		delete(t.streams, streamID)
 		return conn.Close()
 	}
 	return nil
@@ -184,17 +188,7 @@ func (t *Tunnel) Source() string {
 }
 
 func (t *Tunnel) sendWS(msg *types.Message) error {
-	t.wsMu.Lock()
+	t.mu.Lock()
-	defer t.wsMu.Unlock()
+	defer t.mu.Unlock()
 	return t.wsConn.WriteJSON(msg)
 }
-
-func (t *Tunnel) getStream(streamID string) (io.ReadWriteCloser, bool) {
-	t.streamsMu.Lock()
-	defer t.streamsMu.Unlock()
-
-	if conn, ok := t.streams[streamID]; ok {
-		return conn, true
-	}
-	return nil, false
-}

types/message.go

@@ -8,7 +8,8 @@ const (
 )
 
 type Message struct {
-	Type     MessageType `json:"type"`
+	Type       MessageType `json:"type"`
-	StreamID string      `json:"stream_id"`
+	StreamID   string      `json:"stream_id"`
-	Data     []byte      `json:"data,omitempty"`
+	SourceAddr string      `json:"source_addr"`
+	Data       []byte      `json:"data,omitempty"`
 }