X-Git-Url: https://git.r.bdr.sh/rbdr/mobius/blobdiff_plain/02b446d81d53ba3ccd4175917a62563bbda54199..5853654f0a618dc89f893992a7f0d211456483f8:/hotline/transaction_handlers_test.go

diff --git a/hotline/transaction_handlers_test.go b/hotline/transaction_handlers_test.go
index 424a8e5..69dedf9 100644
--- a/hotline/transaction_handlers_test.go
+++ b/hotline/transaction_handlers_test.go
@@ -4,6 +4,7 @@ import (
 	"errors"
 	"fmt"
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/mock"
 	"io/fs"
 	"math/rand"
 	"os"
@@ -36,13 +37,13 @@ func TestHandleSetChatSubject(t *testing.T) {
 								ClientConn: map[uint16]*ClientConn{
 									uint16(1): {
 										Account: &Account{
-											Access: &[]byte{255, 255, 255, 255, 255, 255, 255, 255},
+											Access: accessBitmap{255, 255, 255, 255, 255, 255, 255, 255},
 										},
 										ID: &[]byte{0, 1},
 									},
 									uint16(2): {
 										Account: &Account{
-											Access: &[]byte{255, 255, 255, 255, 255, 255, 255, 255},
+											Access: accessBitmap{255, 255, 255, 255, 255, 255, 255, 255},
 										},
 										ID: &[]byte{0, 2},
 									},
@@ -52,13 +53,13 @@ func TestHandleSetChatSubject(t *testing.T) {
 						Clients: map[uint16]*ClientConn{
 							uint16(1): {
 								Account: &Account{
-									Access: &[]byte{255, 255, 255, 255, 255, 255, 255, 255},
+									Access: accessBitmap{255, 255, 255, 255, 255, 255, 255, 255},
 								},
 								ID: &[]byte{0, 1},
 							},
 							uint16(2): {
 								Account: &Account{
-									Access: &[]byte{255, 255, 255, 255, 255, 255, 255, 255},
+									Access: accessBitmap{255, 255, 255, 255, 255, 255, 255, 255},
 								},
 								ID: &[]byte{0, 2},
 							},
@@ -144,13 +145,13 @@ func TestHandleLeaveChat(t *testing.T) {
 								ClientConn: map[uint16]*ClientConn{
 									uint16(1): {
 										Account: &Account{
-											Access: &[]byte{255, 255, 255, 255, 255, 255, 255, 255},
+											Access: accessBitmap{255, 255, 255, 255, 255, 255, 255, 255},
 										},
 										ID: &[]byte{0, 1},
 									},
 									uint16(2): {
 										Account: &Account{
-											Access: &[]byte{255, 255, 255, 255, 255, 255, 255, 255},
+											Access: accessBitmap{255, 255, 255, 255, 255, 255, 255, 255},
 										},
 										ID: &[]byte{0, 2},
 									},
@@ -160,13 +161,13 @@ func TestHandleLeaveChat(t *testing.T) {
 						Clients: map[uint16]*ClientConn{
 							uint16(1): {
 								Account: &Account{
-									Access: &[]byte{255, 255, 255, 255, 255, 255, 255, 255},
+									Access: accessBitmap{255, 255, 255, 255, 255, 255, 255, 255},
 								},
 								ID: &[]byte{0, 1},
 							},
 							uint16(2): {
 								Account: &Account{
-									Access: &[]byte{255, 255, 255, 255, 255, 255, 255, 255},
+									Access: accessBitmap{255, 255, 255, 255, 255, 255, 255, 255},
 								},
 								ID: &[]byte{0, 2},
 							},
@@ -228,24 +229,21 @@ func TestHandleGetUserNameList(t *testing.T) {
 						Clients: map[uint16]*ClientConn{
 							uint16(1): {
 								ID:       &[]byte{0, 1},
-								Icon:     &[]byte{0, 2},
-								Flags:    &[]byte{0, 3},
+								Icon:     []byte{0, 2},
+								Flags:    []byte{0, 3},
 								UserName: []byte{0, 4},
-								Agreed:   true,
 							},
 							uint16(2): {
 								ID:       &[]byte{0, 2},
-								Icon:     &[]byte{0, 2},
-								Flags:    &[]byte{0, 3},
+								Icon:     []byte{0, 2},
+								Flags:    []byte{0, 3},
 								UserName: []byte{0, 4},
-								Agreed:   true,
 							},
 							uint16(3): {
 								ID:       &[]byte{0, 3},
-								Icon:     &[]byte{0, 2},
-								Flags:    &[]byte{0, 3},
+								Icon:     []byte{0, 2},
+								Flags:    []byte{0, 3},
 								UserName: []byte{0, 4},
-								Agreed:   false,
 							},
 						},
 					},
@@ -260,7 +258,7 @@ func TestHandleGetUserNameList(t *testing.T) {
 					clientID:  &[]byte{1, 1},
 					Flags:     0x00,
 					IsReply:   0x01,
-					Type:      []byte{0, 1},
+					Type:      []byte{0, 0},
 					ID:        []byte{0, 0, 0, 1},
 					ErrorCode: []byte{0, 0, 0, 0},
 					Fields: []Field{
@@ -306,11 +304,10 @@ func TestHandleChatSend(t *testing.T) {
 			args: args{
 				cc: &ClientConn{
 					Account: &Account{
-						Access: func() *[]byte {
+						Access: func() accessBitmap {
 							var bits accessBitmap
 							bits.Set(accessSendChat)
-							access := bits[:]
-							return &access
+							return bits
 						}(),
 					},
 					UserName: []byte{0x00, 0x01},
@@ -318,13 +315,13 @@ func TestHandleChatSend(t *testing.T) {
 						Clients: map[uint16]*ClientConn{
 							uint16(1): {
 								Account: &Account{
-									Access: &[]byte{255, 255, 255, 255, 255, 255, 255, 255},
+									Access: accessBitmap{255, 255, 255, 255, 255, 255, 255, 255},
 								},
 								ID: &[]byte{0, 1},
 							},
 							uint16(2): {
 								Account: &Account{
-									Access: &[]byte{255, 255, 255, 255, 255, 255, 255, 255},
+									Access: accessBitmap{255, 255, 255, 255, 255, 255, 255, 255},
 								},
 								ID: &[]byte{0, 2},
 							},
@@ -363,15 +360,76 @@ func TestHandleChatSend(t *testing.T) {
 			},
 			wantErr: false,
 		},
+		{
+			name: "treats Chat ID 00 00 00 00 as a public chat message",
+			args: args{
+				cc: &ClientConn{
+					Account: &Account{
+						Access: func() accessBitmap {
+							var bits accessBitmap
+							bits.Set(accessSendChat)
+							return bits
+						}(),
+					},
+					UserName: []byte{0x00, 0x01},
+					Server: &Server{
+						Clients: map[uint16]*ClientConn{
+							uint16(1): {
+								Account: &Account{
+									Access: accessBitmap{255, 255, 255, 255, 255, 255, 255, 255},
+								},
+								ID: &[]byte{0, 1},
+							},
+							uint16(2): {
+								Account: &Account{
+									Access: accessBitmap{255, 255, 255, 255, 255, 255, 255, 255},
+								},
+								ID: &[]byte{0, 2},
+							},
+						},
+					},
+				},
+				t: &Transaction{
+					Fields: []Field{
+						NewField(fieldData, []byte("hai")),
+						NewField(fieldChatID, []byte{0, 0, 0, 0}),
+					},
+				},
+			},
+			want: []Transaction{
+				{
+					clientID:  &[]byte{0, 1},
+					Flags:     0x00,
+					IsReply:   0x00,
+					Type:      []byte{0, 0x6a},
+					ID:        []byte{0x9a, 0xcb, 0x04, 0x42}, // Random ID from rand.Seed(1)
+					ErrorCode: []byte{0, 0, 0, 0},
+					Fields: []Field{
+						NewField(fieldData, []byte{0x0d, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x01, 0x3a, 0x20, 0x20, 0x68, 0x61, 0x69}),
+					},
+				},
+				{
+					clientID:  &[]byte{0, 2},
+					Flags:     0x00,
+					IsReply:   0x00,
+					Type:      []byte{0, 0x6a},
+					ID:        []byte{0xf0, 0xc5, 0x34, 0x1e}, // Random ID from rand.Seed(1)
+					ErrorCode: []byte{0, 0, 0, 0},
+					Fields: []Field{
+						NewField(fieldData, []byte{0x0d, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x01, 0x3a, 0x20, 0x20, 0x68, 0x61, 0x69}),
+					},
+				},
+			},
+			wantErr: false,
+		},
 		{
 			name: "when user does not have required permission",
 			args: args{
 				cc: &ClientConn{
 					Account: &Account{
-						Access: func() *[]byte {
+						Access: func() accessBitmap {
 							var bits accessBitmap
-							access := bits[:]
-							return &access
+							return bits
 						}(),
 					},
 					Server: &Server{
@@ -398,15 +456,14 @@ func TestHandleChatSend(t *testing.T) {
 			wantErr: false,
 		},
 		{
-			name: "sends chat msg as emote if fieldChatOptions is set",
+			name: "sends chat msg as emote if fieldChatOptions is set to 1",
 			args: args{
 				cc: &ClientConn{
 					Account: &Account{
-						Access: func() *[]byte {
+						Access: func() accessBitmap {
 							var bits accessBitmap
 							bits.Set(accessSendChat)
-							access := bits[:]
-							return &access
+							return bits
 						}(),
 					},
 					UserName: []byte("Testy McTest"),
@@ -414,13 +471,13 @@ func TestHandleChatSend(t *testing.T) {
 						Clients: map[uint16]*ClientConn{
 							uint16(1): {
 								Account: &Account{
-									Access: &[]byte{255, 255, 255, 255, 255, 255, 255, 255},
+									Access: accessBitmap{255, 255, 255, 255, 255, 255, 255, 255},
 								},
 								ID: &[]byte{0, 1},
 							},
 							uint16(2): {
 								Account: &Account{
-									Access: &[]byte{255, 255, 255, 255, 255, 255, 255, 255},
+									Access: accessBitmap{255, 255, 255, 255, 255, 255, 255, 255},
 								},
 								ID: &[]byte{0, 2},
 							},
@@ -460,16 +517,77 @@ func TestHandleChatSend(t *testing.T) {
 			},
 			wantErr: false,
 		},
+		{
+			name: "does not send chat msg as emote if fieldChatOptions is set to 0",
+			args: args{
+				cc: &ClientConn{
+					Account: &Account{
+						Access: func() accessBitmap {
+							var bits accessBitmap
+							bits.Set(accessSendChat)
+							return bits
+						}(),
+					},
+					UserName: []byte("Testy McTest"),
+					Server: &Server{
+						Clients: map[uint16]*ClientConn{
+							uint16(1): {
+								Account: &Account{
+									Access: accessBitmap{255, 255, 255, 255, 255, 255, 255, 255},
+								},
+								ID: &[]byte{0, 1},
+							},
+							uint16(2): {
+								Account: &Account{
+									Access: accessBitmap{255, 255, 255, 255, 255, 255, 255, 255},
+								},
+								ID: &[]byte{0, 2},
+							},
+						},
+					},
+				},
+				t: &Transaction{
+					Fields: []Field{
+						NewField(fieldData, []byte("hello")),
+						NewField(fieldChatOptions, []byte{0x00, 0x00}),
+					},
+				},
+			},
+			want: []Transaction{
+				{
+					clientID:  &[]byte{0, 1},
+					Flags:     0x00,
+					IsReply:   0x00,
+					Type:      []byte{0, 0x6a},
+					ID:        []byte{0x9a, 0xcb, 0x04, 0x42},
+					ErrorCode: []byte{0, 0, 0, 0},
+					Fields: []Field{
+						NewField(fieldData, []byte("\r Testy McTest:  hello")),
+					},
+				},
+				{
+					clientID:  &[]byte{0, 2},
+					Flags:     0x00,
+					IsReply:   0x00,
+					Type:      []byte{0, 0x6a},
+					ID:        []byte{0xf0, 0xc5, 0x34, 0x1e},
+					ErrorCode: []byte{0, 0, 0, 0},
+					Fields: []Field{
+						NewField(fieldData, []byte("\r Testy McTest:  hello")),
+					},
+				},
+			},
+			wantErr: false,
+		},
 		{
 			name: "only sends chat msg to clients with accessReadChat permission",
 			args: args{
 				cc: &ClientConn{
 					Account: &Account{
-						Access: func() *[]byte {
+						Access: func() accessBitmap {
 							var bits accessBitmap
 							bits.Set(accessSendChat)
-							access := bits[:]
-							return &access
+							return bits
 						}(),
 					},
 					UserName: []byte{0x00, 0x01},
@@ -477,13 +595,16 @@ func TestHandleChatSend(t *testing.T) {
 						Clients: map[uint16]*ClientConn{
 							uint16(1): {
 								Account: &Account{
-									Access: &[]byte{255, 255, 255, 255, 255, 255, 255, 255},
-								},
+									Access: func() accessBitmap {
+										var bits accessBitmap
+										bits.Set(accessReadChat)
+										return bits
+									}()},
 								ID: &[]byte{0, 1},
 							},
 							uint16(2): {
 								Account: &Account{
-									Access: &[]byte{0, 0, 0, 0, 0, 0, 0, 0},
+									Access: accessBitmap{0, 0, 0, 0, 0, 0, 0, 0},
 								},
 								ID: &[]byte{0, 2},
 							},
@@ -516,11 +637,10 @@ func TestHandleChatSend(t *testing.T) {
 			args: args{
 				cc: &ClientConn{
 					Account: &Account{
-						Access: func() *[]byte {
+						Access: func() accessBitmap {
 							var bits accessBitmap
 							bits.Set(accessSendChat)
-							access := bits[:]
-							return &access
+							return bits
 						}(),
 					},
 					UserName: []byte{0x00, 0x01},
@@ -540,19 +660,19 @@ func TestHandleChatSend(t *testing.T) {
 						Clients: map[uint16]*ClientConn{
 							uint16(1): {
 								Account: &Account{
-									Access: &[]byte{255, 255, 255, 255, 255, 255, 255, 255},
+									Access: accessBitmap{255, 255, 255, 255, 255, 255, 255, 255},
 								},
 								ID: &[]byte{0, 1},
 							},
 							uint16(2): {
 								Account: &Account{
-									Access: &[]byte{0, 0, 0, 0, 0, 0, 0, 0},
+									Access: accessBitmap{0, 0, 0, 0, 0, 0, 0, 0},
 								},
 								ID: &[]byte{0, 2},
 							},
 							uint16(3): {
 								Account: &Account{
-									Access: &[]byte{0, 0, 0, 0, 0, 0, 0, 0},
+									Access: accessBitmap{0, 0, 0, 0, 0, 0, 0, 0},
 								},
 								ID: &[]byte{0, 3},
 							},
@@ -647,7 +767,7 @@ func TestHandleGetFileInfo(t *testing.T) {
 					clientID:  &[]byte{0, 1},
 					Flags:     0x00,
 					IsReply:   0x01,
-					Type:      []byte{0, 0xce},
+					Type:      []byte{0, 0},
 					ID:        []byte{0x9a, 0xcb, 0x04, 0x42}, // Random ID from rand.Seed(1)
 					ErrorCode: []byte{0, 0, 0, 0},
 					Fields: []Field{
@@ -702,10 +822,9 @@ func TestHandleNewFolder(t *testing.T) {
 			args: args{
 				cc: &ClientConn{
 					Account: &Account{
-						Access: func() *[]byte {
+						Access: func() accessBitmap {
 							var bits accessBitmap
-							access := bits[:]
-							return &access
+							return bits
 						}(),
 					},
 				},
@@ -733,11 +852,10 @@ func TestHandleNewFolder(t *testing.T) {
 			args: args{
 				cc: &ClientConn{
 					Account: &Account{
-						Access: func() *[]byte {
+						Access: func() accessBitmap {
 							var bits accessBitmap
 							bits.Set(accessCreateFolder)
-							access := bits[:]
-							return &access
+							return bits
 						}(),
 					},
 					ID: &[]byte{0, 1},
@@ -769,7 +887,7 @@ func TestHandleNewFolder(t *testing.T) {
 					clientID:  &[]byte{0, 1},
 					Flags:     0x00,
 					IsReply:   0x01,
-					Type:      []byte{0, 0xcd},
+					Type:      []byte{0, 0},
 					ID:        []byte{0x9a, 0xcb, 0x04, 0x42}, // Random ID from rand.Seed(1)
 					ErrorCode: []byte{0, 0, 0, 0},
 				},
@@ -781,11 +899,10 @@ func TestHandleNewFolder(t *testing.T) {
 			args: args{
 				cc: &ClientConn{
 					Account: &Account{
-						Access: func() *[]byte {
+						Access: func() accessBitmap {
 							var bits accessBitmap
 							bits.Set(accessCreateFolder)
-							access := bits[:]
-							return &access
+							return bits
 						}(),
 					},
 					ID: &[]byte{0, 1},
@@ -811,7 +928,7 @@ func TestHandleNewFolder(t *testing.T) {
 					clientID:  &[]byte{0, 1},
 					Flags:     0x00,
 					IsReply:   0x01,
-					Type:      []byte{0, 0xcd},
+					Type:      []byte{0, 0},
 					ID:        []byte{0x9a, 0xcb, 0x04, 0x42}, // Random ID from rand.Seed(1)
 					ErrorCode: []byte{0, 0, 0, 0},
 				},
@@ -819,15 +936,14 @@ func TestHandleNewFolder(t *testing.T) {
 			wantErr: false,
 		},
 		{
-			name: "when UnmarshalBinary returns an err",
+			name: "when Write returns an err",
 			args: args{
 				cc: &ClientConn{
 					Account: &Account{
-						Access: func() *[]byte {
+						Access: func() accessBitmap {
 							var bits accessBitmap
 							bits.Set(accessCreateFolder)
-							access := bits[:]
-							return &access
+							return bits
 						}(),
 					},
 					ID: &[]byte{0, 1},
@@ -859,11 +975,10 @@ func TestHandleNewFolder(t *testing.T) {
 			args: args{
 				cc: &ClientConn{
 					Account: &Account{
-						Access: func() *[]byte {
+						Access: func() accessBitmap {
 							var bits accessBitmap
 							bits.Set(accessCreateFolder)
-							access := bits[:]
-							return &access
+							return bits
 						}(),
 					},
 					ID: &[]byte{0, 1},
@@ -889,7 +1004,7 @@ func TestHandleNewFolder(t *testing.T) {
 					clientID:  &[]byte{0, 1},
 					Flags:     0x00,
 					IsReply:   0x01,
-					Type:      []byte{0, 0xcd},
+					Type:      []byte{0, 0},
 					ID:        []byte{0x9a, 0xcb, 0x04, 0x42}, // Random ID from rand.Seed(1)
 					ErrorCode: []byte{0, 0, 0, 0},
 				},
@@ -900,11 +1015,10 @@ func TestHandleNewFolder(t *testing.T) {
 			args: args{
 				cc: &ClientConn{
 					Account: &Account{
-						Access: func() *[]byte {
+						Access: func() accessBitmap {
 							var bits accessBitmap
 							bits.Set(accessCreateFolder)
-							access := bits[:]
-							return &access
+							return bits
 						}(),
 					},
 					ID: &[]byte{0, 1},
@@ -939,7 +1053,7 @@ func TestHandleNewFolder(t *testing.T) {
 					clientID:  &[]byte{0, 1},
 					Flags:     0x00,
 					IsReply:   0x01,
-					Type:      []byte{0, 0xcd},
+					Type:      []byte{0, 0},
 					ID:        []byte{0x9a, 0xcb, 0x04, 0x42}, // Random ID from rand.Seed(1)
 					ErrorCode: []byte{0, 0, 0, 0},
 				},
@@ -978,15 +1092,20 @@ func TestHandleUploadFile(t *testing.T) {
 			args: args{
 				cc: &ClientConn{
 					Server: &Server{
-						FileTransfers: map[uint32]*FileTransfer{},
+						FS:            &OSFileStore{},
+						fileTransfers: map[[4]byte]*FileTransfer{},
+						Config: &Config{
+							FileRoot: func() string { path, _ := os.Getwd(); return path + "/test/config/Files" }(),
+						}},
+					transfers: map[int]map[[4]byte]*FileTransfer{
+						FileUpload: {},
 					},
 					Account: &Account{
-						Access: func() *[]byte {
+						Access: func() accessBitmap {
 							var bits accessBitmap
 							bits.Set(accessUploadFile)
 							bits.Set(accessUploadAnywhere)
-							access := bits[:]
-							return &access
+							return bits
 						}(),
 					},
 				},
@@ -1005,7 +1124,7 @@ func TestHandleUploadFile(t *testing.T) {
 				{
 					Flags:     0x00,
 					IsReply:   0x01,
-					Type:      []byte{0, 0xcb},
+					Type:      []byte{0, 0},
 					ID:        []byte{0x9a, 0xcb, 0x04, 0x42},
 					ErrorCode: []byte{0, 0, 0, 0},
 					Fields: []Field{
@@ -1020,15 +1139,11 @@ func TestHandleUploadFile(t *testing.T) {
 			args: args{
 				cc: &ClientConn{
 					Account: &Account{
-						Access: func() *[]byte {
+						Access: func() accessBitmap {
 							var bits accessBitmap
-							access := bits[:]
-							return &access
+							return bits
 						}(),
 					},
-					Server: &Server{
-						FileTransfers: map[uint32]*FileTransfer{},
-					},
 				},
 				t: NewTransaction(
 					tranUploadFile, &[]byte{0, 1},
@@ -1088,11 +1203,10 @@ func TestHandleMakeAlias(t *testing.T) {
 				cc: &ClientConn{
 					logger: NewTestLogger(),
 					Account: &Account{
-						Access: func() *[]byte {
+						Access: func() accessBitmap {
 							var bits accessBitmap
 							bits.Set(accessMakeAlias)
-							access := bits[:]
-							return &access
+							return bits
 						}(),
 					},
 					Server: &Server{
@@ -1126,7 +1240,7 @@ func TestHandleMakeAlias(t *testing.T) {
 				{
 					Flags:     0x00,
 					IsReply:   0x01,
-					Type:      []byte{0, 0xd1},
+					Type:      []byte{0, 0},
 					ID:        []byte{0x9a, 0xcb, 0x04, 0x42},
 					ErrorCode: []byte{0, 0, 0, 0},
 					Fields:    []Field(nil),
@@ -1140,11 +1254,10 @@ func TestHandleMakeAlias(t *testing.T) {
 				cc: &ClientConn{
 					logger: NewTestLogger(),
 					Account: &Account{
-						Access: func() *[]byte {
+						Access: func() accessBitmap {
 							var bits accessBitmap
 							bits.Set(accessMakeAlias)
-							access := bits[:]
-							return &access
+							return bits
 						}(),
 					},
 					Server: &Server{
@@ -1194,10 +1307,9 @@ func TestHandleMakeAlias(t *testing.T) {
 				cc: &ClientConn{
 					logger: NewTestLogger(),
 					Account: &Account{
-						Access: func() *[]byte {
+						Access: func() accessBitmap {
 							var bits accessBitmap
-							access := bits[:]
-							return &access
+							return bits
 						}(),
 					},
 					Server: &Server{
@@ -1270,11 +1382,10 @@ func TestHandleGetUser(t *testing.T) {
 			args: args{
 				cc: &ClientConn{
 					Account: &Account{
-						Access: func() *[]byte {
+						Access: func() accessBitmap {
 							var bits accessBitmap
 							bits.Set(accessOpenUser)
-							access := bits[:]
-							return &access
+							return bits
 						}(),
 					},
 					Server: &Server{
@@ -1283,7 +1394,7 @@ func TestHandleGetUser(t *testing.T) {
 								Login:    "guest",
 								Name:     "Guest",
 								Password: "password",
-								Access:   &[]byte{1},
+								Access:   accessBitmap{},
 							},
 						},
 					},
@@ -1297,14 +1408,14 @@ func TestHandleGetUser(t *testing.T) {
 				{
 					Flags:     0x00,
 					IsReply:   0x01,
-					Type:      []byte{0x01, 0x60},
+					Type:      []byte{0, 0},
 					ID:        []byte{0x9a, 0xcb, 0x04, 0x42},
 					ErrorCode: []byte{0, 0, 0, 0},
 					Fields: []Field{
 						NewField(fieldUserName, []byte("Guest")),
 						NewField(fieldUserLogin, negateString([]byte("guest"))),
 						NewField(fieldUserPassword, []byte("password")),
-						NewField(fieldUserAccess, []byte{1}),
+						NewField(fieldUserAccess, []byte{0, 0, 0, 0, 0, 0, 0, 0}),
 					},
 				},
 			},
@@ -1315,10 +1426,9 @@ func TestHandleGetUser(t *testing.T) {
 			args: args{
 				cc: &ClientConn{
 					Account: &Account{
-						Access: func() *[]byte {
+						Access: func() accessBitmap {
 							var bits accessBitmap
-							access := bits[:]
-							return &access
+							return bits
 						}(),
 					},
 					Server: &Server{
@@ -1349,11 +1459,10 @@ func TestHandleGetUser(t *testing.T) {
 			args: args{
 				cc: &ClientConn{
 					Account: &Account{
-						Access: func() *[]byte {
+						Access: func() accessBitmap {
 							var bits accessBitmap
 							bits.Set(accessOpenUser)
-							access := bits[:]
-							return &access
+							return bits
 						}(),
 					},
 					Server: &Server{
@@ -1408,11 +1517,10 @@ func TestHandleDeleteUser(t *testing.T) {
 			args: args{
 				cc: &ClientConn{
 					Account: &Account{
-						Access: func() *[]byte {
+						Access: func() accessBitmap {
 							var bits accessBitmap
 							bits.Set(accessDeleteUser)
-							access := bits[:]
-							return &access
+							return bits
 						}(),
 					},
 					Server: &Server{
@@ -1421,7 +1529,7 @@ func TestHandleDeleteUser(t *testing.T) {
 								Login:    "testuser",
 								Name:     "Testy McTest",
 								Password: "password",
-								Access:   &[]byte{1},
+								Access:   accessBitmap{},
 							},
 						},
 						FS: func() *MockFileStore {
@@ -1440,7 +1548,7 @@ func TestHandleDeleteUser(t *testing.T) {
 				{
 					Flags:     0x00,
 					IsReply:   0x01,
-					Type:      []byte{0x1, 0x5f},
+					Type:      []byte{0, 0},
 					ID:        []byte{0x9a, 0xcb, 0x04, 0x42},
 					ErrorCode: []byte{0, 0, 0, 0},
 					Fields:    []Field(nil),
@@ -1453,10 +1561,9 @@ func TestHandleDeleteUser(t *testing.T) {
 			args: args{
 				cc: &ClientConn{
 					Account: &Account{
-						Access: func() *[]byte {
+						Access: func() accessBitmap {
 							var bits accessBitmap
-							access := bits[:]
-							return &access
+							return bits
 						}(),
 					},
 					Server: &Server{
@@ -1511,11 +1618,10 @@ func TestHandleGetMsgs(t *testing.T) {
 			args: args{
 				cc: &ClientConn{
 					Account: &Account{
-						Access: func() *[]byte {
+						Access: func() accessBitmap {
 							var bits accessBitmap
 							bits.Set(accessNewsReadArt)
-							access := bits[:]
-							return &access
+							return bits
 						}(),
 					},
 					Server: &Server{
@@ -1530,7 +1636,7 @@ func TestHandleGetMsgs(t *testing.T) {
 				{
 					Flags:     0x00,
 					IsReply:   0x01,
-					Type:      []byte{0, 0x65},
+					Type:      []byte{0, 0},
 					ID:        []byte{0x9a, 0xcb, 0x04, 0x42},
 					ErrorCode: []byte{0, 0, 0, 0},
 					Fields: []Field{
@@ -1545,10 +1651,9 @@ func TestHandleGetMsgs(t *testing.T) {
 			args: args{
 				cc: &ClientConn{
 					Account: &Account{
-						Access: func() *[]byte {
+						Access: func() accessBitmap {
 							var bits accessBitmap
-							access := bits[:]
-							return &access
+							return bits
 						}(),
 					},
 					Server: &Server{
@@ -1602,10 +1707,9 @@ func TestHandleNewUser(t *testing.T) {
 			args: args{
 				cc: &ClientConn{
 					Account: &Account{
-						Access: func() *[]byte {
+						Access: func() accessBitmap {
 							var bits accessBitmap
-							access := bits[:]
-							return &access
+							return bits
 						}(),
 					},
 					Server: &Server{
@@ -1630,6 +1734,48 @@ func TestHandleNewUser(t *testing.T) {
 			},
 			wantErr: assert.NoError,
 		},
+		{
+			name: "when user attempts to create account with greater access",
+			args: args{
+				cc: &ClientConn{
+					Account: &Account{
+						Access: func() accessBitmap {
+							var bits accessBitmap
+							bits.Set(accessCreateUser)
+							return bits
+						}(),
+					},
+					Server: &Server{
+						Accounts: map[string]*Account{},
+					},
+				},
+				t: NewTransaction(
+					tranNewUser, &[]byte{0, 1},
+					NewField(fieldUserLogin, []byte("userB")),
+					NewField(
+						fieldUserAccess,
+						func() []byte {
+							var bits accessBitmap
+							bits.Set(accessDisconUser)
+							return bits[:]
+						}(),
+					),
+				),
+			},
+			wantRes: []Transaction{
+				{
+					Flags:     0x00,
+					IsReply:   0x01,
+					Type:      []byte{0, 0x00},
+					ID:        []byte{0x9a, 0xcb, 0x04, 0x42},
+					ErrorCode: []byte{0, 0, 0, 1},
+					Fields: []Field{
+						NewField(fieldError, []byte("Cannot create account with more access than yourself.")),
+					},
+				},
+			},
+			wantErr: assert.NoError,
+		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
@@ -1659,10 +1805,9 @@ func TestHandleListUsers(t *testing.T) {
 			args: args{
 				cc: &ClientConn{
 					Account: &Account{
-						Access: func() *[]byte {
+						Access: func() accessBitmap {
 							var bits accessBitmap
-							access := bits[:]
-							return &access
+							return bits
 						}(),
 					},
 					Server: &Server{
@@ -1687,6 +1832,51 @@ func TestHandleListUsers(t *testing.T) {
 			},
 			wantErr: assert.NoError,
 		},
+		{
+			name: "when user has required permission",
+			args: args{
+				cc: &ClientConn{
+					Account: &Account{
+						Access: func() accessBitmap {
+							var bits accessBitmap
+							bits.Set(accessOpenUser)
+							return bits
+						}(),
+					},
+					Server: &Server{
+						Accounts: map[string]*Account{
+							"guest": {
+								Name:     "guest",
+								Login:    "guest",
+								Password: "zz",
+								Access:   accessBitmap{255, 255, 255, 255, 255, 255, 255, 255},
+							},
+						},
+					},
+				},
+				t: NewTransaction(
+					tranGetClientInfoText, &[]byte{0, 1},
+					NewField(fieldUserID, []byte{0, 1}),
+				),
+			},
+			wantRes: []Transaction{
+				{
+					Flags:     0x00,
+					IsReply:   0x01,
+					Type:      []byte{0, 0},
+					ID:        []byte{0, 0, 0, 0},
+					ErrorCode: []byte{0, 0, 0, 0},
+					Fields: []Field{
+						NewField(fieldData, []byte{
+							0x00, 0x04, 0x00, 0x66, 0x00, 0x05, 0x67, 0x75, 0x65, 0x73, 0x74, 0x00, 0x69, 0x00, 0x05, 0x98,
+							0x8a, 0x9a, 0x8c, 0x8b, 0x00, 0x6e, 0x00, 0x08, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+							0x00, 0x6a, 0x00, 0x01, 0x78,
+						}),
+					},
+				},
+			},
+			wantErr: assert.NoError,
+		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
@@ -1716,10 +1906,9 @@ func TestHandleDownloadFile(t *testing.T) {
 			args: args{
 				cc: &ClientConn{
 					Account: &Account{
-						Access: func() *[]byte {
+						Access: func() accessBitmap {
 							var bits accessBitmap
-							access := bits[:]
-							return &access
+							return bits
 						}(),
 					},
 					Server: &Server{},
@@ -1744,18 +1933,19 @@ func TestHandleDownloadFile(t *testing.T) {
 			name: "with a valid file",
 			args: args{
 				cc: &ClientConn{
-					Transfers: make(map[int][]*FileTransfer),
+					transfers: map[int]map[[4]byte]*FileTransfer{
+						FileDownload: {},
+					},
 					Account: &Account{
-						Access: func() *[]byte {
+						Access: func() accessBitmap {
 							var bits accessBitmap
 							bits.Set(accessDownloadFile)
-							access := bits[:]
-							return &access
+							return bits
 						}(),
 					},
 					Server: &Server{
 						FS:            &OSFileStore{},
-						FileTransfers: make(map[uint32]*FileTransfer),
+						fileTransfers: map[[4]byte]*FileTransfer{},
 						Config: &Config{
 							FileRoot: func() string { path, _ := os.Getwd(); return path + "/test/config/Files" }(),
 						},
@@ -1773,7 +1963,7 @@ func TestHandleDownloadFile(t *testing.T) {
 				{
 					Flags:     0x00,
 					IsReply:   0x01,
-					Type:      []byte{0, 0x2},
+					Type:      []byte{0, 0},
 					ID:        []byte{0x9a, 0xcb, 0x04, 0x42},
 					ErrorCode: []byte{0, 0, 0, 0},
 					Fields: []Field{
@@ -1790,17 +1980,18 @@ func TestHandleDownloadFile(t *testing.T) {
 			name: "when client requests to resume 1k test file at offset 256",
 			args: args{
 				cc: &ClientConn{
-					Transfers: make(map[int][]*FileTransfer),
-					Account: &Account{
-						Access: func() *[]byte {
+					transfers: map[int]map[[4]byte]*FileTransfer{
+						FileDownload: {},
+					}, Account: &Account{
+						Access: func() accessBitmap {
 							var bits accessBitmap
 							bits.Set(accessDownloadFile)
-							access := bits[:]
-							return &access
+							return bits
 						}(),
 					},
 					Server: &Server{
 						FS: &OSFileStore{},
+
 						// FS: func() *MockFileStore {
 						// 	path, _ := os.Getwd()
 						// 	testFile, err := os.Open(path + "/test/config/Files/testfile-1k")
@@ -1818,7 +2009,7 @@ func TestHandleDownloadFile(t *testing.T) {
 						//
 						// 	return mfs
 						// }(),
-						FileTransfers: make(map[uint32]*FileTransfer),
+						fileTransfers: map[[4]byte]*FileTransfer{},
 						Config: &Config{
 							FileRoot: func() string { path, _ := os.Getwd(); return path + "/test/config/Files" }(),
 						},
@@ -1863,7 +2054,7 @@ func TestHandleDownloadFile(t *testing.T) {
 				{
 					Flags:     0x00,
 					IsReply:   0x01,
-					Type:      []byte{0, 0x2},
+					Type:      []byte{0, 0},
 					ID:        []byte{0x9a, 0xcb, 0x04, 0x42},
 					ErrorCode: []byte{0, 0, 0, 0},
 					Fields: []Field{
@@ -1909,10 +2100,9 @@ func TestHandleUpdateUser(t *testing.T) {
 						Logger: NewTestLogger(),
 					},
 					Account: &Account{
-						Access: func() *[]byte {
+						Access: func() accessBitmap {
 							var bits accessBitmap
-							access := bits[:]
-							return &access
+							return bits
 						}(),
 					},
 				},
@@ -1966,10 +2156,9 @@ func TestHandleUpdateUser(t *testing.T) {
 						},
 					},
 					Account: &Account{
-						Access: func() *[]byte {
+						Access: func() accessBitmap {
 							var bits accessBitmap
-							access := bits[:]
-							return &access
+							return bits
 						}(),
 					},
 				},
@@ -2022,10 +2211,9 @@ func TestHandleUpdateUser(t *testing.T) {
 						},
 					},
 					Account: &Account{
-						Access: func() *[]byte {
+						Access: func() accessBitmap {
 							var bits accessBitmap
-							access := bits[:]
-							return &access
+							return bits
 						}(),
 					},
 				},
@@ -2083,10 +2271,9 @@ func TestHandleDelNewsArt(t *testing.T) {
 			args: args{
 				cc: &ClientConn{
 					Account: &Account{
-						Access: func() *[]byte {
+						Access: func() accessBitmap {
 							var bits accessBitmap
-							access := bits[:]
-							return &access
+							return bits
 						}(),
 					},
 				},
@@ -2137,10 +2324,9 @@ func TestHandleDisconnectUser(t *testing.T) {
 			args: args{
 				cc: &ClientConn{
 					Account: &Account{
-						Access: func() *[]byte {
+						Access: func() accessBitmap {
 							var bits accessBitmap
-							access := bits[:]
-							return &access
+							return bits
 						}(),
 					},
 				},
@@ -2172,22 +2358,20 @@ func TestHandleDisconnectUser(t *testing.T) {
 							uint16(1): {
 								Account: &Account{
 									Login: "unnamed",
-									Access: func() *[]byte {
+									Access: func() accessBitmap {
 										var bits accessBitmap
 										bits.Set(accessCannotBeDiscon)
-										access := bits[:]
-										return &access
+										return bits
 									}(),
 								},
 							},
 						},
 					},
 					Account: &Account{
-						Access: func() *[]byte {
+						Access: func() accessBitmap {
 							var bits accessBitmap
 							bits.Set(accessDisconUser)
-							access := bits[:]
-							return &access
+							return bits
 						}(),
 					},
 				},
@@ -2234,16 +2418,54 @@ func TestHandleSendInstantMsg(t *testing.T) {
 		wantRes []Transaction
 		wantErr assert.ErrorAssertionFunc
 	}{
+		{
+			name: "without required permission",
+			args: args{
+				cc: &ClientConn{
+					Account: &Account{
+						Access: func() accessBitmap {
+							var bits accessBitmap
+							return bits
+						}(),
+					},
+				},
+				t: NewTransaction(
+					tranDelNewsArt,
+					&[]byte{0, 0},
+				),
+			},
+			wantRes: []Transaction{
+				{
+					Flags:     0x00,
+					IsReply:   0x01,
+					Type:      []byte{0, 0x00},
+					ID:        []byte{0, 0, 0, 0},
+					ErrorCode: []byte{0, 0, 0, 1},
+					Fields: []Field{
+						NewField(fieldError, []byte("You are not allowed to send private messages.")),
+					},
+				},
+			},
+			wantErr: assert.NoError,
+		},
 		{
 			name: "when client 1 sends a message to client 2",
 			args: args{
 				cc: &ClientConn{
+					Account: &Account{
+						Access: func() accessBitmap {
+							var bits accessBitmap
+							bits.Set(accessSendPrivMsg)
+							return bits
+						}(),
+					},
 					ID:       &[]byte{0, 1},
 					UserName: []byte("User1"),
 					Server: &Server{
 						Clients: map[uint16]*ClientConn{
 							uint16(2): {
 								AutoReply: []byte(nil),
+								Flags:     []byte{0, 0},
 							},
 						},
 					},
@@ -2268,7 +2490,7 @@ func TestHandleSendInstantMsg(t *testing.T) {
 					clientID:  &[]byte{0, 1},
 					Flags:     0x00,
 					IsReply:   0x01,
-					Type:      []byte{0x0, 0x6c},
+					Type:      []byte{0, 0},
 					ID:        []byte{0, 0, 0, 0},
 					ErrorCode: []byte{0, 0, 0, 0},
 					Fields:    []Field(nil),
@@ -2280,11 +2502,19 @@ func TestHandleSendInstantMsg(t *testing.T) {
 			name: "when client 2 has autoreply enabled",
 			args: args{
 				cc: &ClientConn{
+					Account: &Account{
+						Access: func() accessBitmap {
+							var bits accessBitmap
+							bits.Set(accessSendPrivMsg)
+							return bits
+						}(),
+					},
 					ID:       &[]byte{0, 1},
 					UserName: []byte("User1"),
 					Server: &Server{
 						Clients: map[uint16]*ClientConn{
 							uint16(2): {
+								Flags:     []byte{0, 0},
 								ID:        &[]byte{0, 2},
 								UserName:  []byte("User2"),
 								AutoReply: []byte("autohai"),
@@ -2320,7 +2550,7 @@ func TestHandleSendInstantMsg(t *testing.T) {
 					clientID:  &[]byte{0, 1},
 					Flags:     0x00,
 					IsReply:   0x01,
-					Type:      []byte{0x0, 0x6c},
+					Type:      []byte{0, 0},
 					ID:        []byte{0, 0, 0, 0},
 					ErrorCode: []byte{0, 0, 0, 0},
 					Fields:    []Field(nil),
@@ -2328,48 +2558,98 @@ func TestHandleSendInstantMsg(t *testing.T) {
 			},
 			wantErr: assert.NoError,
 		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			gotRes, err := HandleSendInstantMsg(tt.args.cc, tt.args.t)
-			if !tt.wantErr(t, err, fmt.Sprintf("HandleSendInstantMsg(%v, %v)", tt.args.cc, tt.args.t)) {
-				return
-			}
-
-			tranAssertEqual(t, tt.wantRes, gotRes)
-		})
-	}
-}
-
-func TestHandleDeleteFile(t *testing.T) {
-	type args struct {
-		cc *ClientConn
-		t  *Transaction
-	}
-	tests := []struct {
-		name    string
-		args    args
-		wantRes []Transaction
-		wantErr assert.ErrorAssertionFunc
-	}{
 		{
-			name: "when user does not have required permission to delete a folder",
+			name: "when client 2 has refuse private messages enabled",
 			args: args{
 				cc: &ClientConn{
 					Account: &Account{
-						Access: func() *[]byte {
+						Access: func() accessBitmap {
 							var bits accessBitmap
-							access := bits[:]
-							return &access
+							bits.Set(accessSendPrivMsg)
+							return bits
 						}(),
 					},
+					ID:       &[]byte{0, 1},
+					UserName: []byte("User1"),
 					Server: &Server{
-						Config: &Config{
-							FileRoot: func() string {
-								return "/fakeRoot/Files"
-							}(),
+						Clients: map[uint16]*ClientConn{
+							uint16(2): {
+								Flags:    []byte{255, 255},
+								ID:       &[]byte{0, 2},
+								UserName: []byte("User2"),
+							},
 						},
-						FS: func() *MockFileStore {
+					},
+				},
+				t: NewTransaction(
+					tranSendInstantMsg,
+					&[]byte{0, 1},
+					NewField(fieldData, []byte("hai")),
+					NewField(fieldUserID, []byte{0, 2}),
+				),
+			},
+			wantRes: []Transaction{
+				*NewTransaction(
+					tranServerMsg,
+					&[]byte{0, 1},
+					NewField(fieldData, []byte("User2 does not accept private messages.")),
+					NewField(fieldUserName, []byte("User2")),
+					NewField(fieldUserID, []byte{0, 2}),
+					NewField(fieldOptions, []byte{0, 2}),
+				),
+				{
+					clientID:  &[]byte{0, 1},
+					Flags:     0x00,
+					IsReply:   0x01,
+					Type:      []byte{0, 0},
+					ID:        []byte{0, 0, 0, 0},
+					ErrorCode: []byte{0, 0, 0, 0},
+					Fields:    []Field(nil),
+				},
+			},
+			wantErr: assert.NoError,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			gotRes, err := HandleSendInstantMsg(tt.args.cc, tt.args.t)
+			if !tt.wantErr(t, err, fmt.Sprintf("HandleSendInstantMsg(%v, %v)", tt.args.cc, tt.args.t)) {
+				return
+			}
+
+			tranAssertEqual(t, tt.wantRes, gotRes)
+		})
+	}
+}
+
+func TestHandleDeleteFile(t *testing.T) {
+	type args struct {
+		cc *ClientConn
+		t  *Transaction
+	}
+	tests := []struct {
+		name    string
+		args    args
+		wantRes []Transaction
+		wantErr assert.ErrorAssertionFunc
+	}{
+		{
+			name: "when user does not have required permission to delete a folder",
+			args: args{
+				cc: &ClientConn{
+					Account: &Account{
+						Access: func() accessBitmap {
+							var bits accessBitmap
+							return bits
+						}(),
+					},
+					Server: &Server{
+						Config: &Config{
+							FileRoot: func() string {
+								return "/fakeRoot/Files"
+							}(),
+						},
+						FS: func() *MockFileStore {
 							mfi := &MockFileInfo{}
 							mfi.On("Mode").Return(fs.FileMode(0))
 							mfi.On("Size").Return(int64(100))
@@ -2417,11 +2697,10 @@ func TestHandleDeleteFile(t *testing.T) {
 			args: args{
 				cc: &ClientConn{
 					Account: &Account{
-						Access: func() *[]byte {
+						Access: func() accessBitmap {
 							var bits accessBitmap
 							bits.Set(accessDeleteFile)
-							access := bits[:]
-							return &access
+							return bits
 						}(),
 					},
 					Server: &Server{
@@ -2468,7 +2747,7 @@ func TestHandleDeleteFile(t *testing.T) {
 				{
 					Flags:     0x00,
 					IsReply:   0x01,
-					Type:      []byte{0x0, 0xcc},
+					Type:      []byte{0, 0},
 					ID:        []byte{0x0, 0x0, 0x0, 0x0},
 					ErrorCode: []byte{0, 0, 0, 0},
 					Fields:    []Field(nil),
@@ -2507,10 +2786,9 @@ func TestHandleGetFileNameList(t *testing.T) {
 			args: args{
 				cc: &ClientConn{
 					Account: &Account{
-						Access: func() *[]byte {
+						Access: func() accessBitmap {
 							var bits accessBitmap
-							access := bits[:]
-							return &access
+							return bits
 						}(),
 					},
 					Server: &Server{
@@ -2572,7 +2850,7 @@ func TestHandleGetFileNameList(t *testing.T) {
 				{
 					Flags:     0x00,
 					IsReply:   0x01,
-					Type:      []byte{0, 0xc8},
+					Type:      []byte{0, 0},
 					ID:        []byte{0, 0, 0, 0},
 					ErrorCode: []byte{0, 0, 0, 0},
 					Fields: []Field{
@@ -2611,3 +2889,850 @@ func TestHandleGetFileNameList(t *testing.T) {
 		})
 	}
 }
+
+func TestHandleGetClientInfoText(t *testing.T) {
+	type args struct {
+		cc *ClientConn
+		t  *Transaction
+	}
+	tests := []struct {
+		name    string
+		args    args
+		wantRes []Transaction
+		wantErr assert.ErrorAssertionFunc
+	}{
+		{
+			name: "when user does not have required permission",
+			args: args{
+				cc: &ClientConn{
+					Account: &Account{
+						Access: func() accessBitmap {
+							var bits accessBitmap
+							return bits
+						}(),
+					},
+					Server: &Server{
+						Accounts: map[string]*Account{},
+					},
+				},
+				t: NewTransaction(
+					tranGetClientInfoText, &[]byte{0, 1},
+					NewField(fieldUserID, []byte{0, 1}),
+				),
+			},
+			wantRes: []Transaction{
+				{
+					Flags:     0x00,
+					IsReply:   0x01,
+					Type:      []byte{0, 0x00},
+					ID:        []byte{0, 0, 0, 0},
+					ErrorCode: []byte{0, 0, 0, 1},
+					Fields: []Field{
+						NewField(fieldError, []byte("You are not allowed to get client info.")),
+					},
+				},
+			},
+			wantErr: assert.NoError,
+		},
+		{
+			name: "with a valid user",
+			args: args{
+				cc: &ClientConn{
+					UserName:   []byte("Testy McTest"),
+					RemoteAddr: "1.2.3.4:12345",
+					Account: &Account{
+						Access: func() accessBitmap {
+							var bits accessBitmap
+							bits.Set(accessGetClientInfo)
+							return bits
+						}(),
+						Name:  "test",
+						Login: "test",
+					},
+					Server: &Server{
+						Accounts: map[string]*Account{},
+						Clients: map[uint16]*ClientConn{
+							uint16(1): {
+								UserName:   []byte("Testy McTest"),
+								RemoteAddr: "1.2.3.4:12345",
+								Account: &Account{
+									Access: func() accessBitmap {
+										var bits accessBitmap
+										bits.Set(accessGetClientInfo)
+										return bits
+									}(),
+									Name:  "test",
+									Login: "test",
+								},
+							},
+						},
+					},
+					transfers: map[int]map[[4]byte]*FileTransfer{
+						FileDownload:   {},
+						FileUpload:     {},
+						FolderDownload: {},
+						FolderUpload:   {},
+					},
+				},
+				t: NewTransaction(
+					tranGetClientInfoText, &[]byte{0, 1},
+					NewField(fieldUserID, []byte{0, 1}),
+				),
+			},
+			wantRes: []Transaction{
+				{
+					Flags:     0x00,
+					IsReply:   0x01,
+					Type:      []byte{0, 0},
+					ID:        []byte{0, 0, 0, 0},
+					ErrorCode: []byte{0, 0, 0, 0},
+					Fields: []Field{
+						NewField(fieldData, []byte(
+							strings.Replace(`Nickname:   Testy McTest
+Name:       test
+Account:    test
+Address:    1.2.3.4:12345
+
+-------- File Downloads ---------
+
+None.
+
+------- Folder Downloads --------
+
+None.
+
+--------- File Uploads ----------
+
+None.
+
+-------- Folder Uploads ---------
+
+None.
+
+------- Waiting Downloads -------
+
+None.
+
+`, "\n", "\r", -1)),
+						),
+						NewField(fieldUserName, []byte("Testy McTest")),
+					},
+				},
+			},
+			wantErr: assert.NoError,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			gotRes, err := HandleGetClientInfoText(tt.args.cc, tt.args.t)
+			if !tt.wantErr(t, err, fmt.Sprintf("HandleGetClientInfoText(%v, %v)", tt.args.cc, tt.args.t)) {
+				return
+			}
+			tranAssertEqual(t, tt.wantRes, gotRes)
+		})
+	}
+}
+
+func TestHandleTranAgreed(t *testing.T) {
+	type args struct {
+		cc *ClientConn
+		t  *Transaction
+	}
+	tests := []struct {
+		name    string
+		args    args
+		wantRes []Transaction
+		wantErr assert.ErrorAssertionFunc
+	}{
+		{
+			name: "normal request flow",
+			args: args{
+				cc: &ClientConn{
+					Account: &Account{
+						Access: func() accessBitmap {
+							var bits accessBitmap
+							bits.Set(accessDisconUser)
+							bits.Set(accessAnyName)
+							return bits
+						}()},
+					Icon:    []byte{0, 1},
+					Flags:   []byte{0, 1},
+					Version: []byte{0, 1},
+					ID:      &[]byte{0, 1},
+					logger:  NewTestLogger(),
+					Server: &Server{
+						Config: &Config{
+							BannerFile: "banner.jpg",
+						},
+					},
+				},
+				t: NewTransaction(
+					tranAgreed, nil,
+					NewField(fieldUserName, []byte("username")),
+					NewField(fieldUserIconID, []byte{0, 1}),
+					NewField(fieldOptions, []byte{0, 0}),
+				),
+			},
+			wantRes: []Transaction{
+				{
+					clientID:  &[]byte{0, 1},
+					Flags:     0x00,
+					IsReply:   0x00,
+					Type:      []byte{0, 0x7a},
+					ID:        []byte{0, 0, 0, 0},
+					ErrorCode: []byte{0, 0, 0, 0},
+					Fields: []Field{
+						NewField(fieldBannerType, []byte("JPEG")),
+					},
+				},
+				{
+					clientID:  &[]byte{0, 1},
+					Flags:     0x00,
+					IsReply:   0x01,
+					Type:      []byte{0, 0},
+					ID:        []byte{0, 0, 0, 0},
+					ErrorCode: []byte{0, 0, 0, 0},
+					Fields:    []Field{},
+				},
+			},
+			wantErr: assert.NoError,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			gotRes, err := HandleTranAgreed(tt.args.cc, tt.args.t)
+			if !tt.wantErr(t, err, fmt.Sprintf("HandleTranAgreed(%v, %v)", tt.args.cc, tt.args.t)) {
+				return
+			}
+			tranAssertEqual(t, tt.wantRes, gotRes)
+		})
+	}
+}
+
+func TestHandleSetClientUserInfo(t *testing.T) {
+	type args struct {
+		cc *ClientConn
+		t  *Transaction
+	}
+	tests := []struct {
+		name    string
+		args    args
+		wantRes []Transaction
+		wantErr assert.ErrorAssertionFunc
+	}{
+		{
+			name: "when client does not have accessAnyName",
+			args: args{
+				cc: &ClientConn{
+					Account: &Account{
+						Access: func() accessBitmap {
+							var bits accessBitmap
+							return bits
+						}(),
+					},
+					ID:       &[]byte{0, 1},
+					UserName: []byte("Guest"),
+					Flags:    []byte{0, 1},
+					Server: &Server{
+						Clients: map[uint16]*ClientConn{
+							uint16(1): {
+								ID: &[]byte{0, 1},
+							},
+						},
+					},
+				},
+				t: NewTransaction(
+					tranSetClientUserInfo, nil,
+					NewField(fieldUserIconID, []byte{0, 1}),
+					NewField(fieldUserName, []byte("NOPE")),
+				),
+			},
+			wantRes: []Transaction{
+				{
+					clientID:  &[]byte{0, 1},
+					Flags:     0x00,
+					IsReply:   0x00,
+					Type:      []byte{0x01, 0x2d},
+					ID:        []byte{0, 0, 0, 0},
+					ErrorCode: []byte{0, 0, 0, 0},
+					Fields: []Field{
+						NewField(fieldUserID, []byte{0, 1}),
+						NewField(fieldUserIconID, []byte{0, 1}),
+						NewField(fieldUserFlags, []byte{0, 1}),
+						NewField(fieldUserName, []byte("Guest"))},
+				},
+			},
+			wantErr: assert.NoError,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			gotRes, err := HandleSetClientUserInfo(tt.args.cc, tt.args.t)
+			if !tt.wantErr(t, err, fmt.Sprintf("HandleSetClientUserInfo(%v, %v)", tt.args.cc, tt.args.t)) {
+				return
+			}
+
+			tranAssertEqual(t, tt.wantRes, gotRes)
+		})
+	}
+}
+
+func TestHandleDelNewsItem(t *testing.T) {
+	type args struct {
+		cc *ClientConn
+		t  *Transaction
+	}
+	tests := []struct {
+		name    string
+		args    args
+		wantRes []Transaction
+		wantErr assert.ErrorAssertionFunc
+	}{
+		{
+			name: "when user does not have permission to delete a news category",
+			args: args{
+				cc: &ClientConn{
+					Account: &Account{
+						Access: accessBitmap{},
+					},
+					ID: &[]byte{0, 1},
+					Server: &Server{
+						ThreadedNews: &ThreadedNews{Categories: map[string]NewsCategoryListData15{
+							"test": {
+								Type:     []byte{0, 3},
+								Count:    nil,
+								NameSize: 0,
+								Name:     "zz",
+							},
+						}},
+					},
+				},
+				t: NewTransaction(
+					tranDelNewsItem, nil,
+					NewField(fieldNewsPath,
+						[]byte{
+							0, 1,
+							0, 0,
+							4,
+							0x74, 0x65, 0x73, 0x74,
+						},
+					),
+				),
+			},
+			wantRes: []Transaction{
+				{
+					clientID:  &[]byte{0, 1},
+					Flags:     0x00,
+					IsReply:   0x01,
+					Type:      []byte{0, 0x00},
+					ID:        []byte{0, 0, 0, 0},
+					ErrorCode: []byte{0, 0, 0, 1},
+					Fields: []Field{
+						NewField(fieldError, []byte("You are not allowed to delete news categories.")),
+					},
+				},
+			},
+			wantErr: assert.NoError,
+		},
+		{
+			name: "when user does not have permission to delete a news folder",
+			args: args{
+				cc: &ClientConn{
+					Account: &Account{
+						Access: accessBitmap{},
+					},
+					ID: &[]byte{0, 1},
+					Server: &Server{
+						ThreadedNews: &ThreadedNews{Categories: map[string]NewsCategoryListData15{
+							"testcat": {
+								Type:     []byte{0, 2},
+								Count:    nil,
+								NameSize: 0,
+								Name:     "test",
+							},
+						}},
+					},
+				},
+				t: NewTransaction(
+					tranDelNewsItem, nil,
+					NewField(fieldNewsPath,
+						[]byte{
+							0, 1,
+							0, 0,
+							4,
+							0x74, 0x65, 0x73, 0x74,
+						},
+					),
+				),
+			},
+			wantRes: []Transaction{
+				{
+					clientID:  &[]byte{0, 1},
+					Flags:     0x00,
+					IsReply:   0x01,
+					Type:      []byte{0, 0x00},
+					ID:        []byte{0, 0, 0, 0},
+					ErrorCode: []byte{0, 0, 0, 1},
+					Fields: []Field{
+						NewField(fieldError, []byte("You are not allowed to delete news folders.")),
+					},
+				},
+			},
+			wantErr: assert.NoError,
+		},
+		{
+			name: "when user deletes a news folder",
+			args: args{
+				cc: &ClientConn{
+					Account: &Account{
+						Access: func() accessBitmap {
+							var bits accessBitmap
+							bits.Set(accessNewsDeleteFldr)
+							return bits
+						}(),
+					},
+					ID: &[]byte{0, 1},
+					Server: &Server{
+						ConfigDir: "/fakeConfigRoot",
+						FS: func() *MockFileStore {
+							mfs := &MockFileStore{}
+							mfs.On("WriteFile", "/fakeConfigRoot/ThreadedNews.yaml", mock.Anything, mock.Anything).Return(nil, os.ErrNotExist)
+							return mfs
+						}(),
+						ThreadedNews: &ThreadedNews{Categories: map[string]NewsCategoryListData15{
+							"testcat": {
+								Type:     []byte{0, 2},
+								Count:    nil,
+								NameSize: 0,
+								Name:     "test",
+							},
+						}},
+					},
+				},
+				t: NewTransaction(
+					tranDelNewsItem, nil,
+					NewField(fieldNewsPath,
+						[]byte{
+							0, 1,
+							0, 0,
+							4,
+							0x74, 0x65, 0x73, 0x74,
+						},
+					),
+				),
+			},
+			wantRes: []Transaction{
+				{
+					clientID:  &[]byte{0, 1},
+					Flags:     0x00,
+					IsReply:   0x01,
+					Type:      []byte{0, 0},
+					ID:        []byte{0, 0, 0, 0},
+					ErrorCode: []byte{0, 0, 0, 0},
+					Fields:    []Field{},
+				},
+			},
+			wantErr: assert.NoError,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			gotRes, err := HandleDelNewsItem(tt.args.cc, tt.args.t)
+			if !tt.wantErr(t, err, fmt.Sprintf("HandleDelNewsItem(%v, %v)", tt.args.cc, tt.args.t)) {
+				return
+			}
+			tranAssertEqual(t, tt.wantRes, gotRes)
+		})
+	}
+}
+
+func TestHandleDownloadBanner(t *testing.T) {
+	type args struct {
+		cc *ClientConn
+		t  *Transaction
+	}
+	tests := []struct {
+		name    string
+		args    args
+		wantRes []Transaction
+		wantErr assert.ErrorAssertionFunc
+	}{
+		{
+			name: "returns expected response",
+			args: args{
+				cc: &ClientConn{
+					ID: &[]byte{0, 1},
+					transfers: map[int]map[[4]byte]*FileTransfer{
+						bannerDownload: {},
+					},
+					Server: &Server{
+						ConfigDir: "/config",
+						Config: &Config{
+							BannerFile: "banner.jpg",
+						},
+						fileTransfers: map[[4]byte]*FileTransfer{},
+						FS: func() *MockFileStore {
+							mfi := &MockFileInfo{}
+							mfi.On("Size").Return(int64(100))
+
+							mfs := &MockFileStore{}
+							mfs.On("Stat", "/config/banner.jpg").Return(mfi, nil)
+							return mfs
+						}(),
+					},
+				},
+				t: NewTransaction(tranDownloadBanner, nil),
+			},
+			wantRes: []Transaction{
+				{
+					clientID:  &[]byte{0, 1},
+					Flags:     0x00,
+					IsReply:   0x01,
+					Type:      []byte{0, 0},
+					ID:        []byte{0, 0, 0, 0},
+					ErrorCode: []byte{0, 0, 0, 0},
+					Fields: []Field{
+						NewField(fieldRefNum, []byte{1, 2, 3, 4}),
+						NewField(fieldTransferSize, []byte{0, 0, 0, 0x64}),
+					},
+				},
+			},
+			wantErr: assert.NoError,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			gotRes, err := HandleDownloadBanner(tt.args.cc, tt.args.t)
+			if !tt.wantErr(t, err, fmt.Sprintf("HandleDownloadBanner(%v, %v)", tt.args.cc, tt.args.t)) {
+				return
+			}
+
+			tranAssertEqual(t, tt.wantRes, gotRes)
+		})
+	}
+}
+
+func TestHandleTranOldPostNews(t *testing.T) {
+	type args struct {
+		cc *ClientConn
+		t  *Transaction
+	}
+	tests := []struct {
+		name    string
+		args    args
+		wantRes []Transaction
+		wantErr assert.ErrorAssertionFunc
+	}{
+		{
+			name: "when user does not have required permission",
+			args: args{
+				cc: &ClientConn{
+					Account: &Account{
+						Access: func() accessBitmap {
+							var bits accessBitmap
+							return bits
+						}(),
+					},
+				},
+				t: NewTransaction(
+					tranOldPostNews, &[]byte{0, 1},
+					NewField(fieldData, []byte("hai")),
+				),
+			},
+			wantRes: []Transaction{
+				{
+					Flags:     0x00,
+					IsReply:   0x01,
+					Type:      []byte{0, 0x00},
+					ID:        []byte{0, 0, 0, 0},
+					ErrorCode: []byte{0, 0, 0, 1},
+					Fields: []Field{
+						NewField(fieldError, []byte("You are not allowed to post news.")),
+					},
+				},
+			},
+			wantErr: assert.NoError,
+		},
+		{
+			name: "when user posts news update",
+			args: args{
+				cc: &ClientConn{
+					Account: &Account{
+						Access: func() accessBitmap {
+							var bits accessBitmap
+							bits.Set(accessNewsPostArt)
+							return bits
+						}(),
+					},
+					Server: &Server{
+						FS: func() *MockFileStore {
+							mfs := &MockFileStore{}
+							mfs.On("WriteFile", "/fakeConfigRoot/MessageBoard.txt", mock.Anything, mock.Anything).Return(nil, os.ErrNotExist)
+							return mfs
+						}(),
+						ConfigDir: "/fakeConfigRoot",
+						Config:    &Config{},
+					},
+				},
+				t: NewTransaction(
+					tranOldPostNews, &[]byte{0, 1},
+					NewField(fieldData, []byte("hai")),
+				),
+			},
+			wantRes: []Transaction{
+				{
+					Flags:     0x00,
+					IsReply:   0x01,
+					Type:      []byte{0, 0},
+					ID:        []byte{0, 0, 0, 0},
+					ErrorCode: []byte{0, 0, 0, 0},
+				},
+			},
+			wantErr: assert.NoError,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			gotRes, err := HandleTranOldPostNews(tt.args.cc, tt.args.t)
+			if !tt.wantErr(t, err, fmt.Sprintf("HandleTranOldPostNews(%v, %v)", tt.args.cc, tt.args.t)) {
+				return
+			}
+
+			tranAssertEqual(t, tt.wantRes, gotRes)
+		})
+	}
+}
+
+func TestHandleInviteNewChat(t *testing.T) {
+	type args struct {
+		cc *ClientConn
+		t  *Transaction
+	}
+	tests := []struct {
+		name    string
+		args    args
+		wantRes []Transaction
+		wantErr assert.ErrorAssertionFunc
+	}{
+		{
+			name: "when user does not have required permission",
+			args: args{
+				cc: &ClientConn{
+					Account: &Account{
+						Access: func() accessBitmap {
+							var bits accessBitmap
+							return bits
+						}(),
+					},
+				},
+				t: NewTransaction(tranInviteNewChat, &[]byte{0, 1}),
+			},
+			wantRes: []Transaction{
+				{
+					Flags:     0x00,
+					IsReply:   0x01,
+					Type:      []byte{0, 0x00},
+					ID:        []byte{0, 0, 0, 0},
+					ErrorCode: []byte{0, 0, 0, 1},
+					Fields: []Field{
+						NewField(fieldError, []byte("You are not allowed to request private chat.")),
+					},
+				},
+			},
+			wantErr: assert.NoError,
+		},
+		{
+			name: "when userA invites userB to new private chat",
+			args: args{
+				cc: &ClientConn{
+					ID: &[]byte{0, 1},
+					Account: &Account{
+						Access: func() accessBitmap {
+							var bits accessBitmap
+							bits.Set(accessOpenChat)
+							return bits
+						}(),
+					},
+					UserName: []byte("UserA"),
+					Icon:     []byte{0, 1},
+					Flags:    []byte{0, 0},
+					Server: &Server{
+						Clients: map[uint16]*ClientConn{
+							uint16(2): {
+								ID:       &[]byte{0, 2},
+								UserName: []byte("UserB"),
+								Flags:    []byte{0, 0},
+							},
+						},
+						PrivateChats: make(map[uint32]*PrivateChat),
+					},
+				},
+				t: NewTransaction(
+					tranInviteNewChat, &[]byte{0, 1},
+					NewField(fieldUserID, []byte{0, 2}),
+				),
+			},
+			wantRes: []Transaction{
+				{
+					clientID:  &[]byte{0, 2},
+					Flags:     0x00,
+					IsReply:   0x00,
+					Type:      []byte{0, 0x71},
+					ID:        []byte{0, 0, 0, 0},
+					ErrorCode: []byte{0, 0, 0, 0},
+					Fields: []Field{
+						NewField(fieldChatID, []byte{0x52, 0xfd, 0xfc, 0x07}),
+						NewField(fieldUserName, []byte("UserA")),
+						NewField(fieldUserID, []byte{0, 1}),
+					},
+				},
+
+				{
+					clientID:  &[]byte{0, 1},
+					Flags:     0x00,
+					IsReply:   0x01,
+					Type:      []byte{0, 0},
+					ID:        []byte{0, 0, 0, 0},
+					ErrorCode: []byte{0, 0, 0, 0},
+					Fields: []Field{
+						NewField(fieldChatID, []byte{0x52, 0xfd, 0xfc, 0x07}),
+						NewField(fieldUserName, []byte("UserA")),
+						NewField(fieldUserID, []byte{0, 1}),
+						NewField(fieldUserIconID, []byte{0, 1}),
+						NewField(fieldUserFlags, []byte{0, 0}),
+					},
+				},
+			},
+			wantErr: assert.NoError,
+		},
+		{
+			name: "when userA invites userB to new private chat, but UserB has refuse private chat enabled",
+			args: args{
+				cc: &ClientConn{
+					ID: &[]byte{0, 1},
+					Account: &Account{
+						Access: func() accessBitmap {
+							var bits accessBitmap
+							bits.Set(accessOpenChat)
+							return bits
+						}(),
+					},
+					UserName: []byte("UserA"),
+					Icon:     []byte{0, 1},
+					Flags:    []byte{0, 0},
+					Server: &Server{
+						Clients: map[uint16]*ClientConn{
+							uint16(2): {
+								ID:       &[]byte{0, 2},
+								UserName: []byte("UserB"),
+								Flags:    []byte{255, 255},
+							},
+						},
+						PrivateChats: make(map[uint32]*PrivateChat),
+					},
+				},
+				t: NewTransaction(
+					tranInviteNewChat, &[]byte{0, 1},
+					NewField(fieldUserID, []byte{0, 2}),
+				),
+			},
+			wantRes: []Transaction{
+				{
+					clientID:  &[]byte{0, 1},
+					Flags:     0x00,
+					IsReply:   0x00,
+					Type:      []byte{0, 0x68},
+					ID:        []byte{0, 0, 0, 0},
+					ErrorCode: []byte{0, 0, 0, 0},
+					Fields: []Field{
+						NewField(fieldData, []byte("UserB does not accept private chats.")),
+						NewField(fieldUserName, []byte("UserB")),
+						NewField(fieldUserID, []byte{0, 2}),
+						NewField(fieldOptions, []byte{0, 2}),
+					},
+				},
+				{
+					clientID:  &[]byte{0, 1},
+					Flags:     0x00,
+					IsReply:   0x01,
+					Type:      []byte{0, 0},
+					ID:        []byte{0, 0, 0, 0},
+					ErrorCode: []byte{0, 0, 0, 0},
+					Fields: []Field{
+						NewField(fieldChatID, []byte{0x52, 0xfd, 0xfc, 0x07}),
+						NewField(fieldUserName, []byte("UserA")),
+						NewField(fieldUserID, []byte{0, 1}),
+						NewField(fieldUserIconID, []byte{0, 1}),
+						NewField(fieldUserFlags, []byte{0, 0}),
+					},
+				},
+			},
+			wantErr: assert.NoError,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			rand.Seed(1)
+			gotRes, err := HandleInviteNewChat(tt.args.cc, tt.args.t)
+			if !tt.wantErr(t, err, fmt.Sprintf("HandleInviteNewChat(%v, %v)", tt.args.cc, tt.args.t)) {
+				return
+			}
+			tranAssertEqual(t, tt.wantRes, gotRes)
+		})
+	}
+}
+
+func TestHandleGetNewsArtData(t *testing.T) {
+	type args struct {
+		cc *ClientConn
+		t  *Transaction
+	}
+	tests := []struct {
+		name    string
+		args    args
+		wantRes []Transaction
+		wantErr assert.ErrorAssertionFunc
+	}{
+		{
+			name: "when user does not have required permission",
+			args: args{
+				cc: &ClientConn{
+					Account: &Account{
+						Access: func() accessBitmap {
+							var bits accessBitmap
+							return bits
+						}(),
+					},
+					Server: &Server{
+						Accounts: map[string]*Account{},
+					},
+				},
+				t: NewTransaction(
+					tranGetNewsArtData, &[]byte{0, 1},
+				),
+			},
+			wantRes: []Transaction{
+				{
+					Flags:     0x00,
+					IsReply:   0x01,
+					Type:      []byte{0, 0x00},
+					ID:        []byte{0x9a, 0xcb, 0x04, 0x42},
+					ErrorCode: []byte{0, 0, 0, 1},
+					Fields: []Field{
+						NewField(fieldError, []byte("You are not allowed to read news.")),
+					},
+				},
+			},
+			wantErr: assert.NoError,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			gotRes, err := HandleGetNewsArtData(tt.args.cc, tt.args.t)
+			if !tt.wantErr(t, err, fmt.Sprintf("HandleGetNewsArtData(%v, %v)", tt.args.cc, tt.args.t)) {
+				return
+			}
+			tranAssertEqual(t, tt.wantRes, gotRes)
+		})
+	}
+}