From: Jeff Halter Date: Fri, 24 Jun 2022 23:10:42 +0000 (-0700) Subject: Implement user ban X-Git-Url: https://git.r.bdr.sh/rbdr/mobius/commitdiff_plain/46862572ad2977a87baeda0aa8a9e678c533559d?ds=sidebyside;hp=-c Implement user ban --- 46862572ad2977a87baeda0aa8a9e678c533559d diff --git a/hotline/ban.go b/hotline/ban.go new file mode 100644 index 0000000..0b75e8e --- /dev/null +++ b/hotline/ban.go @@ -0,0 +1,5 @@ +package hotline + +import "time" + +const tempBanDuration = 30 * time.Minute diff --git a/hotline/field.go b/hotline/field.go index aef790d..3076017 100644 --- a/hotline/field.go +++ b/hotline/field.go @@ -19,7 +19,7 @@ const fieldUserAccess = 110 // const fieldUserAlias = 111 TODO: implement const fieldUserFlags = 112 -const fieldOptions = 113 +const fieldOptions = 113 // Server message (1) or admin message (any other value) const fieldChatID = 114 const fieldChatSubject = 115 const fieldWaitingCount = 116 diff --git a/hotline/server.go b/hotline/server.go index 1edfd4a..ec60527 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 { @@ -184,6 +187,7 @@ 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 { if err == io.EOF { s.Logger.Infow("Client disconnected", "RemoteAddr", conn.RemoteAddr()) @@ -215,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 @@ -233,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 } @@ -317,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() @@ -448,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) @@ -535,6 +569,31 @@ func (s *Server) handleNewConnection(ctx context.Context, rwc io.ReadWriteCloser } 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 diff --git a/hotline/transaction_handlers.go b/hotline/transaction_handlers.go index 9edecb8..dda2dce 100644 --- a/hotline/transaction_handlers.go +++ b/hotline/transaction_handlers.go @@ -1024,12 +1024,48 @@ func HandleDisconnectUser(cc *ClientConn, t *Transaction) (res []Transaction, er return res, err } - if err := clientConn.Connection.Close(); err != nil { - return res, err + // If fieldOptions is set, then the client IP is banned in addition to disconnected. + // 00 01 = temporary ban + // 00 02 = permanent ban + if t.GetField(fieldOptions).Data != nil { + switch t.GetField(fieldOptions).Data[1] { + case 1: + // send message: "You are temporarily banned on this server" + cc.logger.Infow("Disconnect & temporarily ban " + string(clientConn.UserName)) + + res = append(res, *NewTransaction( + tranServerMsg, + clientConn.ID, + NewField(fieldData, []byte("You are temporarily banned on this server")), + NewField(fieldChatOptions, []byte{0, 0}), + )) + + banUntil := time.Now().Add(tempBanDuration) + cc.Server.banList[strings.Split(clientConn.RemoteAddr, ":")[0]] = &banUntil + cc.Server.writeBanList() + case 2: + // send message: "You are permanently banned on this server" + cc.logger.Infow("Disconnect & ban " + string(clientConn.UserName)) + + res = append(res, *NewTransaction( + tranServerMsg, + clientConn.ID, + NewField(fieldData, []byte("You are permanently banned on this server")), + NewField(fieldChatOptions, []byte{0, 0}), + )) + + cc.Server.banList[strings.Split(clientConn.RemoteAddr, ":")[0]] = nil + cc.Server.writeBanList() + } } - res = append(res, cc.NewReply(t)) - return res, err + // TODO: remove this awful hack + go func() { + time.Sleep(1 * time.Second) + clientConn.Disconnect() + }() + + return append(res, cc.NewReply(t)), err } // HandleGetNewsCatNameList returns a list of news categories for a path