X-Git-Url: https://git.r.bdr.sh/rbdr/mobius/blobdiff_plain/b8b0a6c9cb43d52aece4020163b612cfe87de898..5cc444c89968dda9060d4e2f458b1babb9b603cd:/hotline/transaction_handlers.go

diff --git a/hotline/transaction_handlers.go b/hotline/transaction_handlers.go
index d4269af..ff23684 100644
--- a/hotline/transaction_handlers.go
+++ b/hotline/transaction_handlers.go
@@ -6,6 +6,7 @@ import (
 	"errors"
 	"fmt"
 	"gopkg.in/yaml.v3"
+	"io"
 	"math/big"
 	"os"
 	"path"
@@ -459,7 +460,7 @@ func HandleSetFileInfo(cc *ClientConn, t *Transaction) (res []Transaction, err e
 		if err != nil {
 			return res, err
 		}
-		_, err = w.Write(hlFile.ffo.FlatFileInformationFork.MarshalBinary())
+		_, err = io.Copy(w, &hlFile.ffo.FlatFileInformationFork)
 		if err != nil {
 			return res, err
 		}
@@ -657,7 +658,7 @@ func HandleSetUser(cc *ClientConn, t *Transaction) (res []Transaction, err error
 		return res, err
 	}
 
-	login := decodeString(t.GetField(FieldUserLogin).Data)
+	login := string(encodeString(t.GetField(FieldUserLogin).Data))
 	userName := string(t.GetField(FieldUserName).Data)
 
 	newAccessLvl := t.GetField(FieldUserAccess).Data
@@ -747,13 +748,12 @@ func HandleListUsers(cc *ClientConn, t *Transaction) (res []Transaction, err err
 
 	var userFields []Field
 	for _, acc := range cc.Server.Accounts {
-		b := make([]byte, 0, 100)
-		n, err := acc.Read(b)
+		b, err := io.ReadAll(acc)
 		if err != nil {
 			return res, err
 		}
 
-		userFields = append(userFields, NewField(FieldData, b[:n]))
+		userFields = append(userFields, NewField(FieldData, b))
 	}
 
 	res = append(res, cc.NewReply(t, userFields...))
@@ -783,7 +783,7 @@ func HandleUpdateUser(cc *ClientConn, t *Transaction) (res []Transaction, err er
 				return res, err
 			}
 
-			login := decodeString(getField(FieldData, &subFields).Data)
+			login := string(encodeString(getField(FieldData, &subFields).Data))
 			cc.logger.Infow("DeleteUser", "login", login)
 
 			if err := cc.Server.DeleteUser(login); err != nil {
@@ -798,9 +798,9 @@ func HandleUpdateUser(cc *ClientConn, t *Transaction) (res []Transaction, err er
 		// If FieldData is included, this is a rename operation where FieldData contains the login of the existing
 		// account and FieldUserLogin contains the new login.
 		if getField(FieldData, &subFields) != nil {
-			loginToRename = decodeString(getField(FieldData, &subFields).Data)
+			loginToRename = string(encodeString(getField(FieldData, &subFields).Data))
 		}
-		userLogin := decodeString(getField(FieldUserLogin, &subFields).Data)
+		userLogin := string(encodeString(getField(FieldUserLogin, &subFields).Data))
 		if loginToRename != "" {
 			accountToUpdate = loginToRename
 		} else {
@@ -842,8 +842,8 @@ func HandleUpdateUser(cc *ClientConn, t *Transaction) (res []Transaction, err er
 			}
 
 			err = cc.Server.UpdateUser(
-				decodeString(getField(FieldData, &subFields).Data),
-				decodeString(getField(FieldUserLogin, &subFields).Data),
+				string(encodeString(getField(FieldData, &subFields).Data)),
+				string(encodeString(getField(FieldUserLogin, &subFields).Data)),
 				string(getField(FieldUserName, &subFields).Data),
 				acc.Password,
 				acc.Access,
@@ -889,7 +889,7 @@ func HandleNewUser(cc *ClientConn, t *Transaction) (res []Transaction, err error
 		return res, err
 	}
 
-	login := decodeString(t.GetField(FieldUserLogin).Data)
+	login := string(encodeString(t.GetField(FieldUserLogin).Data))
 
 	// If the account already dataFile, reply with an error
 	if _, ok := cc.Server.Accounts[login]; ok {
@@ -925,7 +925,7 @@ func HandleDeleteUser(cc *ClientConn, t *Transaction) (res []Transaction, err er
 		return res, nil
 	}
 
-	login := decodeString(t.GetField(FieldUserLogin).Data)
+	login := string(encodeString(t.GetField(FieldUserLogin).Data))
 
 	if err := cc.Server.DeleteUser(login); err != nil {
 		return res, err
@@ -1194,7 +1194,7 @@ func HandleNewNewsCat(cc *ClientConn, t *Transaction) (res []Transaction, err er
 	cats := cc.Server.GetNewsCatByPath(pathStrs)
 	cats[name] = NewsCategoryListData15{
 		Name:     name,
-		Type:     []byte{0, 3},
+		Type:     [2]byte{0, 3},
 		Articles: map[uint32]*NewsArtData{},
 		SubCats:  make(map[string]NewsCategoryListData15),
 	}
@@ -1223,7 +1223,7 @@ func HandleNewNewsFldr(cc *ClientConn, t *Transaction) (res []Transaction, err e
 	cats := cc.Server.GetNewsCatByPath(pathStrs)
 	cats[name] = NewsCategoryListData15{
 		Name:     name,
-		Type:     []byte{0, 2},
+		Type:     [2]byte{0, 2},
 		Articles: map[uint32]*NewsArtData{},
 		SubCats:  make(map[string]NewsCategoryListData15),
 	}
@@ -1258,7 +1258,12 @@ func HandleGetNewsArtNameList(cc *ClientConn, t *Transaction) (res []Transaction
 
 	nald := cat.GetNewsArtListData()
 
-	res = append(res, cc.NewReply(t, NewField(FieldNewsArtListData, nald.Payload())))
+	b, err := io.ReadAll(&nald)
+	if err != nil {
+
+	}
+
+	res = append(res, cc.NewReply(t, NewField(FieldNewsArtListData, b)))
 	return res, err
 }
 
@@ -1337,7 +1342,7 @@ func HandleDelNewsItem(cc *ClientConn, t *Transaction) (res []Transaction, err e
 		}
 	}
 
-	if bytes.Equal(cats[delName].Type, []byte{0, 3}) {
+	if cats[delName].Type == [2]byte{0, 3} {
 		if !cc.Authorize(accessNewsDeleteCat) {
 			return append(res, cc.NewErrReply(t, "You are not allowed to delete news categories.")), nil
 		}
@@ -1918,14 +1923,17 @@ func HandleJoinChat(cc *ClientConn, t *Transaction) (res []Transaction, err erro
 
 	replyFields := []Field{NewField(FieldChatSubject, []byte(privChat.Subject))}
 	for _, c := range sortedClients(privChat.ClientConn) {
-		user := User{
+
+		b, err := io.ReadAll(&User{
 			ID:    *c.ID,
 			Icon:  c.Icon,
 			Flags: c.Flags,
 			Name:  string(c.UserName),
+		})
+		if err != nil {
+			return res, nil
 		}
-
-		replyFields = append(replyFields, NewField(FieldUsernameWithInfo, user.Payload()))
+		replyFields = append(replyFields, NewField(FieldUsernameWithInfo, b))
 	}
 
 	res = append(res, cc.NewReply(t, replyFields...))