X-Git-Url: https://git.r.bdr.sh/rbdr/mobius/blobdiff_plain/d4c152a4dba0eec7c8ecd13732900909f51b1c97..a82b93cf7e84dee23d8b0cdbc2bd473641ddf4b9:/hotline/server.go?ds=inline

diff --git a/hotline/server.go b/hotline/server.go
index fb06001..014824b 100644
--- a/hotline/server.go
+++ b/hotline/server.go
@@ -1,10 +1,12 @@
 package hotline
 
 import (
+	"bytes"
 	"context"
 	"encoding/binary"
 	"errors"
 	"fmt"
+	"github.com/go-playground/validator/v10"
 	"go.uber.org/zap"
 	"io"
 	"io/fs"
@@ -30,6 +32,8 @@ const (
 	trackerUpdateFrequency = 300 // time in seconds between tracker re-registration
 )
 
+var nostalgiaVersion = []byte{0, 0, 2, 0x2c} // version ID used by the Nostalgia client
+
 type Server struct {
 	Port          int
 	Accounts      map[string]*Account
@@ -43,7 +47,7 @@ type Server struct {
 	Logger        *zap.SugaredLogger
 	PrivateChats  map[uint32]*PrivateChat
 	NextGuestID   *uint16
-	TrackerPassID []byte
+	TrackerPassID [4]byte
 	Stats         *Stats
 
 	APIListener  net.Listener
@@ -64,7 +68,12 @@ type PrivateChat struct {
 }
 
 func (s *Server) ListenAndServe(ctx context.Context, cancelRoot context.CancelFunc) error {
-	s.Logger.Infow("Hotline server started", "version", VERSION)
+	s.Logger.Infow("Hotline server started",
+		"version", VERSION,
+		"API port", fmt.Sprintf(":%v", s.Port),
+		"Transfer port", fmt.Sprintf(":%v", s.Port+1),
+	)
+
 	var wg sync.WaitGroup
 
 	wg.Add(1)
@@ -78,13 +87,7 @@ func (s *Server) ListenAndServe(ctx context.Context, cancelRoot context.CancelFu
 	return nil
 }
 
-func (s *Server) APIPort() int {
-	return s.APIListener.Addr().(*net.TCPAddr).Port
-}
-
 func (s *Server) ServeFileTransfers(ln net.Listener) error {
-	s.Logger.Infow("Hotline file transfer server started", "Addr", fmt.Sprintf(":%v", s.Port+1))
-
 	for {
 		conn, err := ln.Accept()
 		if err != nil {
@@ -137,7 +140,6 @@ func (s *Server) sendTransaction(t Transaction) error {
 }
 
 func (s *Server) Serve(ctx context.Context, cancelRoot context.CancelFunc, ln net.Listener) error {
-	s.Logger.Infow("Hotline server started", "Addr", fmt.Sprintf(":%v", s.Port))
 
 	for {
 		conn, err := ln.Accept()
@@ -186,7 +188,6 @@ func NewServer(configDir, netInterface string, netPort int, logger *zap.SugaredL
 		outbox:        make(chan Transaction),
 		Stats:         &Stats{StartTime: time.Now()},
 		ThreadedNews:  &ThreadedNews{},
-		TrackerPassID: make([]byte, 4),
 	}
 
 	ln, err := net.Listen("tcp", fmt.Sprintf("%s:%v", netInterface, netPort))
@@ -195,22 +196,17 @@ func NewServer(configDir, netInterface string, netPort int, logger *zap.SugaredL
 	}
 	server.APIListener = ln
 
-	if netPort != 0 {
-		netPort += 1
-	}
-
-	ln2, err := net.Listen("tcp", fmt.Sprintf("%s:%v", netInterface, netPort))
+	ln2, err := net.Listen("tcp", fmt.Sprintf("%s:%v", netInterface, netPort+1))
 	server.FileListener = ln2
 	if err != nil {
 		return nil, err
 	}
 
 	// generate a new random passID for tracker registration
-	if _, err := rand.Read(server.TrackerPassID); err != nil {
+	if _, err := rand.Read(server.TrackerPassID[:]); err != nil {
 		return nil, err
 	}
 
-	server.Logger.Debugw("Loading Agreement", "path", configDir+agreementFile)
 	if server.Agreement, err = os.ReadFile(configDir + agreementFile); err != nil {
 		return nil, err
 	}
@@ -245,12 +241,12 @@ func NewServer(configDir, netInterface string, netPort int, logger *zap.SugaredL
 		go func() {
 			for {
 				tr := &TrackerRegistration{
-					Port:        []byte{0x15, 0x7c},
 					UserCount:   server.userCount(),
-					PassID:      server.TrackerPassID,
+					PassID:      server.TrackerPassID[:],
 					Name:        server.Config.Name,
 					Description: server.Config.Description,
 				}
+				binary.BigEndian.PutUint16(tr.Port[:], uint16(server.Port))
 				for _, t := range server.Config.Trackers {
 					if err := register(t, tr); err != nil {
 						server.Logger.Errorw("unable to register with tracker %v", "error", err)
@@ -369,8 +365,6 @@ func (s *Server) UpdateUser(login, newLogin, name, password string, access []byt
 	s.mux.Lock()
 	defer s.mux.Unlock()
 
-	fmt.Printf("login: %v, newLogin: %v: ", login, newLogin)
-
 	// update renames the user login
 	if login != newLogin {
 		err := os.Rename(s.ConfigDir+"Users/"+login+".yaml", s.ConfigDir+"Users/"+newLogin+".yaml")
@@ -477,6 +471,12 @@ func (s *Server) loadConfig(path string) error {
 	if err != nil {
 		return err
 	}
+
+	validate := validator.New()
+	err = validate.Struct(s.Config)
+	if err != nil {
+		return err
+	}
 	return nil
 }
 
@@ -572,8 +572,8 @@ func (s *Server) handleNewConnection(conn net.Conn, remoteAddr string) error {
 	// Show agreement to client
 	c.Server.outbox <- *NewTransaction(tranShowAgreement, c.ID, NewField(fieldData, s.Agreement))
 
-	// assume simplified hotline v1.2.3 login flow that does not require agreement
-	if *c.Version == nil {
+	// Used simplified hotline v1.2.3 login flow for clients that do not send login info in tranAgreed
+	if *c.Version == nil || bytes.Equal(*c.Version, nostalgiaVersion) {
 		c.Agreed = true
 
 		c.notifyOthers(