patch: v0.0.16

[rbdr/mobius] / hotline / transaction_handlers.go

diff --git a/hotline/transaction_handlers.go b/hotline/transaction_handlers.go
index 0ae6071e35963b3616dd3b4868c917fb9f18cd70..ea4649933e26534180831b60df0a8a1ad89e0dd9 100644 (file)
--- a/hotline/transaction_handlers.go
+++ b/hotline/transaction_handlers.go
@@ -5,11 +5,11 @@ import (
        "encoding/binary"
        "errors"
        "fmt"
        "encoding/binary"
        "errors"
        "fmt"

-       "github.com/davecgh/go-spew/spew"

        "gopkg.in/yaml.v2"
        "io/ioutil"
        "math/big"
        "os"
        "gopkg.in/yaml.v2"
        "io/ioutil"
        "math/big"
        "os"

+       "path"

        "sort"
        "strings"
        "time"
        "sort"
        "strings"
        "time"


@@ -273,7 +273,7 @@ var TransactionHandlers = map[uint16]TransactionType{
                Handler: HandleSetUser,
        },
        tranUploadFile: {
                Handler: HandleSetUser,
        },
        tranUploadFile: {

-               Access:  accessUploadFile,
+               Access:  accessAlwaysAllow,

                DenyMsg: "You are not allowed to upload files.",
                Name:    "tranUploadFile",
                Handler: HandleUploadFile,
                DenyMsg: "You are not allowed to upload files.",
                Name:    "tranUploadFile",
                Handler: HandleUploadFile,


@@ -293,14 +293,14 @@ var TransactionHandlers = map[uint16]TransactionType{
 
 func HandleChatSend(cc *ClientConn, t *Transaction) (res []Transaction, err error) {
        // Truncate long usernames
 
 func HandleChatSend(cc *ClientConn, t *Transaction) (res []Transaction, err error) {
        // 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("\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")) {
        }
 
        if bytes.Equal(t.GetField(fieldData).Data, []byte("/stats")) {


@@ -360,7 +360,7 @@ func HandleSendInstantMsg(cc *ClientConn, t *Transaction) (res []Transaction, er
                        tranServerMsg,
                        &ID.Data,
                        NewField(fieldData, msg.Data),
                        tranServerMsg,
                        &ID.Data,
                        NewField(fieldData, msg.Data),

-                       NewField(fieldUserName, *cc.UserName),
+                       NewField(fieldUserName, cc.UserName),

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


@@ -384,7 +384,7 @@ func HandleSendInstantMsg(cc *ClientConn, t *Transaction) (res []Transaction, er
                                tranServerMsg,
                                cc.ID,
                                NewField(fieldData, *otherClient.AutoReply),
                                tranServerMsg,
                                cc.ID,
                                NewField(fieldData, *otherClient.AutoReply),

-                               NewField(fieldUserName, *otherClient.UserName),
+                               NewField(fieldUserName, otherClient.UserName),

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


@@ -397,17 +397,16 @@ func HandleSendInstantMsg(cc *ClientConn, t *Transaction) (res []Transaction, er
 }
 
 func HandleGetFileInfo(cc *ClientConn, t *Transaction) (res []Transaction, err error) {
 }
 
 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,
        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(fieldFileTypeString, ffo.FlatFileInformationFork.TypeSignature),
                NewField(fieldFileCreatorString, ffo.FlatFileInformationFork.CreatorSignature),
                NewField(fieldFileComment, ffo.FlatFileInformationFork.Comment),


@@ -428,14 +427,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) {
 // * 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)
+       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 {
        //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
                }
                if err != nil {
                        return res, err
                }


@@ -452,9 +461,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) {
                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
                }
        }
                        return res, err
                }
        }


@@ -469,16 +478,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) {
 // * 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 {
        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(); {
                return res, nil
        }
        switch mode := fi.Mode(); {


@@ -494,7 +506,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
        }
 
                return res, err
        }
 


@@ -505,8 +517,8 @@ 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)
 // 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)
 
 
        cc.Server.Logger.Debugw("Move file", "src", filePath+"/"+fileName, "dst", fileNewPath+"/"+fileName)
 


@@ -544,17 +556,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
 
 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 {
 
        // 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 += 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))
        }
 
        res = append(res, cc.NewReply(t))


@@ -610,7 +638,7 @@ func HandleSetUser(cc *ClientConn, t *Transaction) (res []Transaction, err error
                                tranNotifyChangeUser,
                                NewField(fieldUserID, *c.ID),
                                NewField(fieldUserFlags, *c.Flags),
                                tranNotifyChangeUser,
                                NewField(fieldUserID, *c.ID),
                                NewField(fieldUserFlags, *c.Flags),

-                               NewField(fieldUserName, *c.UserName),
+                               NewField(fieldUserName, c.UserName),

                                NewField(fieldUserIconID, *c.Icon),
                        )
                }
                                NewField(fieldUserIconID, *c.Icon),
                        )
                }


