minor: v0.3.0

[rbdr/mobius] / hotline / transaction_handlers.go

diff --git a/hotline/transaction_handlers.go b/hotline/transaction_handlers.go
index ade846e6d3d283a3149cfeb06fe7980263eb1309..ec7910a49fdad6af34d9d5c551ef367934eb4d3e 100644 (file)
--- a/hotline/transaction_handlers.go
+++ b/hotline/transaction_handlers.go
@@ -5,7 +5,7 @@ import (
        "encoding/binary"
        "errors"
        "fmt"
        "encoding/binary"
        "errors"
        "fmt"

-       "gopkg.in/yaml.v2"
+       "gopkg.in/yaml.v3"

        "io/ioutil"
        "math/big"
        "os"
        "io/ioutil"
        "math/big"
        "os"


@@ -50,8 +50,7 @@ var TransactionHandlers = map[uint16]TransactionType{
                Handler: HandleTranAgreed,
        },
        tranChatSend: {
                Handler: HandleTranAgreed,
        },
        tranChatSend: {

-               Access:  accessSendChat,
-               DenyMsg: "You are not allowed to participate in chat.",
+               Access:  accessAlwaysAllow,

                Handler: HandleChatSend,
                Name:    "tranChatSend",
                RequiredFields: []requiredField{
                Handler: HandleChatSend,
                Name:    "tranChatSend",
                RequiredFields: []requiredField{


@@ -80,8 +79,7 @@ var TransactionHandlers = map[uint16]TransactionType{
                Handler: HandleDeleteFile,
        },
        tranDeleteUser: {
                Handler: HandleDeleteFile,
        },
        tranDeleteUser: {

-               Access:  accessDeleteUser,
-               DenyMsg: "You are not allowed to delete accounts.",
+               Access:  accessAlwaysAllow,

                Name:    "tranDeleteUser",
                Handler: HandleDeleteUser,
        },
                Name:    "tranDeleteUser",
                Handler: HandleDeleteUser,
        },


@@ -92,8 +90,7 @@ var TransactionHandlers = map[uint16]TransactionType{
                Handler: HandleDisconnectUser,
        },
        tranDownloadFile: {
                Handler: HandleDisconnectUser,
        },
        tranDownloadFile: {

-               Access:  accessDownloadFile,
-               DenyMsg: "You are not allowed to download files.",
+               Access:  accessAlwaysAllow,

                Name:    "tranDownloadFile",
                Handler: HandleDownloadFile,
        },
                Name:    "tranDownloadFile",
                Handler: HandleDownloadFile,
        },


@@ -120,8 +117,7 @@ var TransactionHandlers = map[uint16]TransactionType{
                Handler: HandleGetFileNameList,
        },
        tranGetMsgs: {
                Handler: HandleGetFileNameList,
        },
        tranGetMsgs: {

-               Access:  accessNewsReadArt,
-               DenyMsg: "You are not allowed to read news.",
+               Access:  accessAlwaysAllow,

                Name:    "tranGetMsgs",
                Handler: HandleGetMsgs,
        },
                Name:    "tranGetMsgs",
                Handler: HandleGetMsgs,
        },


@@ -144,8 +140,7 @@ var TransactionHandlers = map[uint16]TransactionType{
                Handler: HandleGetNewsCatNameList,
        },
        tranGetUser: {
                Handler: HandleGetNewsCatNameList,
        },
        tranGetUser: {

-               Access:  accessOpenUser,
-               DenyMsg: "You are not allowed to view accounts.",
+               Access:  accessAlwaysAllow,

                Name:    "tranGetUser",
                Handler: HandleGetUser,
        },
                Name:    "tranGetUser",
                Handler: HandleGetUser,
        },


@@ -181,10 +176,8 @@ var TransactionHandlers = map[uint16]TransactionType{
                Name:    "tranJoinChat",
                Handler: HandleLeaveChat,
        },
                Name:    "tranJoinChat",
                Handler: HandleLeaveChat,
        },

-

        tranListUsers: {
        tranListUsers: {

-               Access:  accessOpenUser,
-               DenyMsg: "You are not allowed to view accounts.",
+               Access:  accessAlwaysAllow,

                Name:    "tranListUsers",
                Handler: HandleListUsers,
        },
                Name:    "tranListUsers",
                Handler: HandleListUsers,
        },


