package hotline
import (
+ "bufio"
"bytes"
"encoding/binary"
"errors"
return res, err
}
-// 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) {
// 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) {
return res, fmt.Errorf("invalid filepath encoding: %w", err)
}
- // 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)
+ 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
}
var userFields []Field
for _, acc := range cc.Server.Accounts {
- b, err := io.ReadAll(acc)
+ accCopy := *acc
+ b, err := io.ReadAll(&accCopy)
if err != nil {
return res, err
}
// 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) {
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, fmt.Errorf("error reading field: %w", err)
+ }
+ subFields = append(subFields, field)
}
// If there's only one subfield, that indicates this is a delete operation for the login in FieldData
// 103 User ID
//
// 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) {
cc.Icon = t.GetField(FieldUserIconID).Data
- cc.logger = cc.logger.With("name", string(cc.UserName))
+ cc.logger = cc.logger.With("Name", string(cc.UserName))
cc.logger.Info("Login successful", "clientVersion", fmt.Sprintf("%v", func() int { i, _ := byteToInt(cc.Version); return i }()))
options := t.GetField(FieldOptions).Data
flagBitmap := big.NewInt(int64(binary.BigEndian.Uint16(cc.Flags)))
// Check refuse private PM option
- if optBitmap.Bit(refusePM) == 1 {
+ if optBitmap.Bit(UserOptRefusePM) == 1 {
flagBitmap.SetBit(flagBitmap, UserFlagRefusePM, 1)
binary.BigEndian.PutUint16(cc.Flags, uint16(flagBitmap.Int64()))
}
// Check refuse private chat option
- if optBitmap.Bit(refuseChat) == 1 {
+ if optBitmap.Bit(UserOptRefuseChat) == 1 {
flagBitmap.SetBit(flagBitmap, UserFlagRefusePChat, 1)
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{}
}
// 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.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)),
))
bs := make([]byte, 4)
binary.BigEndian.PutUint32(bs, convertedArtID)
+ cc.Server.mux.Lock()
+ defer cc.Server.mux.Unlock()
+
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},
+ PrevArt: [4]byte{},
+ NextArt: [4]byte{},
+ ParentArt: [4]byte(bs),
+ FirstChildArt: [4]byte{},
DataFlav: []byte("text/plain"),
Data: string(t.GetField(FieldNewsArtData).Data),
}
prevID := uint32(keys[len(keys)-1])
nextID = prevID + 1
- binary.BigEndian.PutUint32(newArt.PrevArt, prevID)
+ binary.BigEndian.PutUint32(newArt.PrevArt[:], prevID)
// Set next article ID
- binary.BigEndian.PutUint32(cat.Articles[prevID].NextArt, nextID)
+ binary.BigEndian.PutUint32(cat.Articles[prevID].NextArt[:], nextID)
}
// Update parent article with first child reply
if parentID != 0 {
parentArt := cat.Articles[parentID]
- if bytes.Equal(parentArt.FirstChildArt, []byte{0, 0, 0, 0}) {
- binary.BigEndian.PutUint32(parentArt.FirstChildArt, nextID)
+ if parentArt.FirstChildArt == [4]byte{0, 0, 0, 0} {
+ binary.BigEndian.PutUint32(parentArt.FirstChildArt[:], nextID)
}
}
// 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
// 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"
}
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))))
+ 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
}
optBitmap := big.NewInt(int64(binary.BigEndian.Uint16(options)))
flagBitmap := big.NewInt(int64(binary.BigEndian.Uint16(cc.Flags)))
- flagBitmap.SetBit(flagBitmap, UserFlagRefusePM, optBitmap.Bit(refusePM))
+ flagBitmap.SetBit(flagBitmap, UserFlagRefusePM, optBitmap.Bit(UserOptRefusePM))
binary.BigEndian.PutUint16(cc.Flags, uint16(flagBitmap.Int64()))
- flagBitmap.SetBit(flagBitmap, UserFlagRefusePChat, optBitmap.Bit(refuseChat))
+ 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{}
nil,
)
if err != nil {
- return res, err
+ return res, fmt.Errorf("error reading file path: %w", err)
}
var fp FilePath
if t.GetField(FieldFilePath).Data != nil {
if _, err = fp.Write(t.GetField(FieldFilePath).Data); err != nil {
- return res, err
+ return res, fmt.Errorf("error writing file path: %w", err)
}
}
fileNames, err := getFileNameList(fullPath, cc.Server.Config.IgnoreFiles)
if err != nil {
- return res, err
+ return res, fmt.Errorf("getFileNameList: %w", err)
}
res = append(res, cc.NewReply(t, fileNames...))
// 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) {
chatID := t.GetField(FieldChatID).Data
// 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
//
// 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(len(cc.Server.banner)))
- binary.BigEndian.PutUint32(ft.TransferSize, uint32(fi.Size()))
-
- res = append(res, cc.NewReply(t,
+ return append(res, cc.NewReply(t,
NewField(FieldRefNum, ft.refNum[:]),
NewField(FieldTransferSize, ft.TransferSize),
- ))
-
- return res, err
+ )), err
}
git.r.bdr.sh / rbdr / mobius / blobdiff