@@ -645,7 +673,7 @@ func HandleListUsers(cc *ClientConn, t *Transaction) (res []Transaction, err 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 {

-               userField := acc.Payload()
+               userField := acc.MarshalBinary()

                userFields = append(userFields, NewField(fieldData, userField))
        }
 
                userFields = append(userFields, NewField(fieldData, userField))
        }
 


@@ -756,7 +784,7 @@ None.
 
        template = fmt.Sprintf(
                template,
 
        template = fmt.Sprintf(
                template,

-               *clientConn.UserName,
+               clientConn.UserName,

                clientConn.Account.Name,
                clientConn.Account.Login,
                clientConn.Connection.RemoteAddr().String(),
                clientConn.Account.Name,
                clientConn.Account.Login,
                clientConn.Connection.RemoteAddr().String(),


@@ -766,7 +794,7 @@ None.
 
        res = append(res, cc.NewReply(t,
                NewField(fieldData, []byte(template)),
 
        res = append(res, cc.NewReply(t,
                NewField(fieldData, []byte(template)),

-               NewField(fieldUserName, *clientConn.UserName),
+               NewField(fieldUserName, clientConn.UserName),

        ))
        return res, err
 }
        ))
        return res, err
 }


@@ -782,7 +810,7 @@ func (cc *ClientConn) notifyNewUserHasJoined() (res []Transaction, err error) {
        cc.NotifyOthers(
                *NewTransaction(
                        tranNotifyChangeUser, nil,
        cc.NotifyOthers(
                *NewTransaction(
                        tranNotifyChangeUser, nil,

-                       NewField(fieldUserName, *cc.UserName),
+                       NewField(fieldUserName, cc.UserName),

                        NewField(fieldUserID, *cc.ID),
                        NewField(fieldUserIconID, *cc.Icon),
                        NewField(fieldUserFlags, *cc.Flags),
                        NewField(fieldUserID, *cc.ID),
                        NewField(fieldUserIconID, *cc.Icon),
                        NewField(fieldUserFlags, *cc.Flags),


@@ -796,7 +824,7 @@ func HandleTranAgreed(cc *ClientConn, t *Transaction) (res []Transaction, err er
        bs := make([]byte, 2)
        binary.BigEndian.PutUint16(bs, *cc.Server.NextGuestID)
 
        bs := make([]byte, 2)
        binary.BigEndian.PutUint16(bs, *cc.Server.NextGuestID)
 

-       *cc.UserName = t.GetField(fieldUserName).Data
+       cc.UserName = t.GetField(fieldUserName).Data

        *cc.ID = bs
        *cc.Icon = t.GetField(fieldUserIconID).Data
 
        *cc.ID = bs
        *cc.Icon = t.GetField(fieldUserIconID).Data
 


@@ -857,7 +885,7 @@ func HandleTranOldPostNews(cc *ClientConn, t *Transaction) (res []Transaction, e
                newsTemplate = cc.Server.Config.NewsDelimiter
        }
 
                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
        newsPost = strings.Replace(newsPost, "\n", "\r", -1)
 
        // update news in memory


@@ -916,9 +944,10 @@ func HandleGetNewsCatNameList(cc *ClientConn, t *Transaction) (res []Transaction
        var fieldData []Field
        for _, k := range keys {
                cat := cats[k]
        var fieldData []Field
        for _, k := range keys {
                cat := cats[k]

+               b, _ := cat.MarshalBinary()

                fieldData = append(fieldData, NewField(
                        fieldNewsCatListData15,
                fieldData = append(fieldData, NewField(
                        fieldNewsCatListData15,

-                       cat.Payload(),
+                       b,

                ))
        }
 
                ))
        }
 


@@ -1113,7 +1142,7 @@ func HandlePostNewsArt(cc *ClientConn, t *Transaction) (res []Transaction, err e
 
        newArt := NewsArtData{
                Title:         string(t.GetField(fieldNewsArtTitle).Data),
 
        newArt := NewsArtData{
                Title:         string(t.GetField(fieldNewsArtTitle).Data),

-               Poster:        string(*cc.UserName),
+               Poster:        string(cc.UserName),

                Date:          NewsDate(),
                PrevArt:       []byte{0, 0, 0, 0},
                NextArt:       []byte{0, 0, 0, 0},
                Date:          NewsDate(),
                PrevArt:       []byte{0, 0, 0, 0},
                NextArt:       []byte{0, 0, 0, 0},


@@ -1170,9 +1199,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
 
 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

 
 

-       ffo, err := NewFlattenedFileObject(cc.Server.Config.FileRoot+filePath, string(fileName))
+       var fp FilePath
+       err = fp.UnmarshalBinary(filePath)
+       if err != nil {
+               return res, err
+       }
+
+       ffo, err := NewFlattenedFileObject(cc.Server.Config.FileRoot, filePath, fileName)

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


@@ -1180,11 +1215,9 @@ func HandleDownloadFile(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)
 

-       cc.Server.Logger.Infow("File download", "path", filePath)
-

        ft := &FileTransfer{
                FileName:        fileName,
        ft := &FileTransfer{
                FileName:        fileName,

-               FilePath:        []byte(filePath),
+               FilePath:        filePath,

                ReferenceNumber: transactionRef,
                Type:            FileDownload,
        }
                ReferenceNumber: transactionRef,
                Type:            FileDownload,
        }


@@ -1239,9 +1272,14 @@ func HandleDownloadFolder(cc *ClientConn, t *Transaction) (res []Transaction, er
        cc.Server.FileTransfers[data] = fileTransfer
        cc.Transfers[FolderDownload] = append(cc.Transfers[FolderDownload], fileTransfer)
 
        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)

 
 

-       fullFilePath := fmt.Sprintf("./%v/%v", cc.Server.Config.FileRoot+fp.String(), string(fileTransfer.FileName))

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


@@ -1263,7 +1301,7 @@ func HandleDownloadFolder(cc *ClientConn, t *Transaction) (res []Transaction, er
 // Fields used in the request
 // 201 File name
 // 202 File path
 // 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) {
 // 220 Folder item count
 // 204 File transfer options   "Optional Currently set to 1" (TODO: ??)
 func HandleUploadFolder(cc *ClientConn, t *Transaction) (res []Transaction, err error) {


@@ -1285,21 +1323,25 @@ func HandleUploadFolder(cc *ClientConn, t *Transaction) (res []Transaction, err
 }
 
 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
+       }
+

        fileName := t.GetField(fieldFileName).Data
        filePath := t.GetField(fieldFilePath).Data
 
        transactionRef := cc.Server.NewTransactionRef()
        data := binary.BigEndian.Uint32(transactionRef)
 
        fileName := t.GetField(fieldFileName).Data
        filePath := t.GetField(fieldFilePath).Data
 
        transactionRef := cc.Server.NewTransactionRef()
        data := binary.BigEndian.Uint32(transactionRef)
 

-       fileTransfer := &FileTransfer{
+       cc.Server.FileTransfers[data] = &FileTransfer{

                FileName:        fileName,
                FilePath:        filePath,
                ReferenceNumber: transactionRef,
                Type:            FileUpload,
        }
 
                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
 }
        res = append(res, cc.NewReply(t, NewField(fieldRefNum, transactionRef)))
        return res, err
 }


@@ -1319,7 +1361,7 @@ func HandleSetClientUserInfo(cc *ClientConn, t *Transaction) (res []Transaction,
                icon = t.GetField(fieldUserIconID).Data
        }
        *cc.Icon = icon
                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
 
        // the options field is only passed by the client versions > 1.2.3.
        options := t.GetField(fieldOptions).Data


@@ -1354,7 +1396,7 @@ func HandleSetClientUserInfo(cc *ClientConn, t *Transaction) (res []Transaction,
                NewField(fieldUserID, *cc.ID),
                NewField(fieldUserIconID, *cc.Icon),
                NewField(fieldUserFlags, *cc.Flags),
                NewField(fieldUserID, *cc.ID),
                NewField(fieldUserIconID, *cc.Icon),
                NewField(fieldUserFlags, *cc.Flags),

-               NewField(fieldUserName, *cc.UserName),
+               NewField(fieldUserName, cc.UserName),

        )
 
        return res, err
        )
 
        return res, err


@@ -1370,14 +1412,16 @@ func HandleKeepAlive(cc *ClientConn, t *Transaction) (res []Transaction, err err
 }
 
 func HandleGetFileNameList(cc *ClientConn, t *Transaction) (res []Transaction, err error) {
 }
 
 func HandleGetFileNameList(cc *ClientConn, t *Transaction) (res []Transaction, err error) {

-       filePath := cc.Server.Config.FileRoot
-
-       path := t.GetField(fieldFilePath).Data
-       if len(path) > 0 {
-               filePath = cc.Server.Config.FileRoot + ReadFilePath(path)
+       fullPath, err := readPath(
+               cc.Server.Config.FileRoot,
+               t.GetField(fieldFilePath).Data,
+               nil,
+       )
+       if err != nil {
+               return res, err

        }
 
        }
 

-       fileNames, err := getFileNameList(filePath)
+       fileNames, err := getFileNameList(fullPath)

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


@@ -1410,7 +1454,7 @@ func HandleInviteNewChat(cc *ClientConn, t *Transaction) (res []Transaction, err
                        tranInviteToChat,
                        &targetID,
                        NewField(fieldChatID, newChatID),
                        tranInviteToChat,
                        &targetID,
                        NewField(fieldChatID, newChatID),

-                       NewField(fieldUserName, *cc.UserName),
+                       NewField(fieldUserName, cc.UserName),

                        NewField(fieldUserID, *cc.ID),
                ),
        )
                        NewField(fieldUserID, *cc.ID),
                ),
        )


@@ -1418,7 +1462,7 @@ func HandleInviteNewChat(cc *ClientConn, t *Transaction) (res []Transaction, err
        res = append(res,
                cc.NewReply(t,
                        NewField(fieldChatID, newChatID),
        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),
                        NewField(fieldUserID, *cc.ID),
                        NewField(fieldUserIconID, *cc.Icon),
                        NewField(fieldUserFlags, *cc.Flags),


@@ -1438,7 +1482,7 @@ func HandleInviteToChat(cc *ClientConn, t *Transaction) (res []Transaction, err
                        tranInviteToChat,
                        &targetID,
                        NewField(fieldChatID, chatID),
                        tranInviteToChat,
                        &targetID,
                        NewField(fieldChatID, chatID),

-                       NewField(fieldUserName, *cc.UserName),
+                       NewField(fieldUserName, cc.UserName),

                        NewField(fieldUserID, *cc.ID),
                ),
        )
                        NewField(fieldUserID, *cc.ID),
                ),
        )


@@ -1446,7 +1490,7 @@ func HandleInviteToChat(cc *ClientConn, t *Transaction) (res []Transaction, err
                cc.NewReply(
                        t,
                        NewField(fieldChatID, chatID),
                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),
                        NewField(fieldUserID, *cc.ID),
                        NewField(fieldUserIconID, *cc.Icon),
                        NewField(fieldUserFlags, *cc.Flags),


@@ -1462,7 +1506,7 @@ func HandleRejectChatInvite(cc *ClientConn, t *Transaction) (res []Transaction,
 
        privChat := cc.Server.PrivateChats[chatInt]
 
 
        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,
 
        for _, c := range sortedClients(privChat.ClientConn) {
                res = append(res,


@@ -1496,7 +1540,7 @@ func HandleJoinChat(cc *ClientConn, t *Transaction) (res []Transaction, err erro
                                tranNotifyChatChangeUser,
                                c.ID,
                                NewField(fieldChatID, chatID),
                                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),
                                NewField(fieldUserID, *cc.ID),
                                NewField(fieldUserIconID, *cc.Icon),
                                NewField(fieldUserFlags, *cc.Flags),


@@ -1512,7 +1556,7 @@ func HandleJoinChat(cc *ClientConn, t *Transaction) (res []Transaction, err erro
                        ID:    *c.ID,
                        Icon:  *c.Icon,
                        Flags: *c.Flags,
                        ID:    *c.ID,
                        Icon:  *c.Icon,
                        Flags: *c.Flags,

-                       Name:  string(*c.UserName),
+                       Name:  string(c.UserName),

                }
 
                replyFields = append(replyFields, NewField(fieldUsernameWithInfo, user.Payload()))
                }
 
                replyFields = append(replyFields, NewField(fieldUsernameWithInfo, user.Payload()))