X-Git-Url: https://git.r.bdr.sh/rbdr/mobius/blobdiff_plain/df1ade5433b027f9cb905e584921692313e647f5..f168da153f3984af6d532b979219310242f0b8d1:/hotline/server.go diff --git a/hotline/server.go b/hotline/server.go index e685afd..0d66e08 100644 --- a/hotline/server.go +++ b/hotline/server.go @@ -66,6 +66,9 @@ type Server struct { flatNewsMux sync.Mutex FlatNews []byte + + banListMU sync.Mutex + banList map[string]*time.Time } type PrivateChat struct { @@ -133,7 +136,6 @@ func (s *Server) ServeFileTransfers(ctx context.Context, ln net.Listener) error } func (s *Server) sendTransaction(t Transaction) error { - requestNum := binary.BigEndian.Uint16(t.Type) clientID, err := byteToInt(*t.clientID) if err != nil { return err @@ -141,31 +143,21 @@ func (s *Server) sendTransaction(t Transaction) error { s.mux.Lock() client := s.Clients[uint16(clientID)] - s.mux.Unlock() if client == nil { return fmt.Errorf("invalid client id %v", *t.clientID) } - userName := string(client.UserName) - login := client.Account.Login - handler := TransactionHandlers[requestNum] + s.mux.Unlock() b, err := t.MarshalBinary() if err != nil { return err } - var n int - if n, err = client.Connection.Write(b); err != nil { + + if _, err := client.Connection.Write(b); err != nil { return err } - s.Logger.Debugw("Sent Transaction", - "name", userName, - "login", login, - "IsReply", t.IsReply, - "type", handler.Name, - "sentBytes", n, - "remoteAddr", client.RemoteAddr, - ) + return nil } @@ -193,8 +185,10 @@ func (s *Server) Serve(ctx context.Context, ln net.Listener) error { }) go func() { + s.Logger.Infow("Connection established", "RemoteAddr", conn.RemoteAddr()) + + defer conn.Close() if err := s.handleNewConnection(connCtx, conn, conn.RemoteAddr().String()); err != nil { - s.Logger.Infow("New client connection established", "RemoteAddr", conn.RemoteAddr()) if err == io.EOF { s.Logger.Infow("Client disconnected", "RemoteAddr", conn.RemoteAddr()) } else { @@ -225,6 +219,7 @@ func NewServer(configDir string, netPort int, logger *zap.SugaredLogger, FS File Stats: &Stats{StartTime: time.Now()}, ThreadedNews: &ThreadedNews{}, FS: FS, + banList: make(map[string]*time.Time), } var err error @@ -243,6 +238,9 @@ func NewServer(configDir string, netPort int, logger *zap.SugaredLogger, FS File return nil, err } + // try to load the ban list, but ignore errors as this file may not be present or may be empty + _ = server.loadBanList(filepath.Join(configDir, "Banlist.yaml")) + if err := server.loadThreadedNews(filepath.Join(configDir, "ThreadedNews.yaml")); err != nil { return nil, err } @@ -310,16 +308,16 @@ func (s *Server) keepaliveHandler() { if c.IdleTime > userIdleSeconds && !c.Idle { c.Idle = true - flagBitmap := big.NewInt(int64(binary.BigEndian.Uint16(*c.Flags))) + flagBitmap := big.NewInt(int64(binary.BigEndian.Uint16(c.Flags))) flagBitmap.SetBit(flagBitmap, userFlagAway, 1) - binary.BigEndian.PutUint16(*c.Flags, uint16(flagBitmap.Int64())) + binary.BigEndian.PutUint16(c.Flags, uint16(flagBitmap.Int64())) c.sendAll( tranNotifyChangeUser, NewField(fieldUserID, *c.ID), - NewField(fieldUserFlags, *c.Flags), + NewField(fieldUserFlags, c.Flags), NewField(fieldUserName, c.UserName), - NewField(fieldUserIconID, *c.Icon), + NewField(fieldUserIconID, c.Icon), ) } } @@ -327,6 +325,22 @@ func (s *Server) keepaliveHandler() { } } +func (s *Server) writeBanList() error { + s.banListMU.Lock() + defer s.banListMU.Unlock() + + out, err := yaml.Marshal(s.banList) + if err != nil { + return err + } + err = ioutil.WriteFile( + filepath.Join(s.ConfigDir, "Banlist.yaml"), + out, + 0666, + ) + return err +} + func (s *Server) writeThreadedNews() error { s.mux.Lock() defer s.mux.Unlock() @@ -349,12 +363,12 @@ func (s *Server) NewClientConn(conn io.ReadWriteCloser, remoteAddr string) *Clie clientConn := &ClientConn{ ID: &[]byte{0, 0}, - Icon: &[]byte{0, 0}, - Flags: &[]byte{0, 0}, + Icon: []byte{0, 0}, + Flags: []byte{0, 0}, UserName: []byte{}, Connection: conn, Server: s, - Version: &[]byte{}, + Version: []byte{}, AutoReply: []byte{}, transfers: map[int]map[[4]byte]*FileTransfer{}, Agreed: false, @@ -449,8 +463,8 @@ func (s *Server) connectedUsers() []Field { } user := User{ ID: *c.ID, - Icon: *c.Icon, - Flags: *c.Flags, + Icon: c.Icon, + Flags: c.Flags, Name: string(c.UserName), } connectedUsers = append(connectedUsers, NewField(fieldUsernameWithInfo, user.Payload())) @@ -458,6 +472,16 @@ func (s *Server) connectedUsers() []Field { return connectedUsers } +func (s *Server) loadBanList(path string) error { + fh, err := os.Open(path) + if err != nil { + return err + } + decoder := yaml.NewDecoder(fh) + + return decoder.Decode(s.banList) +} + // loadThreadedNews loads the threaded news data from disk func (s *Server) loadThreadedNews(threadedNewsPath string) error { fh, err := os.Open(threadedNewsPath) @@ -517,12 +541,7 @@ func (s *Server) loadConfig(path string) error { return nil } -const ( - minTransactionLen = 22 // minimum length of any transaction -) - -// dontPanic recovers and logs panics instead of crashing -// TODO: remove this after known issues are fixed +// dontPanic logs panics instead of crashing func dontPanic(logger *zap.SugaredLogger) { if r := recover(); r != nil { fmt.Println("stacktrace from panic: \n" + string(debug.Stack())) @@ -531,34 +550,55 @@ func dontPanic(logger *zap.SugaredLogger) { } // handleNewConnection takes a new net.Conn and performs the initial login sequence -func (s *Server) handleNewConnection(ctx context.Context, conn io.ReadWriteCloser, remoteAddr string) error { +func (s *Server) handleNewConnection(ctx context.Context, rwc io.ReadWriteCloser, remoteAddr string) error { defer dontPanic(s.Logger) - if err := Handshake(conn); err != nil { + if err := Handshake(rwc); err != nil { return err } - buf := make([]byte, 1024) - // TODO: fix potential short read with io.ReadFull - readLen, err := conn.Read(buf) - if readLen < minTransactionLen { - return err - } - if err != nil { - return err - } + // Create a new scanner for parsing incoming bytes into transaction tokens + scanner := bufio.NewScanner(rwc) + scanner.Split(transactionScanner) + + scanner.Scan() - clientLogin, _, err := ReadTransaction(buf[:readLen]) + clientLogin, _, err := ReadTransaction(scanner.Bytes()) if err != nil { - return err + panic(err) } - c := s.NewClientConn(conn, remoteAddr) + c := s.NewClientConn(rwc, remoteAddr) + + // check if remoteAddr is present in the ban list + if banUntil, ok := s.banList[strings.Split(remoteAddr, ":")[0]]; ok { + // permaban + if banUntil == nil { + s.outbox <- *NewTransaction( + tranServerMsg, + c.ID, + NewField(fieldData, []byte("You are permanently banned on this server")), + NewField(fieldChatOptions, []byte{0, 0}), + ) + time.Sleep(1 * time.Second) + return nil + } else if time.Now().Before(*banUntil) { + s.outbox <- *NewTransaction( + tranServerMsg, + c.ID, + NewField(fieldData, []byte("You are temporarily banned on this server")), + NewField(fieldChatOptions, []byte{0, 0}), + ) + time.Sleep(1 * time.Second) + return nil + } + + } defer c.Disconnect() encodedLogin := clientLogin.GetField(fieldUserLogin).Data encodedPassword := clientLogin.GetField(fieldUserPassword).Data - *c.Version = clientLogin.GetField(fieldVersion).Data + c.Version = clientLogin.GetField(fieldVersion).Data var login string for _, char := range encodedLogin { @@ -568,6 +608,8 @@ func (s *Server) handleNewConnection(ctx context.Context, conn io.ReadWriteClose login = GuestAccount } + c.logger = s.Logger.With("remoteAddr", remoteAddr, "login", login) + // If authentication fails, send error reply and close connection if !c.Authenticate(login, encodedPassword) { t := c.NewErrReply(clientLogin, "Incorrect login.") @@ -575,29 +617,32 @@ func (s *Server) handleNewConnection(ctx context.Context, conn io.ReadWriteClose if err != nil { return err } - if _, err := conn.Write(b); err != nil { + if _, err := rwc.Write(b); err != nil { return err } - return fmt.Errorf("incorrect login") - } - if clientLogin.GetField(fieldUserName).Data != nil { - c.UserName = clientLogin.GetField(fieldUserName).Data + c.logger.Infow("Login failed", "clientVersion", fmt.Sprintf("%x", c.Version)) + + return nil } if clientLogin.GetField(fieldUserIconID).Data != nil { - *c.Icon = clientLogin.GetField(fieldUserIconID).Data + c.Icon = clientLogin.GetField(fieldUserIconID).Data } c.Account = c.Server.Accounts[login] - if c.Authorize(accessDisconUser) { - *c.Flags = []byte{0, 2} + if clientLogin.GetField(fieldUserName).Data != nil { + if c.Authorize(accessAnyName) { + c.UserName = clientLogin.GetField(fieldUserName).Data + } else { + c.UserName = []byte(c.Account.Name) + } } - c.logger = s.Logger.With("remoteAddr", remoteAddr, "login", login) - - c.logger.Infow("Client connection received", "version", fmt.Sprintf("%x", *c.Version)) + if c.Authorize(accessDisconUser) { + c.Flags = []byte{0, 2} + } s.outbox <- c.NewReply(clientLogin, NewField(fieldVersion, []byte{0x00, 0xbe}), @@ -608,21 +653,31 @@ func (s *Server) handleNewConnection(ctx context.Context, conn io.ReadWriteClose // Send user access privs so client UI knows how to behave c.Server.outbox <- *NewTransaction(tranUserAccess, c.ID, NewField(fieldUserAccess, *c.Account.Access)) - // Show agreement to client - c.Server.outbox <- *NewTransaction(tranShowAgreement, c.ID, NewField(fieldData, s.Agreement)) + // Accounts with accessNoAgreement do not receive the server agreement on login. The behavior is different between + // client versions. For 1.2.3 client, we do not send tranShowAgreement. For other client versions, we send + // tranShowAgreement but with the NoServerAgreement field set to 1. + if c.Authorize(accessNoAgreement) { + // If client version is nil, then the client uses the 1.2.3 login behavior + if c.Version != nil { + c.Server.outbox <- *NewTransaction(tranShowAgreement, c.ID, NewField(fieldNoServerAgreement, []byte{1})) + } + } else { + c.Server.outbox <- *NewTransaction(tranShowAgreement, c.ID, NewField(fieldData, s.Agreement)) + } // 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) { + if c.Version == nil || bytes.Equal(c.Version, nostalgiaVersion) { c.Agreed = true c.logger = c.logger.With("name", string(c.UserName)) + c.logger.Infow("Login successful", "clientVersion", fmt.Sprintf("%x", c.Version)) for _, t := range c.notifyOthers( *NewTransaction( tranNotifyChangeUser, nil, NewField(fieldUserName, c.UserName), NewField(fieldUserID, *c.ID), - NewField(fieldUserIconID, *c.Icon), - NewField(fieldUserFlags, *c.Flags), + NewField(fieldUserIconID, c.Icon), + NewField(fieldUserFlags, c.Flags), ), ) { c.Server.outbox <- t @@ -631,34 +686,22 @@ func (s *Server) handleNewConnection(ctx context.Context, conn io.ReadWriteClose c.Server.Stats.LoginCount += 1 - const readBuffSize = 1024000 // 1KB - TODO: what should this be? - tranBuff := make([]byte, 0) - tReadlen := 0 - // Infinite loop where take action on incoming client requests until the connection is closed - for { - buf = make([]byte, readBuffSize) - tranBuff = tranBuff[tReadlen:] + // Scan for new transactions and handle them as they come in. + for scanner.Scan() { + // Make a new []byte slice and copy the scanner bytes to it. This is critical to avoid a data race as the + // scanner re-uses the buffer for subsequent scans. + buf := make([]byte, len(scanner.Bytes())) + copy(buf, scanner.Bytes()) - readLen, err := c.Connection.Read(buf) + t, _, err := ReadTransaction(buf) if err != nil { - return err + panic(err) } - tranBuff = append(tranBuff, buf[:readLen]...) - - // We may have read multiple requests worth of bytes from Connection.Read. readTransactions splits them - // into a slice of transactions - var transactions []Transaction - if transactions, tReadlen, err = readTransactions(tranBuff); err != nil { + if err := c.handleTransaction(*t); err != nil { c.logger.Errorw("Error handling transaction", "err", err) } - - // iterate over all the transactions that were parsed from the byte slice and handle them - for _, t := range transactions { - if err := c.handleTransaction(&t); err != nil { - c.logger.Errorw("Error handling transaction", "err", err) - } - } } + return nil } func (s *Server) NewPrivateChat(cc *ClientConn) []byte {