X-Git-Url: https://git.r.bdr.sh/rbdr/mobius/blobdiff_plain/6eaf9391526a808c0056427f056169311352446d..dd88b8567d1377f50ab6955f6a30db830d94ebd9:/hotline/server.go?ds=sidebyside

diff --git a/hotline/server.go b/hotline/server.go
index 04ac8c7..ed3c041 100644
--- a/hotline/server.go
+++ b/hotline/server.go
@@ -9,6 +9,7 @@ import (
 	"errors"
 	"fmt"
 	"golang.org/x/text/encoding/charmap"
+	"golang.org/x/time/rate"
 	"io"
 	"log"
 	"log/slog"
@@ -37,6 +38,8 @@ type Server struct {
 	NetInterface string
 	Port         int
 
+	rateLimiters map[string]*rate.Limiter
+
 	handlers map[TranType]HandlerFunc
 
 	Config Config
@@ -98,6 +101,7 @@ func NewServer(options ...Option) (*Server, error) {
 	server := Server{
 		handlers:        make(map[TranType]HandlerFunc),
 		outbox:          make(chan Transaction),
+		rateLimiters:    make(map[string]*rate.Limiter),
 		FS:              &OSFileStore{},
 		ChatMgr:         NewMemChatManager(),
 		ClientMgr:       NewMemClientMgr(),
@@ -170,7 +174,7 @@ func (s *Server) ServeFileTransfers(ctx context.Context, ln net.Listener) error
 			)
 
 			if err != nil {
-				s.Logger.Error("file transfer error", "reason", err)
+				s.Logger.Error("file transfer error", "err", err)
 			}
 		}()
 	}
@@ -202,6 +206,10 @@ func (s *Server) processOutbox() {
 	}
 }
 
+// perIPRateLimit controls how frequently an IP address can connect before being throttled.
+// 0.5 = 1 connection every 2 seconds
+const perIPRateLimit = rate.Limit(0.5)
+
 func (s *Server) Serve(ctx context.Context, ln net.Listener) error {
 	for {
 		select {
@@ -216,13 +224,29 @@ func (s *Server) Serve(ctx context.Context, ln net.Listener) error {
 			}
 
 			go func() {
+				ipAddr := strings.Split(conn.RemoteAddr().(*net.TCPAddr).String(), ":")[0]
+
 				connCtx := context.WithValue(ctx, contextKeyReq, requestCtx{
 					remoteAddr: conn.RemoteAddr().String(),
 				})
 
-				s.Logger.Info("Connection established", "addr", conn.RemoteAddr())
+				s.Logger.Info("Connection established", "ip", ipAddr)
 				defer conn.Close()
 
+				// Check if we have an existing rate limit for the IP and create one if we do not.
+				rl, ok := s.rateLimiters[ipAddr]
+				if !ok {
+					rl = rate.NewLimiter(perIPRateLimit, 1)
+					s.rateLimiters[ipAddr] = rl
+				}
+
+				// Check if the rate limit is exceeded and close the connection if so.
+				if !rl.Allow() {
+					s.Logger.Info("Rate limit exceeded", "RemoteAddr", conn.RemoteAddr())
+					conn.Close()
+					return
+				}
+
 				if err := s.handleNewConnection(connCtx, conn, conn.RemoteAddr().String()); err != nil {
 					if err == io.EOF {
 						s.Logger.Info("Client disconnected", "RemoteAddr", conn.RemoteAddr())
@@ -241,6 +265,10 @@ const trackerUpdateFrequency = 300
 // registerWithTrackers runs every trackerUpdateFrequency seconds to update the server's tracker entry on all configured
 // trackers.
 func (s *Server) registerWithTrackers(ctx context.Context) {
+	if s.Config.EnableTrackerRegistration {
+		s.Logger.Info("Tracker registration enabled", "trackers", s.Config.Trackers)
+	}
+
 	for {
 		if s.Config.EnableTrackerRegistration {
 			for _, t := range s.Config.Trackers {
@@ -400,7 +428,7 @@ func (s *Server) handleNewConnection(ctx context.Context, rwc io.ReadWriteCloser
 			return err
 		}
 
-		c.Logger.Info("Login failed", "clientVersion", fmt.Sprintf("%x", c.Version))
+		c.Logger.Info("Incorrect login")
 
 		return nil
 	}
@@ -526,7 +554,7 @@ func (s *Server) handleFileTransfer(ctx context.Context, rwc io.ReadWriter) erro
 		"Name", string(fileTransfer.ClientConn.UserName),
 	)
 
-	fullPath, err := ReadPath(s.Config.FileRoot, fileTransfer.FilePath, fileTransfer.FileName)
+	fullPath, err := ReadPath(fileTransfer.FileRoot, fileTransfer.FilePath, fileTransfer.FileName)
 	if err != nil {
 		return err
 	}
@@ -534,7 +562,7 @@ func (s *Server) handleFileTransfer(ctx context.Context, rwc io.ReadWriter) erro
 	switch fileTransfer.Type {
 	case BannerDownload:
 		if _, err := io.Copy(rwc, bytes.NewBuffer(s.Banner)); err != nil {
-			return fmt.Errorf("error sending Banner: %w", err)
+			return fmt.Errorf("banner download: %w", err)
 		}
 	case FileDownload:
 		s.Stats.Increment(StatDownloadCounter, StatDownloadsInProgress)
@@ -555,7 +583,7 @@ func (s *Server) handleFileTransfer(ctx context.Context, rwc io.ReadWriter) erro
 
 		err = UploadHandler(rwc, fullPath, fileTransfer, s.FS, rLogger, s.Config.PreserveResourceForks)
 		if err != nil {
-			return fmt.Errorf("file upload error: %w", err)
+			return fmt.Errorf("file upload: %w", err)
 		}
 
 	case FolderDownload:
@@ -566,7 +594,7 @@ func (s *Server) handleFileTransfer(ctx context.Context, rwc io.ReadWriter) erro
 
 		err = DownloadFolderHandler(rwc, fullPath, fileTransfer, s.FS, rLogger, s.Config.PreserveResourceForks)
 		if err != nil {
-			return fmt.Errorf("file upload error: %w", err)
+			return fmt.Errorf("folder download: %w", err)
 		}
 
 	case FolderUpload:
@@ -584,7 +612,7 @@ func (s *Server) handleFileTransfer(ctx context.Context, rwc io.ReadWriter) erro
 
 		err = UploadFolderHandler(rwc, fullPath, fileTransfer, s.FS, rLogger, s.Config.PreserveResourceForks)
 		if err != nil {
-			return fmt.Errorf("file upload error: %w", err)
+			return fmt.Errorf("folder upload: %w", err)
 		}
 	}
 	return nil