]> git.r.bdr.sh - rbdr/mobius/blobdiff - hotline/transaction_handlers.go
Update dependencies
[rbdr/mobius] / hotline / transaction_handlers.go
index b06297dc6926169d2dceebcb69e96ad699b1e746..745cb409d8ffd0c28b273350116161f26d633cce 100644 (file)
@@ -5,11 +5,11 @@ import (
        "encoding/binary"
        "errors"
        "fmt"
-       "github.com/davecgh/go-spew/spew"
-       "gopkg.in/yaml.v2"
+       "gopkg.in/yaml.v3"
        "io/ioutil"
        "math/big"
        "os"
+       "path"
        "sort"
        "strings"
        "time"
@@ -237,8 +237,8 @@ var TransactionHandlers = map[uint16]TransactionType{
        },
        tranSendInstantMsg: {
                Access: accessAlwaysAllow,
-               //Access: accessSendPrivMsg,
-               //DenyMsg: "You are not allowed to send private messages",
+               // Access: accessSendPrivMsg,
+               // DenyMsg: "You are not allowed to send private messages",
                Name:    "tranSendInstantMsg",
                Handler: HandleSendInstantMsg,
                RequiredFields: []requiredField{
@@ -256,13 +256,23 @@ var TransactionHandlers = map[uint16]TransactionType{
                Name:    "tranSetChatSubject",
                Handler: HandleSetChatSubject,
        },
+       tranMakeFileAlias: {
+               Access:  accessAlwaysAllow,
+               Name:    "tranMakeFileAlias",
+               Handler: HandleMakeAlias,
+               RequiredFields: []requiredField{
+                       {ID: fieldFileName, minLen: 1},
+                       {ID: fieldFilePath, minLen: 1},
+                       {ID: fieldFileNewPath, minLen: 1},
+               },
+       },
        tranSetClientUserInfo: {
                Access:  accessAlwaysAllow,
                Name:    "tranSetClientUserInfo",
                Handler: HandleSetClientUserInfo,
        },
        tranSetFileInfo: {
-               Access:  accessAlwaysAllow, // granular access is in the handler
+               Access:  accessAlwaysAllow,
                Name:    "tranSetFileInfo",
                Handler: HandleSetFileInfo,
        },
@@ -273,13 +283,12 @@ var TransactionHandlers = map[uint16]TransactionType{
                Handler: HandleSetUser,
        },
        tranUploadFile: {
-               Access:  accessUploadFile,
-               DenyMsg: "You are not allowed to upload files.",
+               Access:  accessAlwaysAllow,
                Name:    "tranUploadFile",
                Handler: HandleUploadFile,
        },
        tranUploadFldr: {
-               Access:  accessAlwaysAllow, // TODO: what should this be?
+               Access:  accessAlwaysAllow,
                Name:    "tranUploadFldr",
                Handler: HandleUploadFolder,
        },
@@ -292,15 +301,20 @@ var TransactionHandlers = map[uint16]TransactionType{
 }
 
 func HandleChatSend(cc *ClientConn, t *Transaction) (res []Transaction, err error) {
+       if !authorize(cc.Account.Access, accessSendChat) {
+               res = append(res, cc.NewErrReply(t, "You are not allowed to participate in chat."))
+               return res, err
+       }
+
        // Truncate long usernames
-       trunc := fmt.Sprintf("%13s", *cc.UserName)
+       trunc := fmt.Sprintf("%13s", cc.UserName)
        formattedMsg := fmt.Sprintf("\r%.14s:  %s", trunc, t.GetField(fieldData).Data)
 
        // By holding the option key, Hotline chat allows users to send /me formatted messages like:
        // *** Halcyon does stuff
        // This is indicated by the presence of the optional field fieldChatOptions in the transaction payload
        if t.GetField(fieldChatOptions).Data != nil {
-               formattedMsg = fmt.Sprintf("*** %s %s\r", *cc.UserName, t.GetField(fieldData).Data)
+               formattedMsg = fmt.Sprintf("\r*** %s %s", cc.UserName, t.GetField(fieldData).Data)
        }
 
        if bytes.Equal(t.GetField(fieldData).Data, []byte("/stats")) {
@@ -347,44 +361,39 @@ func HandleChatSend(cc *ClientConn, t *Transaction) (res []Transaction, err erro
 //     101     Data    Optional
 //     214     Quoting message Optional
 //
-//Fields used in the reply:
+// Fields used in the reply:
 // None
 func HandleSendInstantMsg(cc *ClientConn, t *Transaction) (res []Transaction, err error) {
        msg := t.GetField(fieldData)
        ID := t.GetField(fieldUserID)
        // TODO: Implement reply quoting
-       //options := transaction.GetField(hotline.fieldOptions)
+       // options := transaction.GetField(hotline.fieldOptions)
 
        res = append(res,
                *NewTransaction(
                        tranServerMsg,
                        &ID.Data,
                        NewField(fieldData, msg.Data),
-                       NewField(fieldUserName, *cc.UserName),
+                       NewField(fieldUserName, cc.UserName),
                        NewField(fieldUserID, *cc.ID),
                        NewField(fieldOptions, []byte{0, 1}),
                ),
        )
        id, _ := byteToInt(ID.Data)
 
-       //keys := make([]uint16, 0, len(cc.Server.Clients))
-       //for k := range cc.Server.Clients {
-       //      keys = append(keys, k)
-       //}
-
        otherClient := cc.Server.Clients[uint16(id)]
        if otherClient == nil {
                return res, errors.New("ohno")
        }
 
        // Respond with auto reply if other client has it enabled
-       if len(*otherClient.AutoReply) > 0 {
+       if len(otherClient.AutoReply) > 0 {
                res = append(res,
                        *NewTransaction(
                                tranServerMsg,
                                cc.ID,
-                               NewField(fieldData, *otherClient.AutoReply),
-                               NewField(fieldUserName, *otherClient.UserName),
+                               NewField(fieldData, otherClient.AutoReply),
+                               NewField(fieldUserName, otherClient.UserName),
                                NewField(fieldUserID, *otherClient.ID),
                                NewField(fieldOptions, []byte{0, 1}),
                        ),
@@ -397,24 +406,23 @@ func HandleSendInstantMsg(cc *ClientConn, t *Transaction) (res []Transaction, er
 }
 
 func HandleGetFileInfo(cc *ClientConn, t *Transaction) (res []Transaction, err error) {
-       fileName := string(t.GetField(fieldFileName).Data)
-       filePath := cc.Server.Config.FileRoot + ReadFilePath(t.GetField(fieldFilePath).Data)
-       spew.Dump(cc.Server.Config.FileRoot)
+       fileName := t.GetField(fieldFileName).Data
+       filePath := t.GetField(fieldFilePath).Data
 
-       ffo, err := NewFlattenedFileObject(filePath, fileName)
+       ffo, err := NewFlattenedFileObject(cc.Server.Config.FileRoot, filePath, fileName)
        if err != nil {
                return res, err
        }
 
        res = append(res, cc.NewReply(t,
-               NewField(fieldFileName, []byte(fileName)),
+               NewField(fieldFileName, fileName),
                NewField(fieldFileTypeString, ffo.FlatFileInformationFork.TypeSignature),
                NewField(fieldFileCreatorString, ffo.FlatFileInformationFork.CreatorSignature),
                NewField(fieldFileComment, ffo.FlatFileInformationFork.Comment),
                NewField(fieldFileType, ffo.FlatFileInformationFork.TypeSignature),
                NewField(fieldFileCreateDate, ffo.FlatFileInformationFork.CreateDate),
                NewField(fieldFileModifyDate, ffo.FlatFileInformationFork.ModifyDate),
-               NewField(fieldFileSize, ffo.FlatFileDataForkHeader.DataSize),
+               NewField(fieldFileSize, ffo.FlatFileDataForkHeader.DataSize[:]),
        ))
        return res, err
 }
@@ -428,14 +436,24 @@ func HandleGetFileInfo(cc *ClientConn, t *Transaction) (res []Transaction, err e
 // * 210       File comment    Optional
 // Fields used in the reply:   None
 func HandleSetFileInfo(cc *ClientConn, t *Transaction) (res []Transaction, err error) {
-       fileName := string(t.GetField(fieldFileName).Data)
-       filePath := cc.Server.Config.FileRoot + ReadFilePath(t.GetField(fieldFilePath).Data)
-       //fileComment := t.GetField(fieldFileComment).Data
+       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
+       }
+
+       fullNewFilePath, err := readPath(cc.Server.Config.FileRoot, filePath, t.GetField(fieldFileNewName).Data)
+       if err != nil {
+               return nil, err
+       }
+
+       // fileComment := t.GetField(fieldFileComment).Data
        fileNewName := t.GetField(fieldFileNewName).Data
 
        if fileNewName != nil {
-               path := filePath + "/" + fileName
-               fi, err := os.Stat(path)
+               fi, err := FS.Stat(fullFilePath)
                if err != nil {
                        return res, err
                }
@@ -452,9 +470,9 @@ func HandleSetFileInfo(cc *ClientConn, t *Transaction) (res []Transaction, err e
                        }
                }
 
-               err = os.Rename(filePath+"/"+fileName, filePath+"/"+string(fileNewName))
+               err = os.Rename(fullFilePath, fullNewFilePath)
                if os.IsNotExist(err) {
-                       res = append(res, cc.NewErrReply(t, "Cannot rename file "+fileName+" because it does not exist or cannot be found."))
+                       res = append(res, cc.NewErrReply(t, "Cannot rename file "+string(fileName)+" because it does not exist or cannot be found."))
                        return res, err
                }
        }
@@ -469,16 +487,19 @@ func HandleSetFileInfo(cc *ClientConn, t *Transaction) (res []Transaction, err e
 // * 202       File path
 // Fields used in the reply: none
 func HandleDeleteFile(cc *ClientConn, t *Transaction) (res []Transaction, err error) {
-       fileName := string(t.GetField(fieldFileName).Data)
-       filePath := cc.Server.Config.FileRoot + ReadFilePath(t.GetField(fieldFilePath).Data)
+       fileName := t.GetField(fieldFileName).Data
+       filePath := t.GetField(fieldFilePath).Data
 
-       path := "./" + filePath + "/" + fileName
+       fullFilePath, err := readPath(cc.Server.Config.FileRoot, filePath, fileName)
+       if err != nil {
+               return res, err
+       }
 
-       cc.Server.Logger.Debugw("Delete file", "src", filePath+"/"+fileName)
+       cc.Server.Logger.Debugw("Delete file", "src", fullFilePath)
 
-       fi, err := os.Stat(path)
+       fi, err := os.Stat(fullFilePath)
        if err != nil {
-               res = append(res, cc.NewErrReply(t, "Cannot delete file "+fileName+" because it does not exist or cannot be found."))
+               res = append(res, cc.NewErrReply(t, "Cannot delete file "+string(fileName)+" because it does not exist or cannot be found."))
                return res, nil
        }
        switch mode := fi.Mode(); {
@@ -494,7 +515,7 @@ func HandleDeleteFile(cc *ClientConn, t *Transaction) (res []Transaction, err er
                }
        }
 
-       if err := os.RemoveAll(path); err != nil {
+       if err := os.RemoveAll(fullFilePath); err != nil {
                return res, err
        }
 
@@ -505,13 +526,13 @@ func HandleDeleteFile(cc *ClientConn, t *Transaction) (res []Transaction, err er
 // HandleMoveFile moves files or folders. Note: seemingly not documented
 func HandleMoveFile(cc *ClientConn, t *Transaction) (res []Transaction, err error) {
        fileName := string(t.GetField(fieldFileName).Data)
-       filePath := "./" + cc.Server.Config.FileRoot + ReadFilePath(t.GetField(fieldFilePath).Data)
-       fileNewPath := "./" + cc.Server.Config.FileRoot + ReadFilePath(t.GetField(fieldFileNewPath).Data)
+       filePath := cc.Server.Config.FileRoot + ReadFilePath(t.GetField(fieldFilePath).Data)
+       fileNewPath := cc.Server.Config.FileRoot + ReadFilePath(t.GetField(fieldFileNewPath).Data)
 
        cc.Server.Logger.Debugw("Move file", "src", filePath+"/"+fileName, "dst", fileNewPath+"/"+fileName)
 
-       path := filePath + "/" + fileName
-       fi, err := os.Stat(path)
+       fp := filePath + "/" + fileName
+       fi, err := os.Stat(fp)
        if err != nil {
                return res, err
        }
@@ -544,17 +565,33 @@ func HandleMoveFile(cc *ClientConn, t *Transaction) (res []Transaction, err erro
 
 func HandleNewFolder(cc *ClientConn, t *Transaction) (res []Transaction, err error) {
        newFolderPath := cc.Server.Config.FileRoot
+       folderName := string(t.GetField(fieldFileName).Data)
+
+       folderName = path.Join("/", folderName)
 
        // fieldFilePath is only present for nested paths
        if t.GetField(fieldFilePath).Data != nil {
-               newFp := NewFilePath(t.GetField(fieldFilePath).Data)
+               var newFp FilePath
+               err := newFp.UnmarshalBinary(t.GetField(fieldFilePath).Data)
+               if err != nil {
+                       return nil, err
+               }
                newFolderPath += newFp.String()
        }
-       newFolderPath += "/" + string(t.GetField(fieldFileName).Data)
+       newFolderPath = path.Join(newFolderPath, folderName)
 
-       if err := os.Mkdir(newFolderPath, 0777); err != nil {
-               // TODO: Send error response to client
-               return []Transaction{}, err
+       // TODO: check path and folder name lengths
+
+       if _, err := 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
+       }
+
+       // TODO: check for disallowed characters to maintain compatibility for original client
+
+       if err := 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
        }
 
        res = append(res, cc.NewReply(t))
@@ -610,23 +647,23 @@ func HandleSetUser(cc *ClientConn, t *Transaction) (res []Transaction, err error
                                tranNotifyChangeUser,
                                NewField(fieldUserID, *c.ID),
                                NewField(fieldUserFlags, *c.Flags),
-                               NewField(fieldUserName, *c.UserName),
+                               NewField(fieldUserName, c.UserName),
                                NewField(fieldUserIconID, *c.Icon),
                        )
                }
        }
 
-       // TODO: If we have just promoted a connected user to admin, notify
-       // connected clients to turn the user red
-
        res = append(res, cc.NewReply(t))
        return res, err
 }
 
 func HandleGetUser(cc *ClientConn, t *Transaction) (res []Transaction, err error) {
-       userLogin := string(t.GetField(fieldUserLogin).Data)
-       decodedUserLogin := NegatedUserString(t.GetField(fieldUserLogin).Data)
-       account := cc.Server.Accounts[userLogin]
+       if !authorize(cc.Account.Access, accessOpenUser) {
+               res = append(res, cc.NewErrReply(t, "You are not allowed to view accounts."))
+               return res, err
+       }
+
+       account := cc.Server.Accounts[string(t.GetField(fieldUserLogin).Data)]
        if account == nil {
                errorT := cc.NewErrReply(t, "Account does not exist.")
                res = append(res, errorT)
@@ -635,7 +672,7 @@ func HandleGetUser(cc *ClientConn, t *Transaction) (res []Transaction, err error
 
        res = append(res, cc.NewReply(t,
                NewField(fieldUserName, []byte(account.Name)),
-               NewField(fieldUserLogin, []byte(decodedUserLogin)),
+               NewField(fieldUserLogin, negateString(t.GetField(fieldUserLogin).Data)),
                NewField(fieldUserPassword, []byte(account.Password)),
                NewField(fieldUserAccess, *account.Access),
        ))
@@ -646,7 +683,7 @@ func HandleListUsers(cc *ClientConn, t *Transaction) (res []Transaction, err err
        var userFields []Field
        // TODO: make order deterministic
        for _, acc := range cc.Server.Accounts {
-               userField := acc.Payload()
+               userField := acc.MarshalBinary()
                userFields = append(userFields, NewField(fieldData, userField))
        }
 
@@ -679,6 +716,11 @@ func HandleNewUser(cc *ClientConn, t *Transaction) (res []Transaction, err error
 }
 
 func HandleDeleteUser(cc *ClientConn, t *Transaction) (res []Transaction, err error) {
+       if !authorize(cc.Account.Access, accessDeleteUser) {
+               res = append(res, cc.NewErrReply(t, "You are not allowed to delete accounts."))
+               return res, err
+       }
+
        // TODO: Handle case where account doesn't exist; e.g. delete race condition
        login := DecodeUserString(t.GetField(fieldUserLogin).Data)
 
@@ -757,7 +799,7 @@ None.
 
        template = fmt.Sprintf(
                template,
-               *clientConn.UserName,
+               clientConn.UserName,
                clientConn.Account.Name,
                clientConn.Account.Login,
                clientConn.Connection.RemoteAddr().String(),
@@ -767,7 +809,7 @@ None.
 
        res = append(res, cc.NewReply(t,
                NewField(fieldData, []byte(template)),
-               NewField(fieldUserName, *clientConn.UserName),
+               NewField(fieldUserName, clientConn.UserName),
        ))
        return res, err
 }
@@ -778,27 +820,9 @@ func HandleGetUserNameList(cc *ClientConn, t *Transaction) (res []Transaction, e
        return res, err
 }
 
-func (cc *ClientConn) notifyNewUserHasJoined() (res []Transaction, err error) {
-       // Notify other ccs that a new user has connected
-       cc.NotifyOthers(
-               *NewTransaction(
-                       tranNotifyChangeUser, nil,
-                       NewField(fieldUserName, *cc.UserName),
-                       NewField(fieldUserID, *cc.ID),
-                       NewField(fieldUserIconID, *cc.Icon),
-                       NewField(fieldUserFlags, *cc.Flags),
-               ),
-       )
-
-       return res, nil
-}
-
 func HandleTranAgreed(cc *ClientConn, t *Transaction) (res []Transaction, err error) {
-       bs := make([]byte, 2)
-       binary.BigEndian.PutUint16(bs, *cc.Server.NextGuestID)
-
-       *cc.UserName = t.GetField(fieldUserName).Data
-       *cc.ID = bs
+       cc.Agreed = true
+       cc.UserName = t.GetField(fieldUserName).Data
        *cc.Icon = t.GetField(fieldUserIconID).Data
 
        options := t.GetField(fieldOptions).Data
@@ -820,12 +844,20 @@ func HandleTranAgreed(cc *ClientConn, t *Transaction) (res []Transaction, err er
 
        // Check auto response
        if optBitmap.Bit(autoResponse) == 1 {
-               *cc.AutoReply = t.GetField(fieldAutomaticResponse).Data
+               cc.AutoReply = t.GetField(fieldAutomaticResponse).Data
        } else {
-               *cc.AutoReply = []byte{}
+               cc.AutoReply = []byte{}
        }
 
-       _, _ = cc.notifyNewUserHasJoined()
+       cc.notifyOthers(
+               *NewTransaction(
+                       tranNotifyChangeUser, nil,
+                       NewField(fieldUserName, cc.UserName),
+                       NewField(fieldUserID, *cc.ID),
+                       NewField(fieldUserIconID, *cc.Icon),
+                       NewField(fieldUserFlags, *cc.Flags),
+               ),
+       )
 
        res = append(res, cc.NewReply(t))
 
@@ -858,7 +890,7 @@ func HandleTranOldPostNews(cc *ClientConn, t *Transaction) (res []Transaction, e
                newsTemplate = cc.Server.Config.NewsDelimiter
        }
 
-       newsPost := fmt.Sprintf(newsTemplate+"\r", *cc.UserName, time.Now().Format(newsDateTemplate), t.GetField(fieldData).Data)
+       newsPost := fmt.Sprintf(newsTemplate+"\r", cc.UserName, time.Now().Format(newsDateTemplate), t.GetField(fieldData).Data)
        newsPost = strings.Replace(newsPost, "\n", "\r", -1)
 
        // update news in memory
@@ -917,9 +949,10 @@ func HandleGetNewsCatNameList(cc *ClientConn, t *Transaction) (res []Transaction
        var fieldData []Field
        for _, k := range keys {
                cat := cats[k]
+               b, _ := cat.MarshalBinary()
                fieldData = append(fieldData, NewField(
                        fieldNewsCatListData15,
-                       cat.Payload(),
+                       b,
                ))
        }
 
@@ -980,9 +1013,9 @@ func HandleGetNewsArtNameList(cc *ClientConn, t *Transaction) (res []Transaction
        var cat NewsCategoryListData15
        cats := cc.Server.ThreadedNews.Categories
 
-       for _, path := range pathStrs {
-               cat = cats[path]
-               cats = cats[path].SubCats
+       for _, fp := range pathStrs {
+               cat = cats[fp]
+               cats = cats[fp].SubCats
        }
 
        nald := cat.GetNewsArtListData()
@@ -993,7 +1026,7 @@ func HandleGetNewsArtNameList(cc *ClientConn, t *Transaction) (res []Transaction
 
 func HandleGetNewsArtData(cc *ClientConn, t *Transaction) (res []Transaction, err error) {
        // Request fields
-       // 325  News path
+       // 325  News fp
        // 326  News article ID
        // 327  News article data flavor
 
@@ -1002,9 +1035,9 @@ func HandleGetNewsArtData(cc *ClientConn, t *Transaction) (res []Transaction, er
        var cat NewsCategoryListData15
        cats := cc.Server.ThreadedNews.Categories
 
-       for _, path := range pathStrs {
-               cat = cats[path]
-               cats = cats[path].SubCats
+       for _, fp := range pathStrs {
+               cat = cats[fp]
+               cats = cats[fp].SubCats
        }
        newsArtID := t.GetField(fieldNewsArtID).Data
 
@@ -1054,8 +1087,8 @@ func HandleDelNewsItem(cc *ClientConn, t *Transaction) (res []Transaction, err e
 
        delName := pathStrs[len(pathStrs)-1]
        if len(pathStrs) > 1 {
-               for _, path := range pathStrs[0 : len(pathStrs)-1] {
-                       cats = cats[path].SubCats
+               for _, fp := range pathStrs[0 : len(pathStrs)-1] {
+                       cats = cats[fp].SubCats
                }
        }
 
@@ -1114,8 +1147,8 @@ func HandlePostNewsArt(cc *ClientConn, t *Transaction) (res []Transaction, err e
 
        newArt := NewsArtData{
                Title:         string(t.GetField(fieldNewsArtTitle).Data),
-               Poster:        string(*cc.UserName),
-               Date:          NewsDate(),
+               Poster:        string(cc.UserName),
+               Date:          toHotlineTime(time.Now()),
                PrevArt:       []byte{0, 0, 0, 0},
                NextArt:       []byte{0, 0, 0, 0},
                ParentArt:     append([]byte{0, 0}, t.GetField(fieldNewsArtID).Data...),
@@ -1171,9 +1204,15 @@ func HandleGetMsgs(cc *ClientConn, t *Transaction) (res []Transaction, err error
 
 func HandleDownloadFile(cc *ClientConn, t *Transaction) (res []Transaction, err error) {
        fileName := t.GetField(fieldFileName).Data
-       filePath := ReadFilePath(t.GetField(fieldFilePath).Data)
+       filePath := t.GetField(fieldFilePath).Data
+
+       var fp FilePath
+       err = fp.UnmarshalBinary(filePath)
+       if err != nil {
+               return res, err
+       }
 
-       ffo, err := NewFlattenedFileObject(cc.Server.Config.FileRoot+filePath, string(fileName))
+       ffo, err := NewFlattenedFileObject(cc.Server.Config.FileRoot, filePath, fileName)
        if err != nil {
                return res, err
        }
@@ -1181,11 +1220,9 @@ func HandleDownloadFile(cc *ClientConn, t *Transaction) (res []Transaction, err
        transactionRef := cc.Server.NewTransactionRef()
        data := binary.BigEndian.Uint32(transactionRef)
 
-       cc.Server.Logger.Infow("File download", "path", filePath)
-
        ft := &FileTransfer{
                FileName:        fileName,
-               FilePath:        []byte(filePath),
+               FilePath:        filePath,
                ReferenceNumber: transactionRef,
                Type:            FileDownload,
        }
@@ -1197,7 +1234,7 @@ func HandleDownloadFile(cc *ClientConn, t *Transaction) (res []Transaction, err
                NewField(fieldRefNum, transactionRef),
                NewField(fieldWaitingCount, []byte{0x00, 0x00}), // TODO: Implement waiting count
                NewField(fieldTransferSize, ffo.TransferSize()),
-               NewField(fieldFileSize, ffo.FlatFileDataForkHeader.DataSize),
+               NewField(fieldFileSize, ffo.FlatFileDataForkHeader.DataSize[:]),
        ))
 
        return res, err
@@ -1240,9 +1277,17 @@ func HandleDownloadFolder(cc *ClientConn, t *Transaction) (res []Transaction, er
        cc.Server.FileTransfers[data] = fileTransfer
        cc.Transfers[FolderDownload] = append(cc.Transfers[FolderDownload], fileTransfer)
 
-       fp := NewFilePath(t.GetField(fieldFilePath).Data)
+       var fp FilePath
+       err = fp.UnmarshalBinary(t.GetField(fieldFilePath).Data)
+       if err != nil {
+               return res, err
+       }
+
+       fullFilePath, err := readPath(cc.Server.Config.FileRoot, t.GetField(fieldFilePath).Data, t.GetField(fieldFileName).Data)
+       if err != nil {
+               return res, err
+       }
 
-       fullFilePath := fmt.Sprintf("./%v/%v", cc.Server.Config.FileRoot+fp.String(), string(fileTransfer.FileName))
        transferSize, err := CalcTotalSize(fullFilePath)
        if err != nil {
                return res, err
@@ -1264,13 +1309,28 @@ func HandleDownloadFolder(cc *ClientConn, t *Transaction) (res []Transaction, er
 // Fields used in the request
 // 201 File name
 // 202 File path
-// 108 Transfer size   Total size of all items in the folder
+// 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) {
        transactionRef := cc.Server.NewTransactionRef()
        data := binary.BigEndian.Uint32(transactionRef)
 
+       var fp FilePath
+       if t.GetField(fieldFilePath).Data != nil {
+               if err = fp.UnmarshalBinary(t.GetField(fieldFilePath).Data); err != nil {
+                       return res, err
+               }
+       }
+
+       // Handle special cases for Upload and Drop Box folders
+       if !authorize(cc.Account.Access, 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
+               }
+       }
+
        fileTransfer := &FileTransfer{
                FileName:        t.GetField(fieldFileName).Data,
                FilePath:        t.GetField(fieldFilePath).Data,
@@ -1285,33 +1345,47 @@ func HandleUploadFolder(cc *ClientConn, t *Transaction) (res []Transaction, err
        return res, err
 }
 
+// HandleUploadFile
+// Special cases:
+// * If the target directory contains "uploads" (case insensitive)
 func HandleUploadFile(cc *ClientConn, t *Transaction) (res []Transaction, err error) {
+       if !authorize(cc.Account.Access, accessUploadFile) {
+               res = append(res, cc.NewErrReply(t, "You are not allowed to upload files."))
+               return res, err
+       }
+
        fileName := t.GetField(fieldFileName).Data
        filePath := t.GetField(fieldFilePath).Data
 
+       var fp FilePath
+       if filePath != nil {
+               if err = fp.UnmarshalBinary(filePath); err != nil {
+                       return res, err
+               }
+       }
+
+       // Handle special cases for Upload and Drop Box folders
+       if !authorize(cc.Account.Access, 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
+               }
+       }
+
        transactionRef := cc.Server.NewTransactionRef()
        data := binary.BigEndian.Uint32(transactionRef)
 
-       fileTransfer := &FileTransfer{
+       cc.Server.FileTransfers[data] = &FileTransfer{
                FileName:        fileName,
                FilePath:        filePath,
                ReferenceNumber: transactionRef,
                Type:            FileUpload,
        }
 
-       cc.Server.FileTransfers[data] = fileTransfer
-
        res = append(res, cc.NewReply(t, NewField(fieldRefNum, transactionRef)))
        return res, err
 }
 
-// User options
-const (
-       refusePM     = 0
-       refuseChat   = 1
-       autoResponse = 2
-)
-
 func HandleSetClientUserInfo(cc *ClientConn, t *Transaction) (res []Transaction, err error) {
        var icon []byte
        if len(t.GetField(fieldUserIconID).Data) == 4 {
@@ -1320,7 +1394,7 @@ func HandleSetClientUserInfo(cc *ClientConn, t *Transaction) (res []Transaction,
                icon = t.GetField(fieldUserIconID).Data
        }
        *cc.Icon = icon
-       *cc.UserName = t.GetField(fieldUserName).Data
+       cc.UserName = t.GetField(fieldUserName).Data
 
        // the options field is only passed by the client versions > 1.2.3.
        options := t.GetField(fieldOptions).Data
@@ -1329,23 +1403,17 @@ func HandleSetClientUserInfo(cc *ClientConn, t *Transaction) (res []Transaction,
                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()))
-               }
+               flagBitmap.SetBit(flagBitmap, userFlagRefusePM, optBitmap.Bit(refusePM))
+               binary.BigEndian.PutUint16(*cc.Flags, uint16(flagBitmap.Int64()))
 
-               // Check refuse private chat option
-               if optBitmap.Bit(refuseChat) == 1 {
-                       flagBitmap.SetBit(flagBitmap, userFLagRefusePChat, 1)
-                       binary.BigEndian.PutUint16(*cc.Flags, uint16(flagBitmap.Int64()))
-               }
+               flagBitmap.SetBit(flagBitmap, userFLagRefusePChat, optBitmap.Bit(refuseChat))
+               binary.BigEndian.PutUint16(*cc.Flags, uint16(flagBitmap.Int64()))
 
                // Check auto response
                if optBitmap.Bit(autoResponse) == 1 {
-                       *cc.AutoReply = t.GetField(fieldAutomaticResponse).Data
+                       cc.AutoReply = t.GetField(fieldAutomaticResponse).Data
                } else {
-                       *cc.AutoReply = []byte{}
+                       cc.AutoReply = []byte{}
                }
        }
 
@@ -1355,15 +1423,15 @@ func HandleSetClientUserInfo(cc *ClientConn, t *Transaction) (res []Transaction,
                NewField(fieldUserID, *cc.ID),
                NewField(fieldUserIconID, *cc.Icon),
                NewField(fieldUserFlags, *cc.Flags),
-               NewField(fieldUserName, *cc.UserName),
+               NewField(fieldUserName, cc.UserName),
        )
 
        return res, err
 }
 
-// HandleKeepAlive response 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
+// 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) {
        res = append(res, cc.NewReply(t))
 
@@ -1371,14 +1439,29 @@ func HandleKeepAlive(cc *ClientConn, t *Transaction) (res []Transaction, err err
 }
 
 func HandleGetFileNameList(cc *ClientConn, t *Transaction) (res []Transaction, err error) {
-       filePath := cc.Server.Config.FileRoot
+       fullPath, err := readPath(
+               cc.Server.Config.FileRoot,
+               t.GetField(fieldFilePath).Data,
+               nil,
+       )
+       if err != nil {
+               return res, err
+       }
 
-       path := t.GetField(fieldFilePath).Data
-       if len(path) > 0 {
-               filePath = cc.Server.Config.FileRoot + ReadFilePath(path)
+       var fp FilePath
+       if t.GetField(fieldFilePath).Data != nil {
+               if err = fp.UnmarshalBinary(t.GetField(fieldFilePath).Data); err != nil {
+                       return res, err
+               }
        }
 
-       fileNames, err := getFileNameList(filePath)
+       // Handle special case for drop box folders
+       if fp.IsDropbox() && !authorize(cc.Account.Access, accessViewDropBoxes) {
+               res = append(res, cc.NewReply(t))
+               return res, err
+       }
+
+       fileNames, err := getFileNameList(fullPath)
        if err != nil {
                return res, err
        }
@@ -1411,7 +1494,7 @@ func HandleInviteNewChat(cc *ClientConn, t *Transaction) (res []Transaction, err
                        tranInviteToChat,
                        &targetID,
                        NewField(fieldChatID, newChatID),
-                       NewField(fieldUserName, *cc.UserName),
+                       NewField(fieldUserName, cc.UserName),
                        NewField(fieldUserID, *cc.ID),
                ),
        )
@@ -1419,7 +1502,7 @@ func HandleInviteNewChat(cc *ClientConn, t *Transaction) (res []Transaction, err
        res = append(res,
                cc.NewReply(t,
                        NewField(fieldChatID, newChatID),
-                       NewField(fieldUserName, *cc.UserName),
+                       NewField(fieldUserName, cc.UserName),
                        NewField(fieldUserID, *cc.ID),
                        NewField(fieldUserIconID, *cc.Icon),
                        NewField(fieldUserFlags, *cc.Flags),
@@ -1439,7 +1522,7 @@ func HandleInviteToChat(cc *ClientConn, t *Transaction) (res []Transaction, err
                        tranInviteToChat,
                        &targetID,
                        NewField(fieldChatID, chatID),
-                       NewField(fieldUserName, *cc.UserName),
+                       NewField(fieldUserName, cc.UserName),
                        NewField(fieldUserID, *cc.ID),
                ),
        )
@@ -1447,7 +1530,7 @@ func HandleInviteToChat(cc *ClientConn, t *Transaction) (res []Transaction, err
                cc.NewReply(
                        t,
                        NewField(fieldChatID, chatID),
-                       NewField(fieldUserName, *cc.UserName),
+                       NewField(fieldUserName, cc.UserName),
                        NewField(fieldUserID, *cc.ID),
                        NewField(fieldUserIconID, *cc.Icon),
                        NewField(fieldUserFlags, *cc.Flags),
@@ -1463,7 +1546,7 @@ func HandleRejectChatInvite(cc *ClientConn, t *Transaction) (res []Transaction,
 
        privChat := cc.Server.PrivateChats[chatInt]
 
-       resMsg := append(*cc.UserName, []byte(" declined invitation to chat")...)
+       resMsg := append(cc.UserName, []byte(" declined invitation to chat")...)
 
        for _, c := range sortedClients(privChat.ClientConn) {
                res = append(res,
@@ -1497,7 +1580,7 @@ func HandleJoinChat(cc *ClientConn, t *Transaction) (res []Transaction, err erro
                                tranNotifyChatChangeUser,
                                c.ID,
                                NewField(fieldChatID, chatID),
-                               NewField(fieldUserName, *cc.UserName),
+                               NewField(fieldUserName, cc.UserName),
                                NewField(fieldUserID, *cc.ID),
                                NewField(fieldUserIconID, *cc.Icon),
                                NewField(fieldUserFlags, *cc.Flags),
@@ -1513,7 +1596,7 @@ func HandleJoinChat(cc *ClientConn, t *Transaction) (res []Transaction, err erro
                        ID:    *c.ID,
                        Icon:  *c.Icon,
                        Flags: *c.Flags,
-                       Name:  string(*c.UserName),
+                       Name:  string(c.UserName),
                }
 
                replyFields = append(replyFields, NewField(fieldUsernameWithInfo, user.Payload()))
@@ -1575,3 +1658,41 @@ func HandleSetChatSubject(cc *ClientConn, t *Transaction) (res []Transaction, er
 
        return res, err
 }
+
+// HandleMakeAlias makes a file alias using the specified path.
+// Fields used in the request:
+// 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 !authorize(cc.Account.Access, accessMakeAlias) {
+               res = append(res, cc.NewErrReply(t, "You are not allowed to make aliases."))
+               return res, err
+       }
+       fileName := t.GetField(fieldFileName).Data
+       filePath := t.GetField(fieldFilePath).Data
+       fileNewPath := t.GetField(fieldFileNewPath).Data
+
+       fullFilePath, err := readPath(cc.Server.Config.FileRoot, filePath, fileName)
+       if err != nil {
+               return res, err
+       }
+
+       fullNewFilePath, err := readPath(cc.Server.Config.FileRoot, fileNewPath, fileName)
+       if err != nil {
+               return res, err
+       }
+
+       cc.Server.Logger.Debugw("Make alias", "src", fullFilePath, "dst", fullNewFilePath)
+
+       if err := FS.Symlink(fullFilePath, fullNewFilePath); err != nil {
+               res = append(res, cc.NewErrReply(t, "Error creating alias"))
+               return res, nil
+       }
+
+       res = append(res, cc.NewReply(t))
+       return res, err
+}