From a82b93cf7e84dee23d8b0cdbc2bd473641ddf4b9 Mon Sep 17 00:00:00 2001 From: Jeff Halter <868228+jhalter@users.noreply.github.com> Date: Tue, 7 Jun 2022 17:59:04 -0700 Subject: Fix Nostalgia ghost user bug --- hotline/server.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'hotline/server.go') diff --git a/hotline/server.go b/hotline/server.go index 64cc527..014824b 100644 --- a/hotline/server.go +++ b/hotline/server.go @@ -1,6 +1,7 @@ package hotline import ( + "bytes" "context" "encoding/binary" "errors" @@ -31,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 @@ -569,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( -- cgit