@@ -213,8 +206,7 @@ var TransactionHandlers = map[uint16]TransactionType{
                Handler: HandleNewNewsFldr,
        },
        tranNewUser: {
                Handler: HandleNewNewsFldr,
        },
        tranNewUser: {

-               Access:  accessCreateUser,
-               DenyMsg: "You are not allowed to create new accounts.",
+               Access:  accessAlwaysAllow,

                Name:    "tranNewUser",
                Handler: HandleNewUser,
        },
                Name:    "tranNewUser",
                Handler: HandleNewUser,
        },


@@ -237,8 +229,8 @@ var TransactionHandlers = map[uint16]TransactionType{
        },
        tranSendInstantMsg: {
                Access: accessAlwaysAllow,
        },
        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{
                Name:    "tranSendInstantMsg",
                Handler: HandleSendInstantMsg,
                RequiredFields: []requiredField{


@@ -272,7 +264,7 @@ var TransactionHandlers = map[uint16]TransactionType{
                Handler: HandleSetClientUserInfo,
        },
        tranSetFileInfo: {
                Handler: HandleSetClientUserInfo,
        },
        tranSetFileInfo: {

-               Access:  accessAlwaysAllow, // granular access is in the handler
+               Access:  accessAlwaysAllow,

                Name:    "tranSetFileInfo",
                Handler: HandleSetFileInfo,
        },
                Name:    "tranSetFileInfo",
                Handler: HandleSetFileInfo,
        },


@@ -284,12 +276,11 @@ var TransactionHandlers = map[uint16]TransactionType{
        },
        tranUploadFile: {
                Access:  accessAlwaysAllow,
        },
        tranUploadFile: {
                Access:  accessAlwaysAllow,

-               DenyMsg: "You are not allowed to upload files.",

                Name:    "tranUploadFile",
                Handler: HandleUploadFile,
        },
        tranUploadFldr: {
                Name:    "tranUploadFile",
                Handler: HandleUploadFile,
        },
        tranUploadFldr: {

-               Access:  accessAlwaysAllow, // TODO: what should this be?
+               Access:  accessAlwaysAllow,

                Name:    "tranUploadFldr",
                Handler: HandleUploadFolder,
        },
                Name:    "tranUploadFldr",
                Handler: HandleUploadFolder,
        },


@@ -302,6 +293,11 @@ var TransactionHandlers = map[uint16]TransactionType{
 }
 
 func HandleChatSend(cc *ClientConn, t *Transaction) (res []Transaction, err error) {
 }
 
 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)
        formattedMsg := fmt.Sprintf("\r%.14s:  %s", trunc, t.GetField(fieldData).Data)
        // Truncate long usernames
        trunc := fmt.Sprintf("%13s", cc.UserName)
        formattedMsg := fmt.Sprintf("\r%.14s:  %s", trunc, t.GetField(fieldData).Data)


