X-Git-Url: https://git.r.bdr.sh/rbdr/mobius/blobdiff_plain/180d654463687e84270ade218e65d97356c58551..71f9ce10c4d0ebc0d5aec5a2bf46b1c508409338:/hotline/transaction_handlers.go diff --git a/hotline/transaction_handlers.go b/hotline/transaction_handlers.go index d065122..ead394a 100644 --- a/hotline/transaction_handlers.go +++ b/hotline/transaction_handlers.go @@ -1,252 +1,81 @@ package hotline import ( + "bufio" "bytes" "encoding/binary" - "errors" "fmt" - "gopkg.in/yaml.v3" + "io" "math/big" "os" "path" "path/filepath" - "sort" "strings" "time" ) -type HandlerFunc func(*ClientConn, *Transaction) ([]Transaction, error) - -type TransactionType struct { - Handler HandlerFunc // function for handling the transaction type - Name string // Name of transaction as it will appear in logging - RequiredFields []requiredField +// HandlerFunc is the signature of a func to handle a Hotline transaction. +type HandlerFunc func(*ClientConn, *Transaction) []Transaction + +// TransactionHandlers maps a transaction type to a handler function. +var TransactionHandlers = map[TranType]HandlerFunc{ + TranAgreed: HandleTranAgreed, + TranChatSend: HandleChatSend, + TranDelNewsArt: HandleDelNewsArt, + TranDelNewsItem: HandleDelNewsItem, + TranDeleteFile: HandleDeleteFile, + TranDeleteUser: HandleDeleteUser, + TranDisconnectUser: HandleDisconnectUser, + TranDownloadFile: HandleDownloadFile, + TranDownloadFldr: HandleDownloadFolder, + TranGetClientInfoText: HandleGetClientInfoText, + TranGetFileInfo: HandleGetFileInfo, + TranGetFileNameList: HandleGetFileNameList, + TranGetMsgs: HandleGetMsgs, + TranGetNewsArtData: HandleGetNewsArtData, + TranGetNewsArtNameList: HandleGetNewsArtNameList, + TranGetNewsCatNameList: HandleGetNewsCatNameList, + TranGetUser: HandleGetUser, + TranGetUserNameList: HandleGetUserNameList, + TranInviteNewChat: HandleInviteNewChat, + TranInviteToChat: HandleInviteToChat, + TranJoinChat: HandleJoinChat, + TranKeepAlive: HandleKeepAlive, + TranLeaveChat: HandleLeaveChat, + TranListUsers: HandleListUsers, + TranMoveFile: HandleMoveFile, + TranNewFolder: HandleNewFolder, + TranNewNewsCat: HandleNewNewsCat, + TranNewNewsFldr: HandleNewNewsFldr, + TranNewUser: HandleNewUser, + TranUpdateUser: HandleUpdateUser, + TranOldPostNews: HandleTranOldPostNews, + TranPostNewsArt: HandlePostNewsArt, + TranRejectChatInvite: HandleRejectChatInvite, + TranSendInstantMsg: HandleSendInstantMsg, + TranSetChatSubject: HandleSetChatSubject, + TranMakeFileAlias: HandleMakeAlias, + TranSetClientUserInfo: HandleSetClientUserInfo, + TranSetFileInfo: HandleSetFileInfo, + TranSetUser: HandleSetUser, + TranUploadFile: HandleUploadFile, + TranUploadFldr: HandleUploadFolder, + TranUserBroadcast: HandleUserBroadcast, + TranDownloadBanner: HandleDownloadBanner, } -var TransactionHandlers = map[uint16]TransactionType{ - // Server initiated - TranChatMsg: { - Name: "TranChatMsg", - }, - // Server initiated - TranNotifyChangeUser: { - Name: "TranNotifyChangeUser", - }, - TranError: { - Name: "TranError", - }, - TranShowAgreement: { - Name: "TranShowAgreement", - }, - TranUserAccess: { - Name: "TranUserAccess", - }, - TranNotifyDeleteUser: { - Name: "TranNotifyDeleteUser", - }, - TranAgreed: { - Name: "TranAgreed", - Handler: HandleTranAgreed, - }, - TranChatSend: { - Name: "TranChatSend", - Handler: HandleChatSend, - RequiredFields: []requiredField{ - { - ID: FieldData, - minLen: 0, - }, - }, - }, - TranDelNewsArt: { - Name: "TranDelNewsArt", - Handler: HandleDelNewsArt, - }, - TranDelNewsItem: { - Name: "TranDelNewsItem", - Handler: HandleDelNewsItem, - }, - TranDeleteFile: { - Name: "TranDeleteFile", - Handler: HandleDeleteFile, - }, - TranDeleteUser: { - Name: "TranDeleteUser", - Handler: HandleDeleteUser, - }, - TranDisconnectUser: { - Name: "TranDisconnectUser", - Handler: HandleDisconnectUser, - }, - TranDownloadFile: { - Name: "TranDownloadFile", - Handler: HandleDownloadFile, - }, - TranDownloadFldr: { - Name: "TranDownloadFldr", - Handler: HandleDownloadFolder, - }, - TranGetClientInfoText: { - Name: "TranGetClientInfoText", - Handler: HandleGetClientInfoText, - }, - TranGetFileInfo: { - Name: "TranGetFileInfo", - Handler: HandleGetFileInfo, - }, - TranGetFileNameList: { - Name: "TranGetFileNameList", - Handler: HandleGetFileNameList, - }, - TranGetMsgs: { - Name: "TranGetMsgs", - Handler: HandleGetMsgs, - }, - TranGetNewsArtData: { - Name: "TranGetNewsArtData", - Handler: HandleGetNewsArtData, - }, - TranGetNewsArtNameList: { - Name: "TranGetNewsArtNameList", - Handler: HandleGetNewsArtNameList, - }, - TranGetNewsCatNameList: { - Name: "TranGetNewsCatNameList", - Handler: HandleGetNewsCatNameList, - }, - TranGetUser: { - Name: "TranGetUser", - Handler: HandleGetUser, - }, - TranGetUserNameList: { - Name: "tranHandleGetUserNameList", - Handler: HandleGetUserNameList, - }, - TranInviteNewChat: { - Name: "TranInviteNewChat", - Handler: HandleInviteNewChat, - }, - TranInviteToChat: { - Name: "TranInviteToChat", - Handler: HandleInviteToChat, - }, - TranJoinChat: { - Name: "TranJoinChat", - Handler: HandleJoinChat, - }, - TranKeepAlive: { - Name: "TranKeepAlive", - Handler: HandleKeepAlive, - }, - TranLeaveChat: { - Name: "TranJoinChat", - Handler: HandleLeaveChat, - }, - TranListUsers: { - Name: "TranListUsers", - Handler: HandleListUsers, - }, - TranMoveFile: { - Name: "TranMoveFile", - Handler: HandleMoveFile, - }, - TranNewFolder: { - Name: "TranNewFolder", - Handler: HandleNewFolder, - }, - TranNewNewsCat: { - Name: "TranNewNewsCat", - Handler: HandleNewNewsCat, - }, - TranNewNewsFldr: { - Name: "TranNewNewsFldr", - Handler: HandleNewNewsFldr, - }, - TranNewUser: { - Name: "TranNewUser", - Handler: HandleNewUser, - }, - TranUpdateUser: { - Name: "TranUpdateUser", - Handler: HandleUpdateUser, - }, - TranOldPostNews: { - Name: "TranOldPostNews", - Handler: HandleTranOldPostNews, - }, - TranPostNewsArt: { - Name: "TranPostNewsArt", - Handler: HandlePostNewsArt, - }, - TranRejectChatInvite: { - Name: "TranRejectChatInvite", - Handler: HandleRejectChatInvite, - }, - TranSendInstantMsg: { - Name: "TranSendInstantMsg", - Handler: HandleSendInstantMsg, - RequiredFields: []requiredField{ - { - ID: FieldData, - minLen: 0, - }, - { - ID: FieldUserID, - }, - }, - }, - TranSetChatSubject: { - Name: "TranSetChatSubject", - Handler: HandleSetChatSubject, - }, - TranMakeFileAlias: { - Name: "TranMakeFileAlias", - Handler: HandleMakeAlias, - RequiredFields: []requiredField{ - {ID: FieldFileName, minLen: 1}, - {ID: FieldFilePath, minLen: 1}, - {ID: FieldFileNewPath, minLen: 1}, - }, - }, - TranSetClientUserInfo: { - Name: "TranSetClientUserInfo", - Handler: HandleSetClientUserInfo, - }, - TranSetFileInfo: { - Name: "TranSetFileInfo", - Handler: HandleSetFileInfo, - }, - TranSetUser: { - Name: "TranSetUser", - Handler: HandleSetUser, - }, - TranUploadFile: { - Name: "TranUploadFile", - Handler: HandleUploadFile, - }, - TranUploadFldr: { - Name: "TranUploadFldr", - Handler: HandleUploadFolder, - }, - TranUserBroadcast: { - Name: "TranUserBroadcast", - Handler: HandleUserBroadcast, - }, - TranDownloadBanner: { - Name: "TranDownloadBanner", - Handler: HandleDownloadBanner, - }, -} +// The total size of a chat message data field is 8192 bytes. +const chatMsgLimit = 8192 -func HandleChatSend(cc *ClientConn, t *Transaction) (res []Transaction, err error) { - if !cc.Authorize(accessSendChat) { - res = append(res, cc.NewErrReply(t, "You are not allowed to participate in chat.")) - return res, err +func HandleChatSend(cc *ClientConn, t *Transaction) (res []Transaction) { + if !cc.Authorize(AccessSendChat) { + return cc.NewErrReply(t, "You are not allowed to participate in chat.") } // Truncate long usernames - trunc := fmt.Sprintf("%13s", cc.UserName) - formattedMsg := fmt.Sprintf("\r%.14s: %s", trunc, t.GetField(FieldData).Data) + // %13.13s: This means a string that is right-aligned in a field of 13 characters. + // If the string is longer than 13 characters, it will be truncated to 13 characters. + formattedMsg := fmt.Sprintf("\r%13.13s: %s", cc.UserName, t.GetField(FieldData).Data) // By holding the option key, Hotline chat allows users to send /me formatted messages like: // *** Halcyon does stuff @@ -256,41 +85,45 @@ func HandleChatSend(cc *ClientConn, t *Transaction) (res []Transaction, err erro formattedMsg = fmt.Sprintf("\r*** %s %s", cc.UserName, t.GetField(FieldData).Data) } + // Truncate the message to the limit. This does not handle the edge case of a string ending on multibyte character. + formattedMsg = formattedMsg[:min(len(formattedMsg), chatMsgLimit)] + // The ChatID field is used to identify messages as belonging to a private chat. // All clients *except* Frogblast omit this field for public chat, but Frogblast sends a value of 00 00 00 00. chatID := t.GetField(FieldChatID).Data if chatID != nil && !bytes.Equal([]byte{0, 0, 0, 0}, chatID) { - chatInt := binary.BigEndian.Uint32(chatID) - privChat := cc.Server.PrivateChats[chatInt] - - clients := sortedClients(privChat.ClientConn) // send the message to all connected clients of the private chat - for _, c := range clients { - res = append(res, *NewTransaction( + for _, c := range cc.Server.ChatMgr.Members([4]byte(chatID)) { + res = append(res, NewTransaction( TranChatMsg, c.ID, NewField(FieldChatID, chatID), NewField(FieldData, []byte(formattedMsg)), )) } - return res, err + return res } - for _, c := range sortedClients(cc.Server.Clients) { - // Filter out clients that do not have the read chat permission - if c.Authorize(accessReadChat) { - res = append(res, *NewTransaction(TranChatMsg, c.ID, NewField(FieldData, []byte(formattedMsg)))) + //cc.Server.mux.Lock() + for _, c := range cc.Server.ClientMgr.List() { + if c == nil || cc.Account == nil { + continue + } + // Skip clients that do not have the read chat permission. + if c.Authorize(AccessReadChat) { + res = append(res, NewTransaction(TranChatMsg, c.ID, NewField(FieldData, []byte(formattedMsg)))) } } + //cc.Server.mux.Unlock() - return res, err + return res } // HandleSendInstantMsg sends instant message to the user on the current server. // Fields used in the request: // -// 103 User ID +// 103 User Type // 113 Options // One of the following values: // - User message (myOpt_UserMessage = 1) @@ -302,21 +135,20 @@ func HandleChatSend(cc *ClientConn, t *Transaction) (res []Transaction, err erro // // Fields used in the reply: // None -func HandleSendInstantMsg(cc *ClientConn, t *Transaction) (res []Transaction, err error) { - if !cc.Authorize(accessSendPrivMsg) { - res = append(res, cc.NewErrReply(t, "You are not allowed to send private messages.")) - return res, errors.New("user is not allowed to send private messages") +func HandleSendInstantMsg(cc *ClientConn, t *Transaction) (res []Transaction) { + if !cc.Authorize(AccessSendPrivMsg) { + return cc.NewErrReply(t, "You are not allowed to send private messages.") } msg := t.GetField(FieldData) - ID := t.GetField(FieldUserID) + userID := t.GetField(FieldUserID) reply := NewTransaction( TranServerMsg, - &ID.Data, + [2]byte(userID.Data), NewField(FieldData, msg.Data), NewField(FieldUserName, cc.UserName), - NewField(FieldUserID, *cc.ID), + NewField(FieldUserID, cc.ID[:]), NewField(FieldOptions, []byte{0, 1}), ) @@ -326,77 +158,72 @@ func HandleSendInstantMsg(cc *ClientConn, t *Transaction) (res []Transaction, er reply.Fields = append(reply.Fields, NewField(FieldQuotingMsg, t.GetField(FieldQuotingMsg).Data)) } - id, err := byteToInt(ID.Data) - if err != nil { - return res, errors.New("invalid client ID") - } - otherClient, ok := cc.Server.Clients[uint16(id)] - if !ok { - return res, errors.New("invalid client ID") + otherClient := cc.Server.ClientMgr.Get([2]byte(userID.Data)) + if otherClient == nil { + return res } // Check if target user has "Refuse private messages" flag - flagBitmap := big.NewInt(int64(binary.BigEndian.Uint16(otherClient.Flags))) - if flagBitmap.Bit(UserFlagRefusePM) == 1 { + if otherClient.Flags.IsSet(UserFlagRefusePM) { res = append(res, - *NewTransaction( + NewTransaction( TranServerMsg, cc.ID, NewField(FieldData, []byte(string(otherClient.UserName)+" does not accept private messages.")), NewField(FieldUserName, otherClient.UserName), - NewField(FieldUserID, *otherClient.ID), + NewField(FieldUserID, otherClient.ID[:]), NewField(FieldOptions, []byte{0, 2}), ), ) } else { - res = append(res, *reply) + res = append(res, reply) } // Respond with auto reply if other client has it enabled if len(otherClient.AutoReply) > 0 { res = append(res, - *NewTransaction( + NewTransaction( TranServerMsg, cc.ID, NewField(FieldData, otherClient.AutoReply), NewField(FieldUserName, otherClient.UserName), - NewField(FieldUserID, *otherClient.ID), + NewField(FieldUserID, otherClient.ID[:]), NewField(FieldOptions, []byte{0, 1}), ), ) } - res = append(res, cc.NewReply(t)) - - return res, err + return append(res, cc.NewReply(t)) } -func HandleGetFileInfo(cc *ClientConn, t *Transaction) (res []Transaction, err error) { +var fileTypeFLDR = [4]byte{0x66, 0x6c, 0x64, 0x72} + +func HandleGetFileInfo(cc *ClientConn, t *Transaction) (res []Transaction) { fileName := t.GetField(FieldFileName).Data filePath := t.GetField(FieldFilePath).Data fullFilePath, err := readPath(cc.Server.Config.FileRoot, filePath, fileName) if err != nil { - return res, err + return res } fw, err := newFileWrapper(cc.Server.FS, fullFilePath, 0) if err != nil { - return res, err + return res } encodedName, err := txtEncoder.String(fw.name) if err != nil { - return res, fmt.Errorf("invalid filepath encoding: %w", err) + return res } fields := []Field{ NewField(FieldFileName, []byte(encodedName)), NewField(FieldFileTypeString, fw.ffo.FlatFileInformationFork.friendlyType()), NewField(FieldFileCreatorString, fw.ffo.FlatFileInformationFork.friendlyCreator()), - NewField(FieldFileType, fw.ffo.FlatFileInformationFork.TypeSignature), - NewField(FieldFileCreateDate, fw.ffo.FlatFileInformationFork.CreateDate), - NewField(FieldFileModifyDate, fw.ffo.FlatFileInformationFork.ModifyDate), + NewField(FieldFileType, fw.ffo.FlatFileInformationFork.TypeSignature[:]), + NewField(FieldFileCreateDate, fw.ffo.FlatFileInformationFork.CreateDate[:]), + NewField(FieldFileModifyDate, fw.ffo.FlatFileInformationFork.ModifyDate[:]), } // Include the optional FileComment field if there is a comment. @@ -405,69 +232,67 @@ func HandleGetFileInfo(cc *ClientConn, t *Transaction) (res []Transaction, err e } // Include the FileSize field for files. - if !bytes.Equal(fw.ffo.FlatFileInformationFork.TypeSignature, []byte{0x66, 0x6c, 0x64, 0x72}) { + if fw.ffo.FlatFileInformationFork.TypeSignature != fileTypeFLDR { fields = append(fields, NewField(FieldFileSize, fw.totalSize())) } res = append(res, cc.NewReply(t, fields...)) - return res, err + return res } -// HandleSetFileInfo updates a file or folder name and/or comment from the Get Info window +// HandleSetFileInfo updates a file or folder Name and/or comment from the Get Info window // Fields used in the request: -// * 201 File name +// * 201 File Name // * 202 File path Optional -// * 211 File new name Optional +// * 211 File new Name Optional // * 210 File comment Optional // Fields used in the reply: None -func HandleSetFileInfo(cc *ClientConn, t *Transaction) (res []Transaction, err error) { +func HandleSetFileInfo(cc *ClientConn, t *Transaction) (res []Transaction) { fileName := t.GetField(FieldFileName).Data filePath := t.GetField(FieldFilePath).Data fullFilePath, err := readPath(cc.Server.Config.FileRoot, filePath, fileName) if err != nil { - return res, err + return res } fi, err := cc.Server.FS.Stat(fullFilePath) if err != nil { - return res, err + return res } hlFile, err := newFileWrapper(cc.Server.FS, fullFilePath, 0) if err != nil { - return res, err + return res } if t.GetField(FieldFileComment).Data != nil { switch mode := fi.Mode(); { case mode.IsDir(): - if !cc.Authorize(accessSetFolderComment) { - res = append(res, cc.NewErrReply(t, "You are not allowed to set comments for folders.")) - return res, err + if !cc.Authorize(AccessSetFolderComment) { + return cc.NewErrReply(t, "You are not allowed to set comments for folders.") } case mode.IsRegular(): - if !cc.Authorize(accessSetFileComment) { - res = append(res, cc.NewErrReply(t, "You are not allowed to set comments for files.")) - return res, err + if !cc.Authorize(AccessSetFileComment) { + return cc.NewErrReply(t, "You are not allowed to set comments for files.") } } if err := hlFile.ffo.FlatFileInformationFork.setComment(t.GetField(FieldFileComment).Data); err != nil { - return res, err + return res } w, err := hlFile.infoForkWriter() if err != nil { - return res, err + return res } - _, err = w.Write(hlFile.ffo.FlatFileInformationFork.MarshalBinary()) + _, err = io.Copy(w, &hlFile.ffo.FlatFileInformationFork) if err != nil { - return res, err + return res } } fullNewFilePath, err := readPath(cc.Server.Config.FileRoot, filePath, t.GetField(FieldFileNewName).Data) if err != nil { - return nil, err + return nil } fileNewName := t.GetField(FieldFileNewName).Data @@ -475,141 +300,131 @@ func HandleSetFileInfo(cc *ClientConn, t *Transaction) (res []Transaction, err e if fileNewName != nil { switch mode := fi.Mode(); { case mode.IsDir(): - if !cc.Authorize(accessRenameFolder) { - res = append(res, cc.NewErrReply(t, "You are not allowed to rename folders.")) - return res, err + if !cc.Authorize(AccessRenameFolder) { + return cc.NewErrReply(t, "You are not allowed to rename folders.") } err = os.Rename(fullFilePath, fullNewFilePath) if os.IsNotExist(err) { - res = append(res, cc.NewErrReply(t, "Cannot rename folder "+string(fileName)+" because it does not exist or cannot be found.")) - return res, err + return cc.NewErrReply(t, "Cannot rename folder "+string(fileName)+" because it does not exist or cannot be found.") + } case mode.IsRegular(): - if !cc.Authorize(accessRenameFile) { - res = append(res, cc.NewErrReply(t, "You are not allowed to rename files.")) - return res, err + if !cc.Authorize(AccessRenameFile) { + return cc.NewErrReply(t, "You are not allowed to rename files.") } fileDir, err := readPath(cc.Server.Config.FileRoot, filePath, []byte{}) if err != nil { - return nil, err + return nil } hlFile.name, err = txtDecoder.String(string(fileNewName)) if err != nil { - return res, fmt.Errorf("invalid filepath encoding: %w", err) + return res } err = hlFile.move(fileDir) if os.IsNotExist(err) { - res = append(res, cc.NewErrReply(t, "Cannot rename file "+string(fileName)+" because it does not exist or cannot be found.")) - return res, err + return cc.NewErrReply(t, "Cannot rename file "+string(fileName)+" because it does not exist or cannot be found.") } if err != nil { - return res, err + return res } } } res = append(res, cc.NewReply(t)) - return res, err + return res } // HandleDeleteFile deletes a file or folder // Fields used in the request: -// * 201 File name +// * 201 File Name // * 202 File path // Fields used in the reply: none -func HandleDeleteFile(cc *ClientConn, t *Transaction) (res []Transaction, err error) { +func HandleDeleteFile(cc *ClientConn, t *Transaction) (res []Transaction) { fileName := t.GetField(FieldFileName).Data filePath := t.GetField(FieldFilePath).Data fullFilePath, err := readPath(cc.Server.Config.FileRoot, filePath, fileName) if err != nil { - return res, err + return res } hlFile, err := newFileWrapper(cc.Server.FS, fullFilePath, 0) if err != nil { - return res, err + return res } fi, err := hlFile.dataFile() if err != nil { - res = append(res, cc.NewErrReply(t, "Cannot delete file "+string(fileName)+" because it does not exist or cannot be found.")) - return res, nil + return cc.NewErrReply(t, "Cannot delete file "+string(fileName)+" because it does not exist or cannot be found.") } switch mode := fi.Mode(); { case mode.IsDir(): - if !cc.Authorize(accessDeleteFolder) { - res = append(res, cc.NewErrReply(t, "You are not allowed to delete folders.")) - return res, err + if !cc.Authorize(AccessDeleteFolder) { + return cc.NewErrReply(t, "You are not allowed to delete folders.") } case mode.IsRegular(): - if !cc.Authorize(accessDeleteFile) { - res = append(res, cc.NewErrReply(t, "You are not allowed to delete files.")) - return res, err + if !cc.Authorize(AccessDeleteFile) { + return cc.NewErrReply(t, "You are not allowed to delete files.") } } if err := hlFile.delete(); err != nil { - return res, err + return res } res = append(res, cc.NewReply(t)) - return res, err + return res } // HandleMoveFile moves files or folders. Note: seemingly not documented -func HandleMoveFile(cc *ClientConn, t *Transaction) (res []Transaction, err error) { +func HandleMoveFile(cc *ClientConn, t *Transaction) (res []Transaction) { fileName := string(t.GetField(FieldFileName).Data) filePath, err := readPath(cc.Server.Config.FileRoot, t.GetField(FieldFilePath).Data, t.GetField(FieldFileName).Data) if err != nil { - return res, err + return res } fileNewPath, err := readPath(cc.Server.Config.FileRoot, t.GetField(FieldFileNewPath).Data, nil) if err != nil { - return res, err + return res } - cc.logger.Infow("Move file", "src", filePath+"/"+fileName, "dst", fileNewPath+"/"+fileName) + cc.logger.Info("Move file", "src", filePath+"/"+fileName, "dst", fileNewPath+"/"+fileName) hlFile, err := newFileWrapper(cc.Server.FS, filePath, 0) if err != nil { - return res, err + return res } fi, err := hlFile.dataFile() if err != nil { - res = append(res, cc.NewErrReply(t, "Cannot delete file "+fileName+" because it does not exist or cannot be found.")) - return res, err + return cc.NewErrReply(t, "Cannot delete file "+fileName+" because it does not exist or cannot be found.") } switch mode := fi.Mode(); { case mode.IsDir(): - if !cc.Authorize(accessMoveFolder) { - res = append(res, cc.NewErrReply(t, "You are not allowed to move folders.")) - return res, err + if !cc.Authorize(AccessMoveFolder) { + return cc.NewErrReply(t, "You are not allowed to move folders.") } case mode.IsRegular(): - if !cc.Authorize(accessMoveFile) { - res = append(res, cc.NewErrReply(t, "You are not allowed to move files.")) - return res, err + if !cc.Authorize(AccessMoveFile) { + return cc.NewErrReply(t, "You are not allowed to move files.") } } if err := hlFile.move(fileNewPath); err != nil { - return res, err + return res } // TODO: handle other possible errors; e.g. fileWrapper delete fails due to fileWrapper permission issue res = append(res, cc.NewReply(t)) - return res, err + return res } -func HandleNewFolder(cc *ClientConn, t *Transaction) (res []Transaction, err error) { - if !cc.Authorize(accessCreateFolder) { - res = append(res, cc.NewErrReply(t, "You are not allowed to create folders.")) - return res, err +func HandleNewFolder(cc *ClientConn, t *Transaction) (res []Transaction) { + if !cc.Authorize(AccessCreateFolder) { + return cc.NewErrReply(t, "You are not allowed to create folders.") } folderName := string(t.GetField(FieldFileName).Data) @@ -622,7 +437,7 @@ func HandleNewFolder(cc *ClientConn, t *Transaction) (res []Transaction, err err var newFp FilePath _, err := newFp.Write(t.GetField(FieldFilePath).Data) if err != nil { - return nil, err + return res } for _, pathItem := range newFp.Items { @@ -630,41 +445,39 @@ func HandleNewFolder(cc *ClientConn, t *Transaction) (res []Transaction, err err } } newFolderPath := path.Join(cc.Server.Config.FileRoot, subPath, folderName) - newFolderPath, err = txtDecoder.String(newFolderPath) + newFolderPath, err := txtDecoder.String(newFolderPath) if err != nil { - return res, fmt.Errorf("invalid filepath encoding: %w", err) + return res } - // TODO: check path and folder name lengths + // TODO: check path and folder Name lengths if _, err := cc.Server.FS.Stat(newFolderPath); !os.IsNotExist(err) { - msg := fmt.Sprintf("Cannot create folder \"%s\" because there is already a file or folder with that name.", folderName) - return []Transaction{cc.NewErrReply(t, msg)}, nil + msg := fmt.Sprintf("Cannot create folder \"%s\" because there is already a file or folder with that Name.", folderName) + return cc.NewErrReply(t, msg) } if err := cc.Server.FS.Mkdir(newFolderPath, 0777); err != nil { msg := fmt.Sprintf("Cannot create folder \"%s\" because an error occurred.", folderName) - return []Transaction{cc.NewErrReply(t, msg)}, nil + return cc.NewErrReply(t, msg) } - res = append(res, cc.NewReply(t)) - return res, err + return append(res, cc.NewReply(t)) } -func HandleSetUser(cc *ClientConn, t *Transaction) (res []Transaction, err error) { - if !cc.Authorize(accessModifyUser) { - res = append(res, cc.NewErrReply(t, "You are not allowed to modify accounts.")) - return res, err +func HandleSetUser(cc *ClientConn, t *Transaction) (res []Transaction) { + if !cc.Authorize(AccessModifyUser) { + return cc.NewErrReply(t, "You are not allowed to modify accounts.") } - login := decodeString(t.GetField(FieldUserLogin).Data) + login := t.GetField(FieldUserLogin).DecodeObfuscatedString() userName := string(t.GetField(FieldUserName).Data) newAccessLvl := t.GetField(FieldUserAccess).Data - account := cc.Server.Accounts[login] + account := cc.Server.AccountManager.Get(login) if account == nil { - return append(res, cc.NewErrReply(t, "Account not found.")), nil + return cc.NewErrReply(t, "Account not found.") } account.Name = userName copy(account.Access[:], newAccessLvl) @@ -679,85 +492,73 @@ func HandleSetUser(cc *ClientConn, t *Transaction) (res []Transaction, err error account.Password = hashAndSalt(t.GetField(FieldUserPassword).Data) } - out, err := yaml.Marshal(&account) + err := cc.Server.AccountManager.Update(*account, account.Login) if err != nil { - return res, err - } - if err := os.WriteFile(filepath.Join(cc.Server.ConfigDir, "Users", login+".yaml"), out, 0666); err != nil { - return res, err + cc.logger.Error("Error updating account", "Err", err) } // Notify connected clients logged in as the user of the new access level - for _, c := range cc.Server.Clients { + for _, c := range cc.Server.ClientMgr.List() { if c.Account.Login == login { - // Note: comment out these two lines to test server-side deny messages newT := NewTransaction(TranUserAccess, c.ID, NewField(FieldUserAccess, newAccessLvl)) - res = append(res, *newT) + res = append(res, newT) - flagBitmap := big.NewInt(int64(binary.BigEndian.Uint16(c.Flags))) - if c.Authorize(accessDisconUser) { - flagBitmap.SetBit(flagBitmap, UserFlagAdmin, 1) + if c.Authorize(AccessDisconUser) { + c.Flags.Set(UserFlagAdmin, 1) } else { - flagBitmap.SetBit(flagBitmap, UserFlagAdmin, 0) + c.Flags.Set(UserFlagAdmin, 0) } - binary.BigEndian.PutUint16(c.Flags, uint16(flagBitmap.Int64())) c.Account.Access = account.Access - cc.sendAll( + cc.SendAll( TranNotifyChangeUser, - NewField(FieldUserID, *c.ID), - NewField(FieldUserFlags, c.Flags), + NewField(FieldUserID, c.ID[:]), + NewField(FieldUserFlags, c.Flags[:]), NewField(FieldUserName, c.UserName), NewField(FieldUserIconID, c.Icon), ) } } - res = append(res, cc.NewReply(t)) - return res, err + return append(res, cc.NewReply(t)) } -func HandleGetUser(cc *ClientConn, t *Transaction) (res []Transaction, err error) { - if !cc.Authorize(accessOpenUser) { - res = append(res, cc.NewErrReply(t, "You are not allowed to view accounts.")) - return res, err +func HandleGetUser(cc *ClientConn, t *Transaction) (res []Transaction) { + if !cc.Authorize(AccessOpenUser) { + return cc.NewErrReply(t, "You are not allowed to view accounts.") } - account := cc.Server.Accounts[string(t.GetField(FieldUserLogin).Data)] + account := cc.Server.AccountManager.Get(string(t.GetField(FieldUserLogin).Data)) if account == nil { - res = append(res, cc.NewErrReply(t, "Account does not exist.")) - return res, err + return cc.NewErrReply(t, "Account does not exist.") } - res = append(res, cc.NewReply(t, + return append(res, cc.NewReply(t, NewField(FieldUserName, []byte(account.Name)), NewField(FieldUserLogin, encodeString(t.GetField(FieldUserLogin).Data)), NewField(FieldUserPassword, []byte(account.Password)), NewField(FieldUserAccess, account.Access[:]), )) - return res, err } -func HandleListUsers(cc *ClientConn, t *Transaction) (res []Transaction, err error) { - if !cc.Authorize(accessOpenUser) { - res = append(res, cc.NewErrReply(t, "You are not allowed to view accounts.")) - return res, err +func HandleListUsers(cc *ClientConn, t *Transaction) (res []Transaction) { + if !cc.Authorize(AccessOpenUser) { + return cc.NewErrReply(t, "You are not allowed to view accounts.") } var userFields []Field - for _, acc := range cc.Server.Accounts { - b := make([]byte, 0, 100) - n, err := acc.Read(b) + for _, acc := range cc.Server.AccountManager.List() { + b, err := io.ReadAll(&acc) if err != nil { - return res, err + cc.logger.Error("Error reading account", "Account", acc.Login, "Err", err) + continue } - userFields = append(userFields, NewField(FieldData, b[:n])) + userFields = append(userFields, NewField(FieldData, b)) } - res = append(res, cc.NewReply(t, userFields...)) - return res, err + return append(res, cc.NewReply(t, userFields...)) } // HandleUpdateUser is used by the v1.5+ multi-user editor to perform account editing for multiple users at a time. @@ -769,38 +570,86 @@ func HandleListUsers(cc *ClientConn, t *Transaction) (res []Transaction, err err // The Transaction sent by the client includes one data field per user that was modified. This data field in turn // contains another data field encoded in its payload with a varying number of sub fields depending on which action is // performed. This seems to be the only place in the Hotline protocol where a data field contains another data field. -func HandleUpdateUser(cc *ClientConn, t *Transaction) (res []Transaction, err error) { +func HandleUpdateUser(cc *ClientConn, t *Transaction) (res []Transaction) { for _, field := range t.Fields { - subFields, err := ReadFields(field.Data[0:2], field.Data[2:]) - if err != nil { - return res, err + var subFields []Field + + // Create a new scanner for parsing incoming bytes into transaction tokens + scanner := bufio.NewScanner(bytes.NewReader(field.Data[2:])) + scanner.Split(fieldScanner) + + for i := 0; i < int(binary.BigEndian.Uint16(field.Data[0:2])); i++ { + scanner.Scan() + + var field Field + if _, err := field.Write(scanner.Bytes()); err != nil { + return res + } + subFields = append(subFields, field) } + // If there's only one subfield, that indicates this is a delete operation for the login in FieldData if len(subFields) == 1 { - login := decodeString(getField(FieldData, &subFields).Data) - cc.logger.Infow("DeleteUser", "login", login) + if !cc.Authorize(AccessDeleteUser) { + return cc.NewErrReply(t, "You are not allowed to delete accounts.") + } + + login := string(encodeString(getField(FieldData, &subFields).Data)) - if !cc.Authorize(accessDeleteUser) { - res = append(res, cc.NewErrReply(t, "You are not allowed to delete accounts.")) - return res, err + cc.logger.Info("DeleteUser", "login", login) + + if err := cc.Server.AccountManager.Delete(login); err != nil { + cc.logger.Error("Error deleting account", "Err", err) + return res } - if err := cc.Server.DeleteUser(login); err != nil { - return res, err + for _, client := range cc.Server.ClientMgr.List() { + if client.Account.Login == login { + // "You are logged in with an account which was deleted." + + res = append(res, + NewTransaction(TranServerMsg, [2]byte{}, + NewField(FieldData, []byte("You are logged in with an account which was deleted.")), + NewField(FieldChatOptions, []byte{0}), + ), + ) + + go func(c *ClientConn) { + time.Sleep(3 * time.Second) + c.Disconnect() + }(client) + } } + continue } - login := decodeString(getField(FieldUserLogin, &subFields).Data) + // login of the account to update + var accountToUpdate, loginToRename string - // check if the login dataFile; if so, we know we are updating an existing user - if acc, ok := cc.Server.Accounts[login]; ok { - cc.logger.Infow("UpdateUser", "login", login) + // If FieldData is included, this is a rename operation where FieldData contains the login of the existing + // account and FieldUserLogin contains the new login. + if getField(FieldData, &subFields) != nil { + loginToRename = string(encodeString(getField(FieldData, &subFields).Data)) + } + userLogin := string(encodeString(getField(FieldUserLogin, &subFields).Data)) + if loginToRename != "" { + accountToUpdate = loginToRename + } else { + accountToUpdate = userLogin + } - // account exists, so this is an update action - if !cc.Authorize(accessModifyUser) { - res = append(res, cc.NewErrReply(t, "You are not allowed to modify accounts.")) - return res, nil + // Check if accountToUpdate has an existing account. If so, we know we are updating an existing user. + if acc := cc.Server.AccountManager.Get(accountToUpdate); acc != nil { + if loginToRename != "" { + cc.logger.Info("RenameUser", "prevLogin", accountToUpdate, "newLogin", userLogin) + } else { + cc.logger.Info("UpdateUser", "login", accountToUpdate) + } + + // Account exists, so this is an update action. + if !cc.Authorize(AccessModifyUser) { + return cc.NewErrReply(t, "You are not allowed to modify accounts.") } // This part is a bit tricky. There are three possibilities: @@ -823,24 +672,20 @@ func HandleUpdateUser(cc *ClientConn, t *Transaction) (res []Transaction, err er copy(acc.Access[:], getField(FieldUserAccess, &subFields).Data) } - err = cc.Server.UpdateUser( - decodeString(getField(FieldData, &subFields).Data), - decodeString(getField(FieldUserLogin, &subFields).Data), - string(getField(FieldUserName, &subFields).Data), - acc.Password, - acc.Access, - ) + acc.Name = string(getField(FieldUserName, &subFields).Data) + + err := cc.Server.AccountManager.Update(*acc, string(encodeString(getField(FieldUserLogin, &subFields).Data))) + if err != nil { - return res, err + return res } } else { - cc.logger.Infow("CreateUser", "login", login) - - if !cc.Authorize(accessCreateUser) { - res = append(res, cc.NewErrReply(t, "You are not allowed to create new accounts.")) - return res, nil + if !cc.Authorize(AccessCreateUser) { + return cc.NewErrReply(t, "You are not allowed to create new accounts.") } + cc.logger.Info("CreateUser", "login", userLogin) + newAccess := accessBitmap{} copy(newAccess[:], getField(FieldUserAccess, &subFields).Data) @@ -848,129 +693,152 @@ func HandleUpdateUser(cc *ClientConn, t *Transaction) (res []Transaction, err er for i := 0; i < 64; i++ { if newAccess.IsSet(i) { if !cc.Authorize(i) { - return append(res, cc.NewErrReply(t, "Cannot create account with more access than yourself.")), nil + return cc.NewErrReply(t, "Cannot create account with more access than yourself.") } } } - err = cc.Server.NewUser(login, string(getField(FieldUserName, &subFields).Data), string(getField(FieldUserPassword, &subFields).Data), newAccess) + account := NewAccount(userLogin, string(getField(FieldUserName, &subFields).Data), string(getField(FieldUserPassword, &subFields).Data), newAccess) + + err := cc.Server.AccountManager.Create(*account) if err != nil { - return append(res, cc.NewErrReply(t, "Cannot create account because there is already an account with that login.")), nil + return cc.NewErrReply(t, "Cannot create account because there is already an account with that login.") } } } - res = append(res, cc.NewReply(t)) - return res, err + return append(res, cc.NewReply(t)) } // HandleNewUser creates a new user account -func HandleNewUser(cc *ClientConn, t *Transaction) (res []Transaction, err error) { - if !cc.Authorize(accessCreateUser) { - res = append(res, cc.NewErrReply(t, "You are not allowed to create new accounts.")) - return res, err +func HandleNewUser(cc *ClientConn, t *Transaction) (res []Transaction) { + if !cc.Authorize(AccessCreateUser) { + return cc.NewErrReply(t, "You are not allowed to create new accounts.") } - login := decodeString(t.GetField(FieldUserLogin).Data) + login := t.GetField(FieldUserLogin).DecodeObfuscatedString() - // If the account already dataFile, reply with an error - if _, ok := cc.Server.Accounts[login]; ok { - res = append(res, cc.NewErrReply(t, "Cannot create account "+login+" because there is already an account with that login.")) - return res, err + // If the account already exists, reply with an error. + if account := cc.Server.AccountManager.Get(login); account != nil { + return cc.NewErrReply(t, "Cannot create account "+login+" because there is already an account with that login.") } - newAccess := accessBitmap{} + var newAccess accessBitmap copy(newAccess[:], t.GetField(FieldUserAccess).Data) // Prevent account from creating new account with greater permission for i := 0; i < 64; i++ { if newAccess.IsSet(i) { if !cc.Authorize(i) { - res = append(res, cc.NewErrReply(t, "Cannot create account with more access than yourself.")) - return res, err + return cc.NewErrReply(t, "Cannot create account with more access than yourself.") } } } - if err := cc.Server.NewUser(login, string(t.GetField(FieldUserName).Data), string(t.GetField(FieldUserPassword).Data), newAccess); err != nil { - res = append(res, cc.NewErrReply(t, "Cannot create account because there is already an account with that login.")) - return res, err + account := NewAccount(login, string(t.GetField(FieldUserName).Data), string(t.GetField(FieldUserPassword).Data), newAccess) + + err := cc.Server.AccountManager.Create(*account) + if err != nil { + return cc.NewErrReply(t, "Cannot create account because there is already an account with that login.") } - res = append(res, cc.NewReply(t)) - return res, err + return append(res, cc.NewReply(t)) } -func HandleDeleteUser(cc *ClientConn, t *Transaction) (res []Transaction, err error) { - if !cc.Authorize(accessDeleteUser) { - res = append(res, cc.NewErrReply(t, "You are not allowed to delete accounts.")) - return res, nil +func HandleDeleteUser(cc *ClientConn, t *Transaction) (res []Transaction) { + if !cc.Authorize(AccessDeleteUser) { + return cc.NewErrReply(t, "You are not allowed to delete accounts.") } - login := decodeString(t.GetField(FieldUserLogin).Data) + login := t.GetField(FieldUserLogin).DecodeObfuscatedString() - if err := cc.Server.DeleteUser(login); err != nil { - return res, err + if err := cc.Server.AccountManager.Delete(login); err != nil { + cc.logger.Error("Error deleting account", "Err", err) + return res } - res = append(res, cc.NewReply(t)) - return res, err + for _, client := range cc.Server.ClientMgr.List() { + if client.Account.Login == login { + res = append(res, + NewTransaction(TranServerMsg, client.ID, + NewField(FieldData, []byte("You are logged in with an account which was deleted.")), + NewField(FieldChatOptions, []byte{2}), + ), + ) + + go func(c *ClientConn) { + time.Sleep(2 * time.Second) + c.Disconnect() + }(client) + } + } + + return append(res, cc.NewReply(t)) } // HandleUserBroadcast sends an Administrator Message to all connected clients of the server -func HandleUserBroadcast(cc *ClientConn, t *Transaction) (res []Transaction, err error) { - if !cc.Authorize(accessBroadcast) { - res = append(res, cc.NewErrReply(t, "You are not allowed to send broadcast messages.")) - return res, err +func HandleUserBroadcast(cc *ClientConn, t *Transaction) (res []Transaction) { + if !cc.Authorize(AccessBroadcast) { + return cc.NewErrReply(t, "You are not allowed to send broadcast messages.") } - cc.sendAll( + cc.SendAll( TranServerMsg, - NewField(FieldData, t.GetField(TranGetMsgs).Data), + NewField(FieldData, t.GetField(FieldData).Data), NewField(FieldChatOptions, []byte{0}), ) - res = append(res, cc.NewReply(t)) - return res, err + return append(res, cc.NewReply(t)) } // HandleGetClientInfoText returns user information for the specific user. // // Fields used in the request: -// 103 User ID +// 103 User Type // // Fields used in the reply: -// 102 User name +// 102 User Name // 101 Data User info text string -func HandleGetClientInfoText(cc *ClientConn, t *Transaction) (res []Transaction, err error) { - if !cc.Authorize(accessGetClientInfo) { - res = append(res, cc.NewErrReply(t, "You are not allowed to get client info.")) - return res, err +func HandleGetClientInfoText(cc *ClientConn, t *Transaction) (res []Transaction) { + if !cc.Authorize(AccessGetClientInfo) { + return cc.NewErrReply(t, "You are not allowed to get client info.") } - clientID, _ := byteToInt(t.GetField(FieldUserID).Data) + clientID := t.GetField(FieldUserID).Data - clientConn := cc.Server.Clients[uint16(clientID)] + clientConn := cc.Server.ClientMgr.Get(ClientID(clientID)) if clientConn == nil { - return append(res, cc.NewErrReply(t, "User not found.")), err + return cc.NewErrReply(t, "User not found.") } - res = append(res, cc.NewReply(t, + return append(res, cc.NewReply(t, NewField(FieldData, []byte(clientConn.String())), NewField(FieldUserName, clientConn.UserName), )) - return res, err } -func HandleGetUserNameList(cc *ClientConn, t *Transaction) (res []Transaction, err error) { - res = append(res, cc.NewReply(t, cc.Server.connectedUsers()...)) +func HandleGetUserNameList(cc *ClientConn, t *Transaction) (res []Transaction) { + var fields []Field + for _, c := range cc.Server.ClientMgr.List() { + b, err := io.ReadAll(&User{ + ID: c.ID, + Icon: c.Icon, + Flags: c.Flags[:], + Name: string(c.UserName), + }) + if err != nil { + return nil + } + + fields = append(fields, NewField(FieldUsernameWithInfo, b)) + } - return res, err + return []Transaction{cc.NewReply(t, fields...)} } -func HandleTranAgreed(cc *ClientConn, t *Transaction) (res []Transaction, err error) { +func HandleTranAgreed(cc *ClientConn, t *Transaction) (res []Transaction) { if t.GetField(FieldUserName).Data != nil { - if cc.Authorize(accessAnyName) { + if cc.Authorize(AccessAnyName) { cc.UserName = t.GetField(FieldUserName).Data } else { cc.UserName = []byte(cc.Account.Name) @@ -979,65 +847,54 @@ func HandleTranAgreed(cc *ClientConn, t *Transaction) (res []Transaction, err er cc.Icon = t.GetField(FieldUserIconID).Data - cc.logger = cc.logger.With("name", string(cc.UserName)) - cc.logger.Infow("Login successful", "clientVersion", fmt.Sprintf("%v", func() int { i, _ := byteToInt(cc.Version); return i }())) + cc.logger = cc.logger.With("Name", string(cc.UserName)) + cc.logger.Info("Login successful") options := t.GetField(FieldOptions).Data optBitmap := big.NewInt(int64(binary.BigEndian.Uint16(options))) - flagBitmap := big.NewInt(int64(binary.BigEndian.Uint16(cc.Flags))) - // Check refuse private PM option - if optBitmap.Bit(refusePM) == 1 { - flagBitmap.SetBit(flagBitmap, UserFlagRefusePM, 1) - binary.BigEndian.PutUint16(cc.Flags, uint16(flagBitmap.Int64())) - } + + cc.flagsMU.Lock() + defer cc.flagsMU.Unlock() + cc.Flags.Set(UserFlagRefusePM, optBitmap.Bit(UserOptRefusePM)) // Check refuse private chat option - if optBitmap.Bit(refuseChat) == 1 { - flagBitmap.SetBit(flagBitmap, UserFlagRefusePChat, 1) - binary.BigEndian.PutUint16(cc.Flags, uint16(flagBitmap.Int64())) - } + cc.Flags.Set(UserFlagRefusePChat, optBitmap.Bit(UserOptRefuseChat)) // Check auto response - if optBitmap.Bit(autoResponse) == 1 { + if optBitmap.Bit(UserOptAutoResponse) == 1 { cc.AutoReply = t.GetField(FieldAutomaticResponse).Data - } else { - cc.AutoReply = []byte{} } - trans := cc.notifyOthers( - *NewTransaction( - TranNotifyChangeUser, nil, + trans := cc.NotifyOthers( + NewTransaction( + TranNotifyChangeUser, [2]byte{0, 0}, NewField(FieldUserName, cc.UserName), - NewField(FieldUserID, *cc.ID), + NewField(FieldUserID, cc.ID[:]), NewField(FieldUserIconID, cc.Icon), - NewField(FieldUserFlags, cc.Flags), + NewField(FieldUserFlags, cc.Flags[:]), ), ) res = append(res, trans...) if cc.Server.Config.BannerFile != "" { - res = append(res, *NewTransaction(TranServerBanner, cc.ID, NewField(FieldBannerType, []byte("JPEG")))) + res = append(res, NewTransaction(TranServerBanner, cc.ID, NewField(FieldBannerType, []byte("JPEG")))) } res = append(res, cc.NewReply(t)) - return res, err + return res } // HandleTranOldPostNews updates the flat news // Fields used in this request: // 101 Data -func HandleTranOldPostNews(cc *ClientConn, t *Transaction) (res []Transaction, err error) { - if !cc.Authorize(accessNewsPostArt) { - res = append(res, cc.NewErrReply(t, "You are not allowed to post news.")) - return res, err +func HandleTranOldPostNews(cc *ClientConn, t *Transaction) (res []Transaction) { + if !cc.Authorize(AccessNewsPostArt) { + return cc.NewErrReply(t, "You are not allowed to post news.") } - cc.Server.flatNewsMux.Lock() - defer cc.Server.flatNewsMux.Unlock() - newsDateTemplate := defaultNewsDateFormat if cc.Server.Config.NewsDateFormat != "" { newsDateTemplate = cc.Server.Config.NewsDateFormat @@ -1051,35 +908,31 @@ func HandleTranOldPostNews(cc *ClientConn, t *Transaction) (res []Transaction, e newsPost := fmt.Sprintf(newsTemplate+"\r", cc.UserName, time.Now().Format(newsDateTemplate), t.GetField(FieldData).Data) newsPost = strings.ReplaceAll(newsPost, "\n", "\r") - // update news in memory - cc.Server.FlatNews = append([]byte(newsPost), cc.Server.FlatNews...) - - // update news on disk - if err := cc.Server.FS.WriteFile(filepath.Join(cc.Server.ConfigDir, "MessageBoard.txt"), cc.Server.FlatNews, 0644); err != nil { - return res, err + _, err := cc.Server.MessageBoard.Write([]byte(newsPost)) + if err != nil { + cc.logger.Error("error writing news post", "err", err) + return nil } // Notify all clients of updated news - cc.sendAll( + cc.SendAll( TranNewMsg, NewField(FieldData, []byte(newsPost)), ) - res = append(res, cc.NewReply(t)) - return res, err + return append(res, cc.NewReply(t)) } -func HandleDisconnectUser(cc *ClientConn, t *Transaction) (res []Transaction, err error) { - if !cc.Authorize(accessDisconUser) { - res = append(res, cc.NewErrReply(t, "You are not allowed to disconnect users.")) - return res, err +func HandleDisconnectUser(cc *ClientConn, t *Transaction) (res []Transaction) { + if !cc.Authorize(AccessDisconUser) { + return cc.NewErrReply(t, "You are not allowed to disconnect users.") } - clientConn := cc.Server.Clients[binary.BigEndian.Uint16(t.GetField(FieldUserID).Data)] + clientID := [2]byte(t.GetField(FieldUserID).Data) + clientConn := cc.Server.ClientMgr.Get(clientID) - if clientConn.Authorize(accessCannotBeDiscon) { - res = append(res, cc.NewErrReply(t, clientConn.Account.Login+" is not allowed to be disconnected.")) - return res, err + if clientConn.Authorize(AccessCannotBeDiscon) { + return cc.NewErrReply(t, clientConn.Account.Login+" is not allowed to be disconnected.") } // If FieldOptions is set, then the client IP is banned in addition to disconnected. @@ -1089,9 +942,9 @@ func HandleDisconnectUser(cc *ClientConn, t *Transaction) (res []Transaction, er 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)) + cc.logger.Info("Disconnect & temporarily ban " + string(clientConn.UserName)) - res = append(res, *NewTransaction( + res = append(res, NewTransaction( TranServerMsg, clientConn.ID, NewField(FieldData, []byte("You are temporarily banned on this server")), @@ -1099,24 +952,30 @@ func HandleDisconnectUser(cc *ClientConn, t *Transaction) (res []Transaction, er )) banUntil := time.Now().Add(tempBanDuration) - cc.Server.banList[strings.Split(clientConn.RemoteAddr, ":")[0]] = &banUntil + ip := strings.Split(clientConn.RemoteAddr, ":")[0] + + err := cc.Server.BanList.Add(ip, &banUntil) + if err != nil { + cc.logger.Error("Error saving ban", "err", err) + // TODO + } case 2: // send message: "You are permanently banned on this server" - cc.logger.Infow("Disconnect & ban " + string(clientConn.UserName)) + cc.logger.Info("Disconnect & ban " + string(clientConn.UserName)) - res = append(res, *NewTransaction( + 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 - } + ip := strings.Split(clientConn.RemoteAddr, ":")[0] - err := cc.Server.writeBanList() - if err != nil { - return res, err + err := cc.Server.BanList.Add(ip, nil) + if err != nil { + // TODO + } } } @@ -1126,94 +985,74 @@ func HandleDisconnectUser(cc *ClientConn, t *Transaction) (res []Transaction, er clientConn.Disconnect() }() - return append(res, cc.NewReply(t)), err + return append(res, cc.NewReply(t)) } // HandleGetNewsCatNameList returns a list of news categories for a path // Fields used in the request: // 325 News path (Optional) -func HandleGetNewsCatNameList(cc *ClientConn, t *Transaction) (res []Transaction, err error) { - if !cc.Authorize(accessNewsReadArt) { - res = append(res, cc.NewErrReply(t, "You are not allowed to read news.")) - return res, err - } - - pathStrs := ReadNewsPath(t.GetField(FieldNewsPath).Data) - cats := cc.Server.GetNewsCatByPath(pathStrs) - - // To store the keys in slice in sorted order - keys := make([]string, len(cats)) - i := 0 - for k := range cats { - keys[i] = k - i++ - } - sort.Strings(keys) - - var fieldData []Field - for _, k := range keys { - cat := cats[k] - b, _ := cat.MarshalBinary() - fieldData = append(fieldData, NewField( - FieldNewsCatListData15, - b, - )) +func HandleGetNewsCatNameList(cc *ClientConn, t *Transaction) (res []Transaction) { + if !cc.Authorize(AccessNewsReadArt) { + return cc.NewErrReply(t, "You are not allowed to read news.") + } + + pathStrs, err := t.GetField(FieldNewsPath).DecodeNewsPath() + if err != nil { + + } + + var fields []Field + for _, cat := range cc.Server.ThreadedNewsMgr.GetCategories(pathStrs) { + b, err := io.ReadAll(&cat) + if err != nil { + // TODO + } + + fields = append(fields, NewField(FieldNewsCatListData15, b)) } - res = append(res, cc.NewReply(t, fieldData...)) - return res, err + return append(res, cc.NewReply(t, fields...)) } -func HandleNewNewsCat(cc *ClientConn, t *Transaction) (res []Transaction, err error) { - if !cc.Authorize(accessNewsCreateCat) { - res = append(res, cc.NewErrReply(t, "You are not allowed to create news categories.")) - return res, err +func HandleNewNewsCat(cc *ClientConn, t *Transaction) (res []Transaction) { + if !cc.Authorize(AccessNewsCreateCat) { + return cc.NewErrReply(t, "You are not allowed to create news categories.") } name := string(t.GetField(FieldNewsCatName).Data) - pathStrs := ReadNewsPath(t.GetField(FieldNewsPath).Data) - - cats := cc.Server.GetNewsCatByPath(pathStrs) - cats[name] = NewsCategoryListData15{ - Name: name, - Type: []byte{0, 3}, - Articles: map[uint32]*NewsArtData{}, - SubCats: make(map[string]NewsCategoryListData15), + pathStrs, err := t.GetField(FieldNewsPath).DecodeNewsPath() + if err != nil { + return res } - if err := cc.Server.writeThreadedNews(); err != nil { - return res, err + err = cc.Server.ThreadedNewsMgr.CreateGrouping(pathStrs, name, NewsCategory) + if err != nil { + cc.logger.Error("error creating news category", "err", err) } - res = append(res, cc.NewReply(t)) - return res, err + + return []Transaction{cc.NewReply(t)} } // Fields used in the request: -// 322 News category name +// 322 News category Name // 325 News path -func HandleNewNewsFldr(cc *ClientConn, t *Transaction) (res []Transaction, err error) { - if !cc.Authorize(accessNewsCreateFldr) { - res = append(res, cc.NewErrReply(t, "You are not allowed to create news folders.")) - return res, err +func HandleNewNewsFldr(cc *ClientConn, t *Transaction) (res []Transaction) { + if !cc.Authorize(AccessNewsCreateFldr) { + return cc.NewErrReply(t, "You are not allowed to create news folders.") } name := string(t.GetField(FieldFileName).Data) - pathStrs := ReadNewsPath(t.GetField(FieldNewsPath).Data) - - cc.logger.Infof("Creating new news folder %s", name) - - cats := cc.Server.GetNewsCatByPath(pathStrs) - cats[name] = NewsCategoryListData15{ - Name: name, - Type: []byte{0, 2}, - Articles: map[uint32]*NewsArtData{}, - SubCats: make(map[string]NewsCategoryListData15), + pathStrs, err := t.GetField(FieldNewsPath).DecodeNewsPath() + if err != nil { + return res } - if err := cc.Server.writeThreadedNews(); err != nil { - return res, err + + err = cc.Server.ThreadedNewsMgr.CreateGrouping(pathStrs, name, NewsBundle) + if err != nil { + cc.logger.Error("error creating news bundle", "err", err) } - res = append(res, cc.NewReply(t)) - return res, err + + return append(res, cc.NewReply(t)) } // HandleGetNewsArtData gets the list of article names at the specified news path. @@ -1223,25 +1062,24 @@ func HandleNewNewsFldr(cc *ClientConn, t *Transaction) (res []Transaction, err e // Fields used in the reply: // 321 News article list data Optional -func HandleGetNewsArtNameList(cc *ClientConn, t *Transaction) (res []Transaction, err error) { - if !cc.Authorize(accessNewsReadArt) { - res = append(res, cc.NewErrReply(t, "You are not allowed to read news.")) - return res, err +func HandleGetNewsArtNameList(cc *ClientConn, t *Transaction) (res []Transaction) { + if !cc.Authorize(AccessNewsReadArt) { + return cc.NewErrReply(t, "You are not allowed to read news.") } - pathStrs := ReadNewsPath(t.GetField(FieldNewsPath).Data) - var cat NewsCategoryListData15 - cats := cc.Server.ThreadedNews.Categories - - for _, fp := range pathStrs { - cat = cats[fp] - cats = cats[fp].SubCats + pathStrs, err := t.GetField(FieldNewsPath).DecodeNewsPath() + if err != nil { + return res } - nald := cat.GetNewsArtListData() + nald := cc.Server.ThreadedNewsMgr.ListArticles(pathStrs) + + b, err := io.ReadAll(&nald) + if err != nil { + return res + } - res = append(res, cc.NewReply(t, NewField(FieldNewsArtListData, nald.Payload()))) - return res, err + return append(res, cc.NewReply(t, NewField(FieldNewsArtListData, b))) } // HandleGetNewsArtData requests information about the specific news article. @@ -1249,221 +1087,175 @@ func HandleGetNewsArtNameList(cc *ClientConn, t *Transaction) (res []Transaction // // Request fields // 325 News path -// 326 News article ID +// 326 News article Type // 327 News article data flavor // // Fields used in the reply: // 328 News article title // 329 News article poster // 330 News article date -// 331 Previous article ID -// 332 Next article ID -// 335 Parent article ID -// 336 First child article ID +// 331 Previous article Type +// 332 Next article Type +// 335 Parent article Type +// 336 First child article Type // 327 News article data flavor "Should be “text/plain” // 333 News article data Optional (if data flavor is “text/plain”) -func HandleGetNewsArtData(cc *ClientConn, t *Transaction) (res []Transaction, err error) { - if !cc.Authorize(accessNewsReadArt) { - res = append(res, cc.NewErrReply(t, "You are not allowed to read news.")) - return res, err +func HandleGetNewsArtData(cc *ClientConn, t *Transaction) (res []Transaction) { + if !cc.Authorize(AccessNewsReadArt) { + return cc.NewErrReply(t, "You are not allowed to read news.") } - var cat NewsCategoryListData15 - cats := cc.Server.ThreadedNews.Categories - - for _, fp := range ReadNewsPath(t.GetField(FieldNewsPath).Data) { - cat = cats[fp] - cats = cats[fp].SubCats + newsPath, err := t.GetField(FieldNewsPath).DecodeNewsPath() + if err != nil { + return res } - // The official Hotline clients will send the article ID as 2 bytes if possible, but - // some third party clients such as Frogblast and Heildrun will always send 4 bytes - convertedID, err := byteToInt(t.GetField(FieldNewsArtID).Data) + convertedID, err := t.GetField(FieldNewsArtID).DecodeInt() if err != nil { - return res, err + return res } - art := cat.Articles[uint32(convertedID)] + art := cc.Server.ThreadedNewsMgr.GetArticle(newsPath, uint32(convertedID)) if art == nil { - res = append(res, cc.NewReply(t)) - return res, err + return append(res, cc.NewReply(t)) } res = append(res, cc.NewReply(t, NewField(FieldNewsArtTitle, []byte(art.Title)), NewField(FieldNewsArtPoster, []byte(art.Poster)), - NewField(FieldNewsArtDate, art.Date), - NewField(FieldNewsArtPrevArt, art.PrevArt), - NewField(FieldNewsArtNextArt, art.NextArt), - NewField(FieldNewsArtParentArt, art.ParentArt), - NewField(FieldNewsArt1stChildArt, art.FirstChildArt), + NewField(FieldNewsArtDate, art.Date[:]), + NewField(FieldNewsArtPrevArt, art.PrevArt[:]), + NewField(FieldNewsArtNextArt, art.NextArt[:]), + NewField(FieldNewsArtParentArt, art.ParentArt[:]), + NewField(FieldNewsArt1stChildArt, art.FirstChildArt[:]), NewField(FieldNewsArtDataFlav, []byte("text/plain")), NewField(FieldNewsArtData, []byte(art.Data)), )) - return res, err + return res } -// HandleDelNewsItem deletes an existing threaded news folder or category from the server. +// HandleDelNewsItem deletes a threaded news folder or category. // Fields used in the request: // 325 News path // Fields used in the reply: // None -func HandleDelNewsItem(cc *ClientConn, t *Transaction) (res []Transaction, err error) { - pathStrs := ReadNewsPath(t.GetField(FieldNewsPath).Data) - - cats := cc.Server.ThreadedNews.Categories - delName := pathStrs[len(pathStrs)-1] - if len(pathStrs) > 1 { - for _, fp := range pathStrs[0 : len(pathStrs)-1] { - cats = cats[fp].SubCats - } +func HandleDelNewsItem(cc *ClientConn, t *Transaction) (res []Transaction) { + pathStrs, err := t.GetField(FieldNewsPath).DecodeNewsPath() + if err != nil { + return res } - if bytes.Equal(cats[delName].Type, []byte{0, 3}) { - if !cc.Authorize(accessNewsDeleteCat) { - return append(res, cc.NewErrReply(t, "You are not allowed to delete news categories.")), nil + item := cc.Server.ThreadedNewsMgr.NewsItem(pathStrs) + + if item.Type == [2]byte{0, 3} { + if !cc.Authorize(AccessNewsDeleteCat) { + return cc.NewErrReply(t, "You are not allowed to delete news categories.") } } else { - if !cc.Authorize(accessNewsDeleteFldr) { - return append(res, cc.NewErrReply(t, "You are not allowed to delete news folders.")), nil + if !cc.Authorize(AccessNewsDeleteFldr) { + return cc.NewErrReply(t, "You are not allowed to delete news folders.") } } - delete(cats, delName) - - if err := cc.Server.writeThreadedNews(); err != nil { - return res, err + err = cc.Server.ThreadedNewsMgr.DeleteNewsItem(pathStrs) + if err != nil { + return res } - return append(res, cc.NewReply(t)), nil + return append(res, cc.NewReply(t)) } -func HandleDelNewsArt(cc *ClientConn, t *Transaction) (res []Transaction, err error) { - if !cc.Authorize(accessNewsDeleteArt) { - res = append(res, cc.NewErrReply(t, "You are not allowed to delete news articles.")) - return res, err +// HandleDelNewsArt deletes a threaded news article. +// Request Fields +// 325 News path +// 326 News article Type +// 337 News article recursive delete - Delete child articles (1) or not (0) +func HandleDelNewsArt(cc *ClientConn, t *Transaction) (res []Transaction) { + if !cc.Authorize(AccessNewsDeleteArt) { + return cc.NewErrReply(t, "You are not allowed to delete news articles.") + } - // Request Fields - // 325 News path - // 326 News article ID - // 337 News article – recursive delete Delete child articles (1) or not (0) - pathStrs := ReadNewsPath(t.GetField(FieldNewsPath).Data) - ID, err := byteToInt(t.GetField(FieldNewsArtID).Data) + pathStrs, err := t.GetField(FieldNewsPath).DecodeNewsPath() if err != nil { - return res, err + return res } - // TODO: Delete recursive - cats := cc.Server.GetNewsCatByPath(pathStrs[:len(pathStrs)-1]) - - catName := pathStrs[len(pathStrs)-1] - cat := cats[catName] + articleID, err := t.GetField(FieldNewsArtID).DecodeInt() + if err != nil { + cc.logger.Error("error reading article Type", "err", err) + return + } - delete(cat.Articles, uint32(ID)) + deleteRecursive := bytes.Equal([]byte{0, 1}, t.GetField(FieldNewsArtRecurseDel).Data) - cats[catName] = cat - if err := cc.Server.writeThreadedNews(); err != nil { - return res, err + err = cc.Server.ThreadedNewsMgr.DeleteArticle(pathStrs, uint32(articleID), deleteRecursive) + if err != nil { + cc.logger.Error("error deleting news article", "err", err) } - res = append(res, cc.NewReply(t)) - return res, err + return []Transaction{cc.NewReply(t)} } // Request fields // 325 News path -// 326 News article ID ID of the parent article? +// 326 News article Type Type of the parent article? // 328 News article title // 334 News article flags // 327 News article data flavor Currently “text/plain” // 333 News article data -func HandlePostNewsArt(cc *ClientConn, t *Transaction) (res []Transaction, err error) { - if !cc.Authorize(accessNewsPostArt) { - res = append(res, cc.NewErrReply(t, "You are not allowed to post news articles.")) - return res, err +func HandlePostNewsArt(cc *ClientConn, t *Transaction) (res []Transaction) { + if !cc.Authorize(AccessNewsPostArt) { + return cc.NewErrReply(t, "You are not allowed to post news articles.") } - pathStrs := ReadNewsPath(t.GetField(FieldNewsPath).Data) - cats := cc.Server.GetNewsCatByPath(pathStrs[:len(pathStrs)-1]) - - catName := pathStrs[len(pathStrs)-1] - cat := cats[catName] - - artID, err := byteToInt(t.GetField(FieldNewsArtID).Data) + pathStrs, err := t.GetField(FieldNewsPath).DecodeNewsPath() if err != nil { - return res, err + return res } - convertedArtID := uint32(artID) - bs := make([]byte, 4) - binary.BigEndian.PutUint32(bs, convertedArtID) - - newArt := NewsArtData{ - Title: string(t.GetField(FieldNewsArtTitle).Data), - Poster: string(cc.UserName), - Date: toHotlineTime(time.Now()), - PrevArt: []byte{0, 0, 0, 0}, - NextArt: []byte{0, 0, 0, 0}, - ParentArt: bs, - FirstChildArt: []byte{0, 0, 0, 0}, - DataFlav: []byte("text/plain"), - Data: string(t.GetField(FieldNewsArtData).Data), - } - - var keys []int - for k := range cat.Articles { - keys = append(keys, int(k)) - } - - nextID := uint32(1) - if len(keys) > 0 { - sort.Ints(keys) - prevID := uint32(keys[len(keys)-1]) - nextID = prevID + 1 - binary.BigEndian.PutUint32(newArt.PrevArt, prevID) - - // Set next article ID - binary.BigEndian.PutUint32(cat.Articles[prevID].NextArt, nextID) - } - - // Update parent article with first child reply - parentID := convertedArtID - if parentID != 0 { - parentArt := cat.Articles[parentID] - - if bytes.Equal(parentArt.FirstChildArt, []byte{0, 0, 0, 0}) { - binary.BigEndian.PutUint32(parentArt.FirstChildArt, nextID) - } - } - - cat.Articles[nextID] = &newArt - - cats[catName] = cat - if err := cc.Server.writeThreadedNews(); err != nil { - return res, err + parentArticleID, err := t.GetField(FieldNewsArtID).DecodeInt() + if err != nil { + return res + } + + err = cc.Server.ThreadedNewsMgr.PostArticle( + pathStrs, + uint32(parentArticleID), + NewsArtData{ + Title: string(t.GetField(FieldNewsArtTitle).Data), + Poster: string(cc.UserName), + Date: toHotlineTime(time.Now()), + DataFlav: NewsFlavor, + Data: string(t.GetField(FieldNewsArtData).Data), + }, + ) + if err != nil { + cc.logger.Error("error posting news article", "err", err) } - res = append(res, cc.NewReply(t)) - return res, err + return append(res, cc.NewReply(t)) } // HandleGetMsgs returns the flat news data -func HandleGetMsgs(cc *ClientConn, t *Transaction) (res []Transaction, err error) { - if !cc.Authorize(accessNewsReadArt) { - res = append(res, cc.NewErrReply(t, "You are not allowed to read news.")) - return res, err +func HandleGetMsgs(cc *ClientConn, t *Transaction) (res []Transaction) { + if !cc.Authorize(AccessNewsReadArt) { + return cc.NewErrReply(t, "You are not allowed to read news.") } - res = append(res, cc.NewReply(t, NewField(FieldData, cc.Server.FlatNews))) + _, _ = cc.Server.MessageBoard.Seek(0, 0) + + newsData, err := io.ReadAll(cc.Server.MessageBoard) + if err != nil { + // TODO + } - return res, err + return append(res, cc.NewReply(t, NewField(FieldData, newsData))) } -func HandleDownloadFile(cc *ClientConn, t *Transaction) (res []Transaction, err error) { - if !cc.Authorize(accessDownloadFile) { - res = append(res, cc.NewErrReply(t, "You are not allowed to download files.")) - return res, err +func HandleDownloadFile(cc *ClientConn, t *Transaction) (res []Transaction) { + if !cc.Authorize(AccessDownloadFile) { + return cc.NewErrReply(t, "You are not allowed to download files.") } fileName := t.GetField(FieldFileName).Data @@ -1474,7 +1266,7 @@ func HandleDownloadFile(cc *ClientConn, t *Transaction) (res []Transaction, err var frd FileResumeData if resumeData != nil { if err := frd.UnmarshalBinary(t.GetField(FieldFileResumeData).Data); err != nil { - return res, err + return res } // TODO: handle rsrc fork offset dataOffset = int64(binary.BigEndian.Uint32(frd.ForkInfoList[0].DataSize[:])) @@ -1482,12 +1274,12 @@ func HandleDownloadFile(cc *ClientConn, t *Transaction) (res []Transaction, err fullFilePath, err := readPath(cc.Server.Config.FileRoot, filePath, fileName) if err != nil { - return res, err + return res } hlFile, err := newFileWrapper(cc.Server.FS, fullFilePath, dataOffset) if err != nil { - return res, err + return res } xferSize := hlFile.ffo.TransferSize(0) @@ -1498,12 +1290,12 @@ func HandleDownloadFile(cc *ClientConn, t *Transaction) (res []Transaction, err if resumeData != nil { var frd FileResumeData if err := frd.UnmarshalBinary(t.GetField(FieldFileResumeData).Data); err != nil { - return res, err + return res } ft.fileResumeData = &frd } - // Optional field for when a HL v1.5+ client requests file preview + // Optional field for when a client requests file preview // Used only for TEXT, JPEG, GIFF, BMP or PICT files // The value will always be 2 if t.GetField(FieldFileTransferOptions).Data != nil { @@ -1518,28 +1310,27 @@ func HandleDownloadFile(cc *ClientConn, t *Transaction) (res []Transaction, err NewField(FieldFileSize, hlFile.ffo.FlatFileDataForkHeader.DataSize[:]), )) - return res, err + return res } // Download all files from the specified folder and sub-folders -func HandleDownloadFolder(cc *ClientConn, t *Transaction) (res []Transaction, err error) { - if !cc.Authorize(accessDownloadFile) { - res = append(res, cc.NewErrReply(t, "You are not allowed to download folders.")) - return res, err +func HandleDownloadFolder(cc *ClientConn, t *Transaction) (res []Transaction) { + if !cc.Authorize(AccessDownloadFile) { + return cc.NewErrReply(t, "You are not allowed to download folders.") } fullFilePath, err := readPath(cc.Server.Config.FileRoot, t.GetField(FieldFilePath).Data, t.GetField(FieldFileName).Data) if err != nil { - return res, err + return res } transferSize, err := CalcTotalSize(fullFilePath) if err != nil { - return res, err + return res } itemCount, err := CalcItemCount(fullFilePath) if err != nil { - return res, err + return res } fileTransfer := cc.newFileTransfer(FolderDownload, t.GetField(FieldFileName).Data, t.GetField(FieldFilePath).Data, transferSize) @@ -1547,38 +1338,37 @@ func HandleDownloadFolder(cc *ClientConn, t *Transaction) (res []Transaction, er var fp FilePath _, err = fp.Write(t.GetField(FieldFilePath).Data) if err != nil { - return res, err + return res } res = append(res, cc.NewReply(t, - NewField(FieldRefNum, fileTransfer.ReferenceNumber), + NewField(FieldRefNum, fileTransfer.refNum[:]), NewField(FieldTransferSize, transferSize), NewField(FieldFolderItemCount, itemCount), NewField(FieldWaitingCount, []byte{0x00, 0x00}), // TODO: Implement waiting count )) - return res, err + return res } // Upload all files from the local folder and its subfolders to the specified path on the server // Fields used in the request -// 201 File name +// 201 File Name // 202 File path // 108 transfer size Total size of all items in the folder // 220 Folder item count // 204 File transfer options "Optional Currently set to 1" (TODO: ??) -func HandleUploadFolder(cc *ClientConn, t *Transaction) (res []Transaction, err error) { +func HandleUploadFolder(cc *ClientConn, t *Transaction) (res []Transaction) { var fp FilePath if t.GetField(FieldFilePath).Data != nil { - if _, err = fp.Write(t.GetField(FieldFilePath).Data); err != nil { - return res, err + if _, err := fp.Write(t.GetField(FieldFilePath).Data); err != nil { + return res } } // Handle special cases for Upload and Drop Box folders - if !cc.Authorize(accessUploadAnywhere) { + if !cc.Authorize(AccessUploadAnywhere) { if !fp.IsUploadDir() && !fp.IsDropbox() { - res = append(res, cc.NewErrReply(t, fmt.Sprintf("Cannot accept upload of the folder \"%v\" because you are only allowed to upload to the \"Uploads\" folder.", string(t.GetField(FieldFileName).Data)))) - return res, err + return cc.NewErrReply(t, fmt.Sprintf("Cannot accept upload of the folder \"%v\" because you are only allowed to upload to the \"Uploads\" folder.", string(t.GetField(FieldFileName).Data))) } } @@ -1590,21 +1380,19 @@ func HandleUploadFolder(cc *ClientConn, t *Transaction) (res []Transaction, err fileTransfer.FolderItemCount = t.GetField(FieldFolderItemCount).Data - res = append(res, cc.NewReply(t, NewField(FieldRefNum, fileTransfer.ReferenceNumber))) - return res, err + return append(res, cc.NewReply(t, NewField(FieldRefNum, fileTransfer.refNum[:]))) } // HandleUploadFile // Fields used in the request: -// 201 File name +// 201 File Name // 202 File path // 204 File transfer options "Optional // Used only to resume download, currently has value 2" // 108 File transfer size "Optional used if download is not resumed" -func HandleUploadFile(cc *ClientConn, t *Transaction) (res []Transaction, err error) { - if !cc.Authorize(accessUploadFile) { - res = append(res, cc.NewErrReply(t, "You are not allowed to upload files.")) - return res, err +func HandleUploadFile(cc *ClientConn, t *Transaction) (res []Transaction) { + if !cc.Authorize(AccessUploadFile) { + return cc.NewErrReply(t, "You are not allowed to upload files.") } fileName := t.GetField(FieldFileName).Data @@ -1614,37 +1402,35 @@ func HandleUploadFile(cc *ClientConn, t *Transaction) (res []Transaction, err er var fp FilePath if filePath != nil { - if _, err = fp.Write(filePath); err != nil { - return res, err + if _, err := fp.Write(filePath); err != nil { + return res } } // Handle special cases for Upload and Drop Box folders - if !cc.Authorize(accessUploadAnywhere) { + if !cc.Authorize(AccessUploadAnywhere) { if !fp.IsUploadDir() && !fp.IsDropbox() { - res = append(res, cc.NewErrReply(t, fmt.Sprintf("Cannot accept upload of the file \"%v\" because you are only allowed to upload to the \"Uploads\" folder.", string(fileName)))) - return res, err + return cc.NewErrReply(t, fmt.Sprintf("Cannot accept upload of the file \"%v\" because you are only allowed to upload to the \"Uploads\" folder.", string(fileName))) } } fullFilePath, err := readPath(cc.Server.Config.FileRoot, filePath, fileName) if err != nil { - return res, err + return res } if _, err := cc.Server.FS.Stat(fullFilePath); err == nil { - res = append(res, cc.NewErrReply(t, fmt.Sprintf("Cannot accept upload because there is already a file named \"%v\". Try choosing a different name.", string(fileName)))) - return res, err + return cc.NewErrReply(t, fmt.Sprintf("Cannot accept upload because there is already a file named \"%v\". Try choosing a different Name.", string(fileName))) } ft := cc.newFileTransfer(FileUpload, fileName, filePath, transferSize) - replyT := cc.NewReply(t, NewField(FieldRefNum, ft.ReferenceNumber)) + replyT := cc.NewReply(t, NewField(FieldRefNum, ft.refNum[:])) // client has requested to resume a partially transferred file if transferOptions != nil { fileInfo, err := cc.Server.FS.Stat(fullFilePath + incompleteFileSuffix) if err != nil { - return res, err + return res } offset := make([]byte, 4) @@ -1662,16 +1448,16 @@ func HandleUploadFile(cc *ClientConn, t *Transaction) (res []Transaction, err er } res = append(res, replyT) - return res, err + return res } -func HandleSetClientUserInfo(cc *ClientConn, t *Transaction) (res []Transaction, err error) { +func HandleSetClientUserInfo(cc *ClientConn, t *Transaction) (res []Transaction) { if len(t.GetField(FieldUserIconID).Data) == 4 { cc.Icon = t.GetField(FieldUserIconID).Data[2:] } else { cc.Icon = t.GetField(FieldUserIconID).Data } - if cc.Authorize(accessAnyName) { + if cc.Authorize(AccessAnyName) { cc.UserName = t.GetField(FieldUserName).Data } @@ -1679,239 +1465,229 @@ func HandleSetClientUserInfo(cc *ClientConn, t *Transaction) (res []Transaction, options := t.GetField(FieldOptions).Data if options != nil { optBitmap := big.NewInt(int64(binary.BigEndian.Uint16(options))) - flagBitmap := big.NewInt(int64(binary.BigEndian.Uint16(cc.Flags))) - flagBitmap.SetBit(flagBitmap, UserFlagRefusePM, optBitmap.Bit(refusePM)) - binary.BigEndian.PutUint16(cc.Flags, uint16(flagBitmap.Int64())) + //flagBitmap := big.NewInt(int64(binary.BigEndian.Uint16(cc.Flags[:]))) + //flagBitmap.SetBit(flagBitmap, UserFlagRefusePM, optBitmap.Bit(UserOptRefusePM)) + //binary.BigEndian.PutUint16(cc.Flags[:], uint16(flagBitmap.Int64())) - flagBitmap.SetBit(flagBitmap, UserFlagRefusePChat, optBitmap.Bit(refuseChat)) - binary.BigEndian.PutUint16(cc.Flags, uint16(flagBitmap.Int64())) + cc.Flags.Set(UserFlagRefusePM, optBitmap.Bit(UserOptRefusePM)) + cc.Flags.Set(UserFlagRefusePChat, optBitmap.Bit(UserOptRefuseChat)) + // + //flagBitmap.SetBit(flagBitmap, UserFlagRefusePChat, optBitmap.Bit(UserOptRefuseChat)) + //binary.BigEndian.PutUint16(cc.Flags[:], uint16(flagBitmap.Int64())) // Check auto response - if optBitmap.Bit(autoResponse) == 1 { + if optBitmap.Bit(UserOptAutoResponse) == 1 { cc.AutoReply = t.GetField(FieldAutomaticResponse).Data } else { cc.AutoReply = []byte{} } } - for _, c := range sortedClients(cc.Server.Clients) { - res = append(res, *NewTransaction( + for _, c := range cc.Server.ClientMgr.List() { + res = append(res, NewTransaction( TranNotifyChangeUser, c.ID, - NewField(FieldUserID, *cc.ID), + NewField(FieldUserID, cc.ID[:]), NewField(FieldUserIconID, cc.Icon), - NewField(FieldUserFlags, cc.Flags), + NewField(FieldUserFlags, cc.Flags[:]), NewField(FieldUserName, cc.UserName), )) } - return res, err + return res } // HandleKeepAlive responds to keepalive transactions with an empty reply // * HL 1.9.2 Client sends keepalive msg every 3 minutes // * HL 1.2.3 Client doesn't send keepalives -func HandleKeepAlive(cc *ClientConn, t *Transaction) (res []Transaction, err error) { +func HandleKeepAlive(cc *ClientConn, t *Transaction) (res []Transaction) { res = append(res, cc.NewReply(t)) - return res, err + return res } -func HandleGetFileNameList(cc *ClientConn, t *Transaction) (res []Transaction, err error) { +func HandleGetFileNameList(cc *ClientConn, t *Transaction) (res []Transaction) { fullPath, err := readPath( cc.Server.Config.FileRoot, t.GetField(FieldFilePath).Data, nil, ) if err != nil { - return res, err + return res } var fp FilePath if t.GetField(FieldFilePath).Data != nil { if _, err = fp.Write(t.GetField(FieldFilePath).Data); err != nil { - return res, err + return res } } // Handle special case for drop box folders - if fp.IsDropbox() && !cc.Authorize(accessViewDropBoxes) { - res = append(res, cc.NewErrReply(t, "You are not allowed to view drop boxes.")) - return res, err + if fp.IsDropbox() && !cc.Authorize(AccessViewDropBoxes) { + return cc.NewErrReply(t, "You are not allowed to view drop boxes.") } fileNames, err := getFileNameList(fullPath, cc.Server.Config.IgnoreFiles) if err != nil { - return res, err + return res } res = append(res, cc.NewReply(t, fileNames...)) - return res, err + return res } // ================================= // Hotline private chat flow // ================================= -// 1. ClientA sends TranInviteNewChat to server with user ID to invite +// 1. ClientA sends TranInviteNewChat to server with user Type to invite // 2. Server creates new ChatID // 3. Server sends TranInviteToChat to invitee -// 4. Server replies to ClientA with new Chat ID +// 4. Server replies to ClientA with new Chat Type // // A dialog box pops up in the invitee client with options to accept or decline the invitation. // If Accepted is clicked: // 1. ClientB sends TranJoinChat with FieldChatID // HandleInviteNewChat invites users to new private chat -func HandleInviteNewChat(cc *ClientConn, t *Transaction) (res []Transaction, err error) { - if !cc.Authorize(accessOpenChat) { - res = append(res, cc.NewErrReply(t, "You are not allowed to request private chat.")) - return res, err +func HandleInviteNewChat(cc *ClientConn, t *Transaction) (res []Transaction) { + if !cc.Authorize(AccessOpenChat) { + return cc.NewErrReply(t, "You are not allowed to request private chat.") } // Client to Invite targetID := t.GetField(FieldUserID).Data - newChatID := cc.Server.NewPrivateChat(cc) - // Check if target user has "Refuse private chat" flag - binary.BigEndian.Uint16(targetID) - targetClient := cc.Server.Clients[binary.BigEndian.Uint16(targetID)] + // Create a new chat with self as initial member. + newChatID := cc.Server.ChatMgr.New(cc) - flagBitmap := big.NewInt(int64(binary.BigEndian.Uint16(targetClient.Flags))) + // Check if target user has "Refuse private chat" flag + targetClient := cc.Server.ClientMgr.Get([2]byte(targetID)) + flagBitmap := big.NewInt(int64(binary.BigEndian.Uint16(targetClient.Flags[:]))) if flagBitmap.Bit(UserFlagRefusePChat) == 1 { res = append(res, - *NewTransaction( + NewTransaction( TranServerMsg, cc.ID, NewField(FieldData, []byte(string(targetClient.UserName)+" does not accept private chats.")), NewField(FieldUserName, targetClient.UserName), - NewField(FieldUserID, *targetClient.ID), + NewField(FieldUserID, targetClient.ID[:]), NewField(FieldOptions, []byte{0, 2}), ), ) } else { res = append(res, - *NewTransaction( + NewTransaction( TranInviteToChat, - &targetID, - NewField(FieldChatID, newChatID), + [2]byte(targetID), + NewField(FieldChatID, newChatID[:]), NewField(FieldUserName, cc.UserName), - NewField(FieldUserID, *cc.ID), + NewField(FieldUserID, cc.ID[:]), ), ) } - res = append(res, + return append( + res, cc.NewReply(t, - NewField(FieldChatID, newChatID), + NewField(FieldChatID, newChatID[:]), NewField(FieldUserName, cc.UserName), - NewField(FieldUserID, *cc.ID), + NewField(FieldUserID, cc.ID[:]), NewField(FieldUserIconID, cc.Icon), - NewField(FieldUserFlags, cc.Flags), + NewField(FieldUserFlags, cc.Flags[:]), ), ) - - return res, err } -func HandleInviteToChat(cc *ClientConn, t *Transaction) (res []Transaction, err error) { - if !cc.Authorize(accessOpenChat) { - res = append(res, cc.NewErrReply(t, "You are not allowed to request private chat.")) - return res, err +func HandleInviteToChat(cc *ClientConn, t *Transaction) (res []Transaction) { + if !cc.Authorize(AccessOpenChat) { + return cc.NewErrReply(t, "You are not allowed to request private chat.") } // Client to Invite targetID := t.GetField(FieldUserID).Data chatID := t.GetField(FieldChatID).Data - res = append(res, - *NewTransaction( + return []Transaction{ + NewTransaction( TranInviteToChat, - &targetID, + [2]byte(targetID), NewField(FieldChatID, chatID), NewField(FieldUserName, cc.UserName), - NewField(FieldUserID, *cc.ID), + NewField(FieldUserID, cc.ID[:]), ), - ) - res = append(res, cc.NewReply( t, NewField(FieldChatID, chatID), NewField(FieldUserName, cc.UserName), - NewField(FieldUserID, *cc.ID), + NewField(FieldUserID, cc.ID[:]), NewField(FieldUserIconID, cc.Icon), - NewField(FieldUserFlags, cc.Flags), + NewField(FieldUserFlags, cc.Flags[:]), ), - ) - - return res, err + } } -func HandleRejectChatInvite(cc *ClientConn, t *Transaction) (res []Transaction, err error) { - chatID := t.GetField(FieldChatID).Data - chatInt := binary.BigEndian.Uint32(chatID) - - privChat := cc.Server.PrivateChats[chatInt] +func HandleRejectChatInvite(cc *ClientConn, t *Transaction) (res []Transaction) { + chatID := [4]byte(t.GetField(FieldChatID).Data) - resMsg := append(cc.UserName, []byte(" declined invitation to chat")...) - - for _, c := range sortedClients(privChat.ClientConn) { + for _, c := range cc.Server.ChatMgr.Members(chatID) { res = append(res, - *NewTransaction( + NewTransaction( TranChatMsg, c.ID, - NewField(FieldChatID, chatID), - NewField(FieldData, resMsg), + NewField(FieldChatID, chatID[:]), + NewField(FieldData, append(cc.UserName, []byte(" declined invitation to chat")...)), ), ) } - return res, err + return res } // HandleJoinChat is sent from a v1.8+ Hotline client when the joins a private chat // Fields used in the reply: // * 115 Chat subject -// * 300 User name with info (Optional) +// * 300 User Name with info (Optional) // * 300 (more user names with info) -func HandleJoinChat(cc *ClientConn, t *Transaction) (res []Transaction, err error) { +func HandleJoinChat(cc *ClientConn, t *Transaction) (res []Transaction) { chatID := t.GetField(FieldChatID).Data - chatInt := binary.BigEndian.Uint32(chatID) - - privChat := cc.Server.PrivateChats[chatInt] // Send TranNotifyChatChangeUser to current members of the chat to inform of new user - for _, c := range sortedClients(privChat.ClientConn) { + for _, c := range cc.Server.ChatMgr.Members([4]byte(chatID)) { res = append(res, - *NewTransaction( + NewTransaction( TranNotifyChatChangeUser, c.ID, NewField(FieldChatID, chatID), NewField(FieldUserName, cc.UserName), - NewField(FieldUserID, *cc.ID), + NewField(FieldUserID, cc.ID[:]), NewField(FieldUserIconID, cc.Icon), - NewField(FieldUserFlags, cc.Flags), + NewField(FieldUserFlags, cc.Flags[:]), ), ) } - privChat.ClientConn[cc.uint16ID()] = cc + cc.Server.ChatMgr.Join(ChatID(chatID), cc) - replyFields := []Field{NewField(FieldChatSubject, []byte(privChat.Subject))} - for _, c := range sortedClients(privChat.ClientConn) { - user := User{ - ID: *c.ID, + subject := cc.Server.ChatMgr.GetSubject(ChatID(chatID)) + + replyFields := []Field{NewField(FieldChatSubject, []byte(subject))} + for _, c := range cc.Server.ChatMgr.Members([4]byte(chatID)) { + b, err := io.ReadAll(&User{ + ID: c.ID, Icon: c.Icon, - Flags: c.Flags, + Flags: c.Flags[:], Name: string(c.UserName), + }) + if err != nil { + return res } - - replyFields = append(replyFields, NewField(FieldUsernameWithInfo, user.Payload())) + replyFields = append(replyFields, NewField(FieldUsernameWithInfo, b)) } - res = append(res, cc.NewReply(t, replyFields...)) - return res, err + return append(res, cc.NewReply(t, replyFields...)) } // HandleLeaveChat is sent from a v1.8+ Hotline client when the user exits a private chat @@ -1919,47 +1695,40 @@ func HandleJoinChat(cc *ClientConn, t *Transaction) (res []Transaction, err erro // - 114 FieldChatID // // Reply is not expected. -func HandleLeaveChat(cc *ClientConn, t *Transaction) (res []Transaction, err error) { +func HandleLeaveChat(cc *ClientConn, t *Transaction) (res []Transaction) { chatID := t.GetField(FieldChatID).Data - chatInt := binary.BigEndian.Uint32(chatID) - privChat, ok := cc.Server.PrivateChats[chatInt] - if !ok { - return res, nil - } - - delete(privChat.ClientConn, cc.uint16ID()) + cc.Server.ChatMgr.Leave([4]byte(chatID), cc.ID) // Notify members of the private chat that the user has left - for _, c := range sortedClients(privChat.ClientConn) { + for _, c := range cc.Server.ChatMgr.Members(ChatID(chatID)) { res = append(res, - *NewTransaction( + NewTransaction( TranNotifyChatDeleteUser, c.ID, NewField(FieldChatID, chatID), - NewField(FieldUserID, *cc.ID), + NewField(FieldUserID, cc.ID[:]), ), ) } - return res, err + return res } // HandleSetChatSubject is sent from a v1.8+ Hotline client when the user sets a private chat subject // Fields used in the request: -// * 114 Chat ID +// * 114 Chat Type // * 115 Chat subject // Reply is not expected. -func HandleSetChatSubject(cc *ClientConn, t *Transaction) (res []Transaction, err error) { +func HandleSetChatSubject(cc *ClientConn, t *Transaction) (res []Transaction) { chatID := t.GetField(FieldChatID).Data - chatInt := binary.BigEndian.Uint32(chatID) - privChat := cc.Server.PrivateChats[chatInt] - privChat.Subject = string(t.GetField(FieldChatSubject).Data) + cc.Server.ChatMgr.SetSubject([4]byte(chatID), string(t.GetField(FieldChatSubject).Data)) - for _, c := range sortedClients(privChat.ClientConn) { + // Notify chat members of new subject. + for _, c := range cc.Server.ChatMgr.Members([4]byte(chatID)) { res = append(res, - *NewTransaction( + NewTransaction( TranNotifyChatSubject, c.ID, NewField(FieldChatID, chatID), @@ -1968,21 +1737,20 @@ func HandleSetChatSubject(cc *ClientConn, t *Transaction) (res []Transaction, er ) } - return res, err + return res } // HandleMakeAlias makes a file alias using the specified path. // Fields used in the request: -// 201 File name +// 201 File Name // 202 File path // 212 File new path Destination path // // Fields used in the reply: // None -func HandleMakeAlias(cc *ClientConn, t *Transaction) (res []Transaction, err error) { - if !cc.Authorize(accessMakeAlias) { - res = append(res, cc.NewErrReply(t, "You are not allowed to make aliases.")) - return res, err +func HandleMakeAlias(cc *ClientConn, t *Transaction) (res []Transaction) { + if !cc.Authorize(AccessMakeAlias) { + return cc.NewErrReply(t, "You are not allowed to make aliases.") } fileName := t.GetField(FieldFileName).Data filePath := t.GetField(FieldFilePath).Data @@ -1990,23 +1758,22 @@ func HandleMakeAlias(cc *ClientConn, t *Transaction) (res []Transaction, err err fullFilePath, err := readPath(cc.Server.Config.FileRoot, filePath, fileName) if err != nil { - return res, err + return res } fullNewFilePath, err := readPath(cc.Server.Config.FileRoot, fileNewPath, fileName) if err != nil { - return res, err + return res } - cc.logger.Debugw("Make alias", "src", fullFilePath, "dst", fullNewFilePath) + cc.logger.Debug("Make alias", "src", fullFilePath, "dst", fullNewFilePath) if err := cc.Server.FS.Symlink(fullFilePath, fullNewFilePath); err != nil { - res = append(res, cc.NewErrReply(t, "Error creating alias")) - return res, nil + return cc.NewErrReply(t, "Error creating alias") } res = append(res, cc.NewReply(t)) - return res, err + return res } // HandleDownloadBanner handles requests for a new banner from the server @@ -2015,20 +1782,12 @@ func HandleMakeAlias(cc *ClientConn, t *Transaction) (res []Transaction, err err // Fields used in the reply: // 107 FieldRefNum Used later for transfer // 108 FieldTransferSize Size of data to be downloaded -func HandleDownloadBanner(cc *ClientConn, t *Transaction) (res []Transaction, err error) { - fi, err := cc.Server.FS.Stat(filepath.Join(cc.Server.ConfigDir, cc.Server.Config.BannerFile)) - if err != nil { - return res, err - } - - ft := cc.newFileTransfer(bannerDownload, []byte{}, []byte{}, make([]byte, 4)) - - binary.BigEndian.PutUint32(ft.TransferSize, uint32(fi.Size())) +func HandleDownloadBanner(cc *ClientConn, t *Transaction) (res []Transaction) { + ft := cc.newFileTransfer(BannerDownload, []byte{}, []byte{}, make([]byte, 4)) + binary.BigEndian.PutUint32(ft.TransferSize, uint32(len(cc.Server.banner))) - res = append(res, cc.NewReply(t, + return append(res, cc.NewReply(t, NewField(FieldRefNum, ft.refNum[:]), NewField(FieldTransferSize, ft.TransferSize), )) - - return res, err }