"math/big"
"os"
"path"
+ "path/filepath"
"sort"
"strings"
"time"
},
tranGetClientInfoText: {
Name: "tranGetClientInfoText",
- Handler: HandleGetClientConnInfoText,
+ Handler: HandleGetClientInfoText,
},
tranGetFileInfo: {
Name: "tranGetFileInfo",
Name: "tranUserBroadcast",
Handler: HandleUserBroadcast,
},
+ tranDownloadBanner: {
+ Name: "tranDownloadBanner",
+ Handler: HandleDownloadBanner,
+ },
}
func HandleChatSend(cc *ClientConn, t *Transaction) (res []Transaction, err error) {
}
}
- hlFile.ffo.FlatFileInformationFork.setComment(t.GetField(fieldFileComment).Data)
+ if err := hlFile.ffo.FlatFileInformationFork.setComment(t.GetField(fieldFileComment).Data); err != nil {
+ return res, err
+ }
w, err := hlFile.infoForkWriter()
if err != nil {
return res, err
return res, err
}
- cc.Server.Logger.Debugw("Move file", "src", filePath+"/"+fileName, "dst", fileNewPath+"/"+fileName)
+ cc.logger.Infow("Move file", "src", filePath+"/"+fileName, "dst", fileNewPath+"/"+fileName)
hlFile, err := newFileWrapper(cc.Server.FS, filePath, 0)
+ if err != nil {
+ return res, err
+ }
fi, err := hlFile.dataFile()
if err != nil {
res = append(res, cc.NewErrReply(t, "You are not allowed to create folders."))
return res, err
}
- newFolderPath := cc.Server.Config.FileRoot
folderName := string(t.GetField(fieldFileName).Data)
folderName = path.Join("/", folderName)
+ var subPath string
+
// fieldFilePath is only present for nested paths
if t.GetField(fieldFilePath).Data != nil {
var newFp FilePath
if err != nil {
return nil, err
}
- newFolderPath += newFp.String()
+
+ for _, pathItem := range newFp.Items {
+ subPath = filepath.Join("/", subPath, string(pathItem.Name))
+ }
}
- newFolderPath = path.Join(newFolderPath, folderName)
+ newFolderPath := path.Join(cc.Server.Config.FileRoot, subPath, folderName)
// TODO: check path and folder name lengths
if len(subFields) == 1 {
login := DecodeUserString(getField(fieldData, &subFields).Data)
- cc.Server.Logger.Infow("DeleteUser", "login", login)
+ cc.logger.Infow("DeleteUser", "login", login)
if !authorize(cc.Account.Access, accessDeleteUser) {
res = append(res, cc.NewErrReply(t, "You are not allowed to delete accounts."))
// check if the login dataFile; if so, we know we are updating an existing user
if acc, ok := cc.Server.Accounts[login]; ok {
- cc.Server.Logger.Infow("UpdateUser", "login", login)
+ cc.logger.Infow("UpdateUser", "login", login)
// account dataFile, so this is an update action
if !authorize(cc.Account.Access, accessModifyUser) {
return res, err
}
} else {
- cc.Server.Logger.Infow("CreateUser", "login", login)
+ cc.logger.Infow("CreateUser", "login", login)
if !authorize(cc.Account.Access, accessCreateUser) {
res = append(res, cc.NewErrReply(t, "You are not allowed to create new accounts."))
return 0, errors.New("unknown byte length")
}
-func HandleGetClientConnInfoText(cc *ClientConn, t *Transaction) (res []Transaction, err error) {
+// HandleGetClientInfoText returns user information for the specific user.
+//
+// Fields used in the request:
+// 103 User ID
+//
+// Fields used in the reply:
+// 102 User name
+// 101 Data User info text string
+func HandleGetClientInfoText(cc *ClientConn, t *Transaction) (res []Transaction, err error) {
if !authorize(cc.Account.Access, accessGetClientInfo) {
- res = append(res, cc.NewErrReply(t, "You are not allowed to get client info"))
+ res = append(res, cc.NewErrReply(t, "You are not allowed to get client info."))
return res, err
}
clientConn := cc.Server.Clients[uint16(clientID)]
if clientConn == nil {
- return res, errors.New("invalid client")
+ return append(res, cc.NewErrReply(t, "User not found.")), err
}
- // TODO: Implement non-hardcoded values
- template := `Nickname: %s
-Name: %s
-Account: %s
-Address: %s
-
--------- File Downloads ---------
-
-%s
-
-------- Folder Downloads --------
-
-None.
-
---------- File Uploads ----------
-
-None.
-
--------- Folder Uploads ---------
-
-None.
-
-------- Waiting Downloads -------
-
-None.
-
- `
-
- activeDownloads := clientConn.Transfers[FileDownload]
- activeDownloadList := "None."
- for _, dl := range activeDownloads {
- activeDownloadList += dl.String() + "\n"
- }
-
- template = fmt.Sprintf(
- template,
- clientConn.UserName,
- clientConn.Account.Name,
- clientConn.Account.Login,
- clientConn.RemoteAddr,
- activeDownloadList,
- )
- template = strings.Replace(template, "\n", "\r", -1)
-
res = append(res, cc.NewReply(t,
- NewField(fieldData, []byte(template)),
+ NewField(fieldData, []byte(clientConn.String())),
NewField(fieldUserName, clientConn.UserName),
))
return res, err
cc.UserName = t.GetField(fieldUserName).Data
*cc.Icon = t.GetField(fieldUserIconID).Data
+ cc.logger = cc.logger.With("name", string(cc.UserName))
+ cc.logger.Infow("Login successful", "clientVersion", fmt.Sprintf("%x", *cc.Version))
+
options := t.GetField(fieldOptions).Data
optBitmap := big.NewInt(int64(binary.BigEndian.Uint16(options)))
cc.AutoReply = []byte{}
}
- cc.notifyOthers(
+ for _, t := range cc.notifyOthers(
*NewTransaction(
tranNotifyChangeUser, nil,
NewField(fieldUserName, cc.UserName),
NewField(fieldUserIconID, *cc.Icon),
NewField(fieldUserFlags, *cc.Flags),
),
- )
+ ) {
+ cc.Server.outbox <- t
+ }
+
+ if cc.Server.Config.BannerFile != "" {
+ cc.Server.outbox <- *NewTransaction(tranServerBanner, cc.ID, NewField(fieldBannerType, []byte("JPEG")))
+ }
res = append(res, cc.NewReply(t))
return res, err
}
- newsPath := t.GetField(fieldNewsPath).Data
- cc.Server.Logger.Infow("NewsPath: ", "np", string(newsPath))
-
pathStrs := ReadNewsPath(t.GetField(fieldNewsPath).Data)
cats := cc.Server.GetNewsCatByPath(pathStrs)
name := string(t.GetField(fieldFileName).Data)
pathStrs := ReadNewsPath(t.GetField(fieldNewsPath).Data)
- cc.Server.Logger.Infof("Creating new news folder %s", name)
+ cc.logger.Infof("Creating new news folder %s", name)
cats := cc.Server.GetNewsCatByPath(pathStrs)
cats[name] = NewsCategoryListData15{
// TODO: determine if path is a Folder (Bundle) or Category and check for permission
- cc.Server.Logger.Infof("DelNewsItem %v", pathStrs)
+ cc.logger.Infof("DelNewsItem %v", pathStrs)
cats := cc.Server.ThreadedNews.Categories
return res, err
}
- transactionRef := cc.Server.NewTransactionRef()
- data := binary.BigEndian.Uint32(transactionRef)
+ xferSize := hlFile.ffo.TransferSize(0)
- ft := &FileTransfer{
- FileName: fileName,
- FilePath: filePath,
- ReferenceNumber: transactionRef,
- Type: FileDownload,
- }
+ ft := cc.newFileTransfer(FileDownload, fileName, filePath, xferSize)
// TODO: refactor to remove this
if resumeData != nil {
ft.fileResumeData = &frd
}
- xferSize := hlFile.ffo.TransferSize(0)
-
// Optional field for when a HL v1.5+ client requests file preview
// Used only for TEXT, JPEG, GIFF, BMP or PICT files
// The value will always be 2
xferSize = hlFile.ffo.FlatFileDataForkHeader.DataSize[:]
}
- cc.Server.mux.Lock()
- defer cc.Server.mux.Unlock()
- cc.Server.FileTransfers[data] = ft
-
- cc.Transfers[FileDownload] = append(cc.Transfers[FileDownload], ft)
-
res = append(res, cc.NewReply(t,
- NewField(fieldRefNum, transactionRef),
+ NewField(fieldRefNum, ft.refNum[:]),
NewField(fieldWaitingCount, []byte{0x00, 0x00}), // TODO: Implement waiting count
NewField(fieldTransferSize, xferSize),
NewField(fieldFileSize, hlFile.ffo.FlatFileDataForkHeader.DataSize[:]),
return res, err
}
- transactionRef := cc.Server.NewTransactionRef()
- data := binary.BigEndian.Uint32(transactionRef)
-
- fileTransfer := &FileTransfer{
- FileName: t.GetField(fieldFileName).Data,
- FilePath: t.GetField(fieldFilePath).Data,
- ReferenceNumber: transactionRef,
- Type: FolderDownload,
- }
- cc.Server.mux.Lock()
- cc.Server.FileTransfers[data] = fileTransfer
- cc.Server.mux.Unlock()
- cc.Transfers[FolderDownload] = append(cc.Transfers[FolderDownload], fileTransfer)
-
- 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
if err != nil {
return res, err
}
+
+ fileTransfer := cc.newFileTransfer(FolderDownload, t.GetField(fieldFileName).Data, t.GetField(fieldFilePath).Data, transferSize)
+
+ var fp FilePath
+ err = fp.UnmarshalBinary(t.GetField(fieldFilePath).Data)
+ if err != nil {
+ return res, err
+ }
+
res = append(res, cc.NewReply(t,
- NewField(fieldRefNum, transactionRef),
+ NewField(fieldRefNum, fileTransfer.ReferenceNumber),
NewField(fieldTransferSize, transferSize),
NewField(fieldFolderItemCount, itemCount),
NewField(fieldWaitingCount, []byte{0x00, 0x00}), // TODO: Implement waiting count
// 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 {
}
}
- fileTransfer := &FileTransfer{
- FileName: t.GetField(fieldFileName).Data,
- FilePath: t.GetField(fieldFilePath).Data,
- ReferenceNumber: transactionRef,
- Type: FolderUpload,
- FolderItemCount: t.GetField(fieldFolderItemCount).Data,
- TransferSize: t.GetField(fieldTransferSize).Data,
- }
- cc.Server.FileTransfers[data] = fileTransfer
+ fileTransfer := cc.newFileTransfer(FolderUpload,
+ t.GetField(fieldFileName).Data,
+ t.GetField(fieldFilePath).Data,
+ t.GetField(fieldTransferSize).Data,
+ )
+
+ fileTransfer.FolderItemCount = t.GetField(fieldFolderItemCount).Data
- res = append(res, cc.NewReply(t, NewField(fieldRefNum, transactionRef)))
+ res = append(res, cc.NewReply(t, NewField(fieldRefNum, fileTransfer.ReferenceNumber)))
return res, err
}
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
+ transferSize := t.GetField(fieldTransferSize).Data // not sent for resume
var fp FilePath
if filePath != nil {
return res, err
}
}
+ fullFilePath, err := readPath(cc.Server.Config.FileRoot, filePath, fileName)
+ if err != nil {
+ return res, err
+ }
- transactionRef := cc.Server.NewTransactionRef()
- data := binary.BigEndian.Uint32(transactionRef)
-
- cc.Server.mux.Lock()
- cc.Server.FileTransfers[data] = &FileTransfer{
- FileName: fileName,
- FilePath: filePath,
- ReferenceNumber: transactionRef,
- Type: FileUpload,
+ if _, err := cc.Server.FS.Stat(fullFilePath); err == nil {
+ res = append(res, cc.NewErrReply(t, fmt.Sprintf("Cannot accept upload because there is already a file named \"%v\". Try choosing a different name.", string(fileName))))
+ return res, err
}
- cc.Server.mux.Unlock()
- replyT := cc.NewReply(t, NewField(fieldRefNum, transactionRef))
+ ft := cc.newFileTransfer(FileUpload, fileName, filePath, transferSize)
+
+ replyT := cc.NewReply(t, NewField(fieldRefNum, ft.ReferenceNumber))
// client has requested to resume a partially transferred file
if transferOptions != nil {
- fullFilePath, err := readPath(cc.Server.Config.FileRoot, filePath, fileName)
- if err != nil {
- return res, err
- }
fileInfo, err := cc.Server.FS.Stat(fullFilePath + incompleteFileSuffix)
if err != nil {
b, _ := fileResumeData.BinaryMarshal()
+ ft.TransferSize = offset
+
replyT.Fields = append(replyT.Fields, NewField(fieldFileResumeData, b))
}
// Handle special case for drop box folders
if fp.IsDropbox() && !authorize(cc.Account.Access, accessViewDropBoxes) {
- res = append(res, cc.NewReply(t))
+ res = append(res, cc.NewErrReply(t, "You are not allowed to view drop boxes."))
return res, err
}
chatID := t.GetField(fieldChatID).Data
chatInt := binary.BigEndian.Uint32(chatID)
- privChat := cc.Server.PrivateChats[chatInt]
+ privChat, ok := cc.Server.PrivateChats[chatInt]
+ if !ok {
+ return res, nil
+ }
delete(privChat.ClientConn, cc.uint16ID())
return res, err
}
- cc.Server.Logger.Debugw("Make alias", "src", fullFilePath, "dst", fullNewFilePath)
+ cc.logger.Debugw("Make alias", "src", fullFilePath, "dst", fullNewFilePath)
if err := cc.Server.FS.Symlink(fullFilePath, fullNewFilePath); err != nil {
res = append(res, cc.NewErrReply(t, "Error creating alias"))
res = append(res, cc.NewReply(t))
return res, err
}
+
+func HandleDownloadBanner(cc *ClientConn, t *Transaction) (res []Transaction, err error) {
+ fi, err := cc.Server.FS.Stat(filepath.Join(cc.Server.ConfigDir, cc.Server.Config.BannerFile))
+ if err != nil {
+ return res, err
+ }
+
+ ft := cc.newFileTransfer(bannerDownload, []byte{}, []byte{}, make([]byte, 4))
+
+ binary.BigEndian.PutUint32(ft.TransferSize, uint32(fi.Size()))
+
+ res = append(res, cc.NewReply(t,
+ NewField(fieldRefNum, ft.refNum[:]),
+ NewField(fieldTransferSize, ft.TransferSize),
+ ))
+
+ return res, err
+}
git.r.bdr.sh / rbdr / mobius / blobdiff