@@ -323,8 +319,10 @@ func HandleChatSend(cc *ClientConn, t *Transaction) (res []Transaction, err erro
                chatInt := binary.BigEndian.Uint32(chatID)
                privChat := cc.Server.PrivateChats[chatInt]
 
                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
                // send the message to all connected clients of the private chat

-               for _, c := range privChat.ClientConn {
+               for _, c := range clients {

                        res = append(res, *NewTransaction(
                                tranChatMsg,
                                c.ID,
                        res = append(res, *NewTransaction(
                                tranChatMsg,
                                c.ID,


@@ -357,43 +355,42 @@ func HandleChatSend(cc *ClientConn, t *Transaction) (res []Transaction, err erro
 //     101     Data    Optional
 //     214     Quoting message Optional
 //
 //     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)
 // 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)

 
 

-       res = append(res,
-               *NewTransaction(
-                       tranServerMsg,
-                       &ID.Data,
-                       NewField(fieldData, msg.Data),
-                       NewField(fieldUserName, cc.UserName),
-                       NewField(fieldUserID, *cc.ID),
-                       NewField(fieldOptions, []byte{0, 1}),
-               ),
+       reply := *NewTransaction(
+               tranServerMsg,
+               &ID.Data,
+               NewField(fieldData, msg.Data),
+               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)
-       //}
+       // Later versions of Hotline include the original message in the fieldQuotingMsg field so
+       //  the receiving client can display both the received message and what it is in reply to
+       if t.GetField(fieldQuotingMsg).Data != nil {
+               reply.Fields = append(reply.Fields, NewField(fieldQuotingMsg, t.GetField(fieldQuotingMsg).Data))
+       }
+
+       res = append(res, reply)

 
 

+       id, _ := byteToInt(ID.Data)

        otherClient := cc.Server.Clients[uint16(id)]
        if otherClient == nil {
                return res, errors.New("ohno")
        }
 
        // Respond with auto reply if other client has it enabled
        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,
                res = append(res,
                        *NewTransaction(
                                tranServerMsg,
                                cc.ID,

-                               NewField(fieldData, *otherClient.AutoReply),
+                               NewField(fieldData, otherClient.AutoReply),

                                NewField(fieldUserName, otherClient.UserName),
                                NewField(fieldUserID, *otherClient.ID),
                                NewField(fieldOptions, []byte{0, 1}),
                                NewField(fieldUserName, otherClient.UserName),
                                NewField(fieldUserID, *otherClient.ID),
                                NewField(fieldOptions, []byte{0, 1}),


@@ -410,7 +407,7 @@ func HandleGetFileInfo(cc *ClientConn, t *Transaction) (res []Transaction, err e
        fileName := t.GetField(fieldFileName).Data
        filePath := t.GetField(fieldFilePath).Data
 
        fileName := t.GetField(fieldFileName).Data
        filePath := t.GetField(fieldFilePath).Data
 

-       ffo, err := NewFlattenedFileObject(cc.Server.Config.FileRoot, filePath, fileName)
+       ffo, err := NewFlattenedFileObject(cc.Server.Config.FileRoot, filePath, fileName, 0)

        if err != nil {
                return res, err
        }
        if err != nil {
                return res, err
        }


@@ -423,7 +420,7 @@ func HandleGetFileInfo(cc *ClientConn, t *Transaction) (res []Transaction, err e
                NewField(fieldFileType, ffo.FlatFileInformationFork.TypeSignature),
                NewField(fieldFileCreateDate, ffo.FlatFileInformationFork.CreateDate),
                NewField(fieldFileModifyDate, ffo.FlatFileInformationFork.ModifyDate),
                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
 }
        ))
        return res, err
 }


@@ -450,7 +447,7 @@ func HandleSetFileInfo(cc *ClientConn, t *Transaction) (res []Transaction, err e
                return nil, err
        }
 
                return nil, err
        }
 

-       //fileComment := t.GetField(fieldFileComment).Data
+       // fileComment := t.GetField(fieldFileComment).Data

        fileNewName := t.GetField(fieldFileNewName).Data
 
        if fileNewName != nil {
        fileNewName := t.GetField(fieldFileNewName).Data
 
        if fileNewName != nil {


@@ -532,8 +529,8 @@ func HandleMoveFile(cc *ClientConn, t *Transaction) (res []Transaction, err erro
 
        cc.Server.Logger.Debugw("Move file", "src", filePath+"/"+fileName, "dst", fileNewPath+"/"+fileName)
 
 
        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
        }
        if err != nil {
                return res, err
        }


@@ -654,19 +651,19 @@ func HandleSetUser(cc *ClientConn, t *Transaction) (res []Transaction, err error
                }
        }
 
                }
        }
 

-       // 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) {
        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)
-       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 {
        if account == nil {

-               errorT := cc.NewErrReply(t, "Account does not exist.")
-               res = append(res, errorT)
+               res = append(res, cc.NewErrReply(t, "Account does not exist."))

                return res, err
        }
 
                return res, err
        }
 


@@ -680,6 +677,11 @@ func HandleGetUser(cc *ClientConn, t *Transaction) (res []Transaction, err error
 }
 
 func HandleListUsers(cc *ClientConn, t *Transaction) (res []Transaction, err error) {
 }
 
 func HandleListUsers(cc *ClientConn, t *Transaction) (res []Transaction, err error) {

+       if !authorize(cc.Account.Access, accessOpenUser) {
+               res = append(res, cc.NewErrReply(t, "You are not allowed to view accounts."))
+               return res, err
+       }
+

        var userFields []Field
        // TODO: make order deterministic
        for _, acc := range cc.Server.Accounts {
        var userFields []Field
        // TODO: make order deterministic
        for _, acc := range cc.Server.Accounts {


@@ -693,10 +695,14 @@ func HandleListUsers(cc *ClientConn, t *Transaction) (res []Transaction, err err
 
 // HandleNewUser creates a new user account
 func HandleNewUser(cc *ClientConn, t *Transaction) (res []Transaction, err error) {
 
 // HandleNewUser creates a new user account
 func HandleNewUser(cc *ClientConn, t *Transaction) (res []Transaction, err error) {

+       if !authorize(cc.Account.Access, accessCreateUser) {
+               res = append(res, cc.NewErrReply(t, "You are not allowed to create new accounts."))
+               return res, err
+       }
+

        login := DecodeUserString(t.GetField(fieldUserLogin).Data)
 
        // If the account already exists, reply with an error
        login := DecodeUserString(t.GetField(fieldUserLogin).Data)
 
        // If the account already exists, reply with an error

-       // TODO: make order deterministic

        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 _, 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


@@ -716,6 +722,11 @@ func HandleNewUser(cc *ClientConn, t *Transaction) (res []Transaction, err error
 }
 
 func HandleDeleteUser(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)
 
        // TODO: Handle case where account doesn't exist; e.g. delete race condition
        login := DecodeUserString(t.GetField(fieldUserLogin).Data)
 


@@ -815,21 +826,6 @@ func HandleGetUserNameList(cc *ClientConn, t *Transaction) (res []Transaction, e
        return res, err
 }
 
        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) {
        cc.Agreed = true
        cc.UserName = t.GetField(fieldUserName).Data
 func HandleTranAgreed(cc *ClientConn, t *Transaction) (res []Transaction, err error) {
        cc.Agreed = true
        cc.UserName = t.GetField(fieldUserName).Data


@@ -854,12 +850,20 @@ func HandleTranAgreed(cc *ClientConn, t *Transaction) (res []Transaction, err er
 
        // Check auto response
        if optBitmap.Bit(autoResponse) == 1 {
 
        // Check auto response
        if optBitmap.Bit(autoResponse) == 1 {

-               *cc.AutoReply = t.GetField(fieldAutomaticResponse).Data
+               cc.AutoReply = t.GetField(fieldAutomaticResponse).Data

        } else {
        } 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))
 
 
        res = append(res, cc.NewReply(t))
 


@@ -1015,9 +1019,9 @@ func HandleGetNewsArtNameList(cc *ClientConn, t *Transaction) (res []Transaction
        var cat NewsCategoryListData15
        cats := cc.Server.ThreadedNews.Categories
 
        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()
        }
 
        nald := cat.GetNewsArtListData()


@@ -1028,7 +1032,7 @@ func HandleGetNewsArtNameList(cc *ClientConn, t *Transaction) (res []Transaction
 
 func HandleGetNewsArtData(cc *ClientConn, t *Transaction) (res []Transaction, err error) {
        // Request fields
 
 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
 
        // 326  News article ID
        // 327  News article data flavor
 


@@ -1037,9 +1041,9 @@ func HandleGetNewsArtData(cc *ClientConn, t *Transaction) (res []Transaction, er
        var cat NewsCategoryListData15
        cats := cc.Server.ThreadedNews.Categories
 
        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
 
        }
        newsArtID := t.GetField(fieldNewsArtID).Data
 


@@ -1089,8 +1093,8 @@ func HandleDelNewsItem(cc *ClientConn, t *Transaction) (res []Transaction, err e
 
        delName := pathStrs[len(pathStrs)-1]
        if len(pathStrs) > 1 {
 
        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

                }
        }
 
                }
        }
 


@@ -1199,22 +1203,45 @@ func HandlePostNewsArt(cc *ClientConn, t *Transaction) (res []Transaction, err e
 
 // HandleGetMsgs returns the flat news data
 func HandleGetMsgs(cc *ClientConn, t *Transaction) (res []Transaction, err error) {
 
 // HandleGetMsgs returns the flat news data
 func HandleGetMsgs(cc *ClientConn, t *Transaction) (res []Transaction, err error) {

+       if !authorize(cc.Account.Access, accessNewsReadArt) {
+               res = append(res, cc.NewErrReply(t, "You are not allowed to read news."))
+               return res, err
+       }
+

        res = append(res, cc.NewReply(t, NewField(fieldData, cc.Server.FlatNews)))
 
        return res, err
 }
 
 func HandleDownloadFile(cc *ClientConn, t *Transaction) (res []Transaction, err error) {
        res = append(res, cc.NewReply(t, NewField(fieldData, cc.Server.FlatNews)))
 
        return res, err
 }
 
 func HandleDownloadFile(cc *ClientConn, t *Transaction) (res []Transaction, err error) {

+       if !authorize(cc.Account.Access, accessDownloadFile) {
+               res = append(res, cc.NewErrReply(t, "You are not allowed to download files."))
+               return res, err
+       }
+

        fileName := t.GetField(fieldFileName).Data
        filePath := t.GetField(fieldFilePath).Data
 
        fileName := t.GetField(fieldFileName).Data
        filePath := t.GetField(fieldFilePath).Data
 

+       // 2 bytes
+       // transferOptions := t.GetField(fieldFileTransferOptions).Data
+       resumeData := t.GetField(fieldFileResumeData).Data
+
+       var dataOffset int64
+       var frd FileResumeData
+       if resumeData != nil {
+               if err := frd.UnmarshalBinary(t.GetField(fieldFileResumeData).Data); err != nil {
+                       return res, err
+               }
+               dataOffset = int64(binary.BigEndian.Uint32(frd.ForkInfoList[0].DataSize[:]))
+       }
+

        var fp FilePath
        err = fp.UnmarshalBinary(filePath)
        if err != nil {
                return res, err
        }
 
        var fp FilePath
        err = fp.UnmarshalBinary(filePath)
        if err != nil {
                return res, err
        }
 

-       ffo, err := NewFlattenedFileObject(cc.Server.Config.FileRoot, filePath, fileName)
+       ffo, err := NewFlattenedFileObject(cc.Server.Config.FileRoot, filePath, fileName, dataOffset)

        if err != nil {
                return res, err
        }
        if err != nil {
                return res, err
        }


@@ -1229,6 +1256,12 @@ func HandleDownloadFile(cc *ClientConn, t *Transaction) (res []Transaction, err
                Type:            FileDownload,
        }
 
                Type:            FileDownload,
        }
 

+       if resumeData != nil {
+               var frd FileResumeData
+               frd.UnmarshalBinary(t.GetField(fieldFileResumeData).Data)
+               ft.fileResumeData = &frd
+       }
+

        cc.Server.FileTransfers[data] = ft
        cc.Transfers[FileDownload] = append(cc.Transfers[FileDownload], ft)
 
        cc.Server.FileTransfers[data] = ft
        cc.Transfers[FileDownload] = append(cc.Transfers[FileDownload], ft)
 


@@ -1236,7 +1269,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(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
        ))
 
        return res, err


@@ -1286,6 +1319,9 @@ func HandleDownloadFolder(cc *ClientConn, t *Transaction) (res []Transaction, er
        }
 
        fullFilePath, err := readPath(cc.Server.Config.FileRoot, t.GetField(fieldFilePath).Data, t.GetField(fieldFileName).Data)
        }
 
        fullFilePath, err := readPath(cc.Server.Config.FileRoot, t.GetField(fieldFilePath).Data, t.GetField(fieldFileName).Data)

+       if err != nil {
+               return res, err
+       }

 
        transferSize, err := CalcTotalSize(fullFilePath)
        if err != nil {
 
        transferSize, err := CalcTotalSize(fullFilePath)
        if err != nil {


@@ -1315,6 +1351,21 @@ func HandleUploadFolder(cc *ClientConn, t *Transaction) (res []Transaction, err
        transactionRef := cc.Server.NewTransactionRef()
        data := binary.BigEndian.Uint32(transactionRef)
 
        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,
        fileTransfer := &FileTransfer{
                FileName:        t.GetField(fieldFileName).Data,
                FilePath:        t.GetField(fieldFilePath).Data,


@@ -1329,8 +1380,14 @@ func HandleUploadFolder(cc *ClientConn, t *Transaction) (res []Transaction, err
        return res, err
 }
 
        return res, err
 }
 

+// HandleUploadFile
+// Fields used in the request:
+// 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) {
 func HandleUploadFile(cc *ClientConn, t *Transaction) (res []Transaction, err error) {

-       // TODO: add permission handing for upload folders and drop boxes

        if !authorize(cc.Account.Access, accessUploadFile) {
                res = append(res, cc.NewErrReply(t, "You are not allowed to upload files."))
                return res, err
        if !authorize(cc.Account.Access, accessUploadFile) {
                res = append(res, cc.NewErrReply(t, "You are not allowed to upload files."))
                return res, err


@@ -1339,6 +1396,26 @@ func HandleUploadFile(cc *ClientConn, t *Transaction) (res []Transaction, err er
        fileName := t.GetField(fieldFileName).Data
        filePath := t.GetField(fieldFilePath).Data
 
        fileName := t.GetField(fieldFileName).Data
        filePath := t.GetField(fieldFilePath).Data
 

+       transferOptions := t.GetField(fieldFileTransferOptions).Data
+
+       // TODO: is this field useful for anything?
+       // transferSize := t.GetField(fieldTransferSize).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)
 
        transactionRef := cc.Server.NewTransactionRef()
        data := binary.BigEndian.Uint32(transactionRef)
 


@@ -1349,17 +1426,36 @@ func HandleUploadFile(cc *ClientConn, t *Transaction) (res []Transaction, err er
                Type:            FileUpload,
        }
 
                Type:            FileUpload,
        }
 

-       res = append(res, cc.NewReply(t, NewField(fieldRefNum, transactionRef)))
+       replyT := cc.NewReply(t, NewField(fieldRefNum, transactionRef))
+
+       // client has requested to resume a partially transfered file
+       if transferOptions != nil {
+               fullFilePath, err := readPath(cc.Server.Config.FileRoot, filePath, fileName)
+               if err != nil {
+                       return res, err
+               }
+
+               fileInfo, err := FS.Stat(fullFilePath + incompleteFileSuffix)
+               if err != nil {
+                       return res, err
+               }
+
+               offset := make([]byte, 4)
+               binary.BigEndian.PutUint32(offset, uint32(fileInfo.Size()))
+
+               fileResumeData := NewFileResumeData([]ForkInfoList{
+                       *NewForkInfoList(offset),
+               })
+
+               b, _ := fileResumeData.BinaryMarshal()
+
+               replyT.Fields = append(replyT.Fields, NewField(fieldFileResumeData, b))
+       }
+
+       res = append(res, replyT)

        return res, err
 }
 
        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 {
 func HandleSetClientUserInfo(cc *ClientConn, t *Transaction) (res []Transaction, err error) {
        var icon []byte
        if len(t.GetField(fieldUserIconID).Data) == 4 {


@@ -1385,9 +1481,9 @@ func HandleSetClientUserInfo(cc *ClientConn, t *Transaction) (res []Transaction,
 
                // Check auto response
                if optBitmap.Bit(autoResponse) == 1 {
 
                // Check auto response
                if optBitmap.Bit(autoResponse) == 1 {

-                       *cc.AutoReply = t.GetField(fieldAutomaticResponse).Data
+                       cc.AutoReply = t.GetField(fieldAutomaticResponse).Data

                } else {
                } else {

-                       *cc.AutoReply = []byte{}
+                       cc.AutoReply = []byte{}

                }
        }
 
                }
        }
 


@@ -1422,6 +1518,19 @@ func HandleGetFileNameList(cc *ClientConn, t *Transaction) (res []Transaction, e
                return res, err
        }
 
                return res, err
        }
 

+       var fp FilePath
+       if t.GetField(fieldFilePath).Data != nil {
+               if err = fp.UnmarshalBinary(t.GetField(fieldFilePath).Data); err != nil {
+                       return res, err
+               }
+       }
+
+       // 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
        fileNames, err := getFileNameList(fullPath)
        if err != nil {
                return res, err