X-Git-Url: https://git.r.bdr.sh/rbdr/mobius/blobdiff_plain/43754e316aee5cffa5b50f7bf879178709368000..8ff2b66d1583b38298dfa415588df89631023695:/hotline/transaction_handlers.go

diff --git a/hotline/transaction_handlers.go b/hotline/transaction_handlers.go
index 23ee0e6..8e2ef6b 100644
--- a/hotline/transaction_handlers.go
+++ b/hotline/transaction_handlers.go
@@ -582,7 +582,7 @@ func HandleNewFolder(cc *ClientConn, t *Transaction) (res []Transaction, err err
 	// fieldFilePath is only present for nested paths
 	if t.GetField(fieldFilePath).Data != nil {
 		var newFp FilePath
-		err := newFp.UnmarshalBinary(t.GetField(fieldFilePath).Data)
+		_, err := newFp.Write(t.GetField(fieldFilePath).Data)
 		if err != nil {
 			return nil, err
 		}
@@ -921,7 +921,7 @@ func HandleTranAgreed(cc *ClientConn, t *Transaction) (res []Transaction, err er
 	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))
+	cc.logger.Infow("Login successful", "clientVersion", fmt.Sprintf("%v", func() int { i, _ := byteToInt(cc.Version); return i }()))
 
 	options := t.GetField(fieldOptions).Data
 	optBitmap := big.NewInt(int64(binary.BigEndian.Uint16(options)))
@@ -1244,18 +1244,15 @@ func HandleGetNewsArtData(cc *ClientConn, t *Transaction) (res []Transaction, er
 	return res, err
 }
 
+// HandleDelNewsItem deletes an existing threaded news folder or category from the server.
+// Fields used in the request:
+// 325	News path
+// Fields used in the reply:
+// None
 func HandleDelNewsItem(cc *ClientConn, t *Transaction) (res []Transaction, err error) {
-	// Has multiple access flags: News Delete Folder (37) or News Delete Category (35)
-	// TODO: Implement
-
 	pathStrs := ReadNewsPath(t.GetField(fieldNewsPath).Data)
 
-	// TODO: determine if path is a Folder (Bundle) or Category and check for permission
-
-	cc.logger.Infof("DelNewsItem %v", pathStrs)
-
 	cats := cc.Server.ThreadedNews.Categories
-
 	delName := pathStrs[len(pathStrs)-1]
 	if len(pathStrs) > 1 {
 		for _, fp := range pathStrs[0 : len(pathStrs)-1] {
@@ -1263,17 +1260,23 @@ func HandleDelNewsItem(cc *ClientConn, t *Transaction) (res []Transaction, err e
 		}
 	}
 
+	if bytes.Compare(cats[delName].Type, []byte{0, 3}) == 0 {
+		if !cc.Authorize(accessNewsDeleteCat) {
+			return append(res, cc.NewErrReply(t, "You are not allowed to delete news categories.")), nil
+		}
+	} else {
+		if !cc.Authorize(accessNewsDeleteFldr) {
+			return append(res, cc.NewErrReply(t, "You are not allowed to delete news folders.")), nil
+		}
+	}
+
 	delete(cats, delName)
 
-	err = cc.Server.writeThreadedNews()
-	if err != nil {
+	if err := cc.Server.writeThreadedNews(); err != nil {
 		return res, err
 	}
 
-	// Reply params: none
-	res = append(res, cc.NewReply(t))
-
-	return res, err
+	return append(res, cc.NewReply(t)), nil
 }
 
 func HandleDelNewsArt(cc *ClientConn, t *Transaction) (res []Transaction, err error) {
@@ -1472,7 +1475,7 @@ func HandleDownloadFolder(cc *ClientConn, t *Transaction) (res []Transaction, er
 	fileTransfer := cc.newFileTransfer(FolderDownload, t.GetField(fieldFileName).Data, t.GetField(fieldFilePath).Data, transferSize)
 
 	var fp FilePath
-	err = fp.UnmarshalBinary(t.GetField(fieldFilePath).Data)
+	_, err = fp.Write(t.GetField(fieldFilePath).Data)
 	if err != nil {
 		return res, err
 	}
@@ -1496,7 +1499,7 @@ func HandleDownloadFolder(cc *ClientConn, t *Transaction) (res []Transaction, er
 func HandleUploadFolder(cc *ClientConn, t *Transaction) (res []Transaction, err error) {
 	var fp FilePath
 	if t.GetField(fieldFilePath).Data != nil {
-		if err = fp.UnmarshalBinary(t.GetField(fieldFilePath).Data); err != nil {
+		if _, err = fp.Write(t.GetField(fieldFilePath).Data); err != nil {
 			return res, err
 		}
 	}
@@ -1541,7 +1544,7 @@ func HandleUploadFile(cc *ClientConn, t *Transaction) (res []Transaction, err er
 
 	var fp FilePath
 	if filePath != nil {
-		if err = fp.UnmarshalBinary(filePath); err != nil {
+		if _, err = fp.Write(filePath); err != nil {
 			return res, err
 		}
 	}
@@ -1658,7 +1661,7 @@ func HandleGetFileNameList(cc *ClientConn, t *Transaction) (res []Transaction, e
 
 	var fp FilePath
 	if t.GetField(fieldFilePath).Data != nil {
-		if err = fp.UnmarshalBinary(t.GetField(fieldFilePath).Data); err != nil {
+		if _, err = fp.Write(t.GetField(fieldFilePath).Data); err != nil {
 			return res, err
 		}
 	}