X-Git-Url: https://git.r.bdr.sh/rbdr/mobius/blobdiff_plain/7cd900d61edbd6d322db3cecb913adf574389320..187d6dc500784760654b740a278fef59072ca5a8:/hotline/transaction_handlers_test.go?ds=sidebyside

diff --git a/hotline/transaction_handlers_test.go b/hotline/transaction_handlers_test.go
index ebb4a95..0d6b1dc 100644
--- a/hotline/transaction_handlers_test.go
+++ b/hotline/transaction_handlers_test.go
@@ -7,6 +7,7 @@ import (
 	"io/fs"
 	"math/rand"
 	"os"
+	"path/filepath"
 	"strings"
 	"testing"
 	"time"
@@ -35,13 +36,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},
 									},
@@ -51,13 +52,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},
 							},
@@ -143,13 +144,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},
 									},
@@ -159,13 +160,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},
 							},
@@ -227,22 +228,22 @@ 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,
 							},
@@ -305,11 +306,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},
@@ -317,13 +317,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},
 							},
@@ -367,10 +367,9 @@ func TestHandleChatSend(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{
@@ -401,11 +400,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("Testy McTest"),
@@ -413,13 +411,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},
 							},
@@ -464,11 +462,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},
@@ -476,13 +473,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},
 							},
@@ -515,11 +515,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},
@@ -539,19 +538,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},
 							},
@@ -630,7 +629,7 @@ func TestHandleGetFileInfo(t *testing.T) {
 						Config: &Config{
 							FileRoot: func() string {
 								path, _ := os.Getwd()
-								return path + "/test/config/Files"
+								return filepath.Join(path, "/test/config/Files")
 							}(),
 						},
 					},
@@ -701,10 +700,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
 						}(),
 					},
 				},
@@ -732,11 +730,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},
@@ -780,11 +777,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},
@@ -822,11 +818,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},
@@ -858,11 +853,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},
@@ -899,11 +893,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},
@@ -977,15 +970,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
 						}(),
 					},
 				},
@@ -1019,15 +1017,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},
@@ -1085,12 +1079,12 @@ func TestHandleMakeAlias(t *testing.T) {
 			name: "with valid input and required permissions",
 			args: args{
 				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{
@@ -1136,12 +1130,12 @@ func TestHandleMakeAlias(t *testing.T) {
 			name: "when symlink returns an error",
 			args: args{
 				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{
@@ -1189,11 +1183,11 @@ func TestHandleMakeAlias(t *testing.T) {
 			name: "when user does not have required permission",
 			args: args{
 				cc: &ClientConn{
+					logger: NewTestLogger(),
 					Account: &Account{
-						Access: func() *[]byte {
+						Access: func() accessBitmap {
 							var bits accessBitmap
-							access := bits[:]
-							return &access
+							return bits
 						}(),
 					},
 					Server: &Server{
@@ -1266,11 +1260,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{
@@ -1279,7 +1272,7 @@ func TestHandleGetUser(t *testing.T) {
 								Login:    "guest",
 								Name:     "Guest",
 								Password: "password",
-								Access:   &[]byte{1},
+								Access:   accessBitmap{},
 							},
 						},
 					},
@@ -1300,7 +1293,7 @@ func TestHandleGetUser(t *testing.T) {
 						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}),
 					},
 				},
 			},
@@ -1311,10 +1304,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{
@@ -1345,11 +1337,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{
@@ -1404,11 +1395,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{
@@ -1417,7 +1407,7 @@ func TestHandleDeleteUser(t *testing.T) {
 								Login:    "testuser",
 								Name:     "Testy McTest",
 								Password: "password",
-								Access:   &[]byte{1},
+								Access:   accessBitmap{},
 							},
 						},
 						FS: func() *MockFileStore {
@@ -1449,10 +1439,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{
@@ -1507,11 +1496,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{
@@ -1541,10 +1529,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{
@@ -1598,10 +1585,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{
@@ -1655,10 +1641,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{
@@ -1683,6 +1668,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{0x01, 0x2f},
+					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) {
@@ -1712,10 +1742,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{},
@@ -1740,18 +1769,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" }(),
 						},
@@ -1786,17 +1816,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")
@@ -1814,7 +1845,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" }(),
 						},
@@ -1900,14 +1931,14 @@ func TestHandleUpdateUser(t *testing.T) {
 			name: "when action is create user without required permission",
 			args: args{
 				cc: &ClientConn{
+					logger: NewTestLogger(),
 					Server: &Server{
 						Logger: NewTestLogger(),
 					},
 					Account: &Account{
-						Access: func() *[]byte {
+						Access: func() accessBitmap {
 							var bits accessBitmap
-							access := bits[:]
-							return &access
+							return bits
 						}(),
 					},
 				},
@@ -1953,6 +1984,7 @@ func TestHandleUpdateUser(t *testing.T) {
 			name: "when action is modify user without required permission",
 			args: args{
 				cc: &ClientConn{
+					logger: NewTestLogger(),
 					Server: &Server{
 						Logger: NewTestLogger(),
 						Accounts: map[string]*Account{
@@ -1960,10 +1992,9 @@ func TestHandleUpdateUser(t *testing.T) {
 						},
 					},
 					Account: &Account{
-						Access: func() *[]byte {
+						Access: func() accessBitmap {
 							var bits accessBitmap
-							access := bits[:]
-							return &access
+							return bits
 						}(),
 					},
 				},
@@ -2009,17 +2040,16 @@ func TestHandleUpdateUser(t *testing.T) {
 			name: "when action is delete user without required permission",
 			args: args{
 				cc: &ClientConn{
+					logger: NewTestLogger(),
 					Server: &Server{
-						Logger: NewTestLogger(),
 						Accounts: map[string]*Account{
 							"bbb": {},
 						},
 					},
 					Account: &Account{
-						Access: func() *[]byte {
+						Access: func() accessBitmap {
 							var bits accessBitmap
-							access := bits[:]
-							return &access
+							return bits
 						}(),
 					},
 				},
@@ -2077,10 +2107,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
 						}(),
 					},
 				},
@@ -2131,10 +2160,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
 						}(),
 					},
 				},
@@ -2166,22 +2194,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
 						}(),
 					},
 				},
@@ -2228,10 +2254,47 @@ 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{
@@ -2274,6 +2337,13 @@ 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{
@@ -2351,10 +2421,9 @@ func TestHandleDeleteFile(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{
@@ -2411,11 +2480,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{
@@ -2484,3 +2552,410 @@ func TestHandleDeleteFile(t *testing.T) {
 		})
 	}
 }
+
+func TestHandleGetFileNameList(t *testing.T) {
+	type args struct {
+		cc *ClientConn
+		t  *Transaction
+	}
+	tests := []struct {
+		name    string
+		args    args
+		wantRes []Transaction
+		wantErr assert.ErrorAssertionFunc
+	}{
+		{
+			name: "when fieldFilePath is a drop box, but user does not have accessViewDropBoxes ",
+			args: args{
+				cc: &ClientConn{
+					Account: &Account{
+						Access: func() accessBitmap {
+							var bits accessBitmap
+							return bits
+						}(),
+					},
+					Server: &Server{
+
+						Config: &Config{
+							FileRoot: func() string {
+								path, _ := os.Getwd()
+								return filepath.Join(path, "/test/config/Files/getFileNameListTestDir")
+							}(),
+						},
+					},
+				},
+				t: NewTransaction(
+					tranGetFileNameList, &[]byte{0, 1},
+					NewField(fieldFilePath, []byte{
+						0x00, 0x01,
+						0x00, 0x00,
+						0x08,
+						0x64, 0x72, 0x6f, 0x70, 0x20, 0x62, 0x6f, 0x78, // "drop box"
+					}),
+				),
+			},
+			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 view drop boxes.")),
+					},
+				},
+			},
+			wantErr: assert.NoError,
+		},
+		{
+			name: "with file root",
+			args: args{
+				cc: &ClientConn{
+					Server: &Server{
+						Config: &Config{
+							FileRoot: func() string {
+								path, _ := os.Getwd()
+								return filepath.Join(path, "/test/config/Files/getFileNameListTestDir")
+							}(),
+						},
+					},
+				},
+				t: NewTransaction(
+					tranGetFileNameList, &[]byte{0, 1},
+					NewField(fieldFilePath, []byte{
+						0x00, 0x00,
+						0x00, 0x00,
+					}),
+				),
+			},
+			wantRes: []Transaction{
+				{
+					Flags:     0x00,
+					IsReply:   0x01,
+					Type:      []byte{0, 0xc8},
+					ID:        []byte{0, 0, 0, 0},
+					ErrorCode: []byte{0, 0, 0, 0},
+					Fields: []Field{
+						NewField(
+							fieldFileNameWithInfo,
+							func() []byte {
+								fnwi := FileNameWithInfo{
+									fileNameWithInfoHeader: fileNameWithInfoHeader{
+										Type:       [4]byte{0x54, 0x45, 0x58, 0x54},
+										Creator:    [4]byte{0x54, 0x54, 0x58, 0x54},
+										FileSize:   [4]byte{0, 0, 0x04, 0},
+										RSVD:       [4]byte{},
+										NameScript: [2]byte{},
+										NameSize:   [2]byte{0, 0x0b},
+									},
+									name: []byte("testfile-1k"),
+								}
+								b, _ := fnwi.MarshalBinary()
+								return b
+							}(),
+						),
+					},
+				},
+			},
+			wantErr: assert.NoError,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			gotRes, err := HandleGetFileNameList(tt.args.cc, tt.args.t)
+			if !tt.wantErr(t, err, fmt.Sprintf("HandleGetFileNameList(%v, %v)", tt.args.cc, tt.args.t)) {
+				return
+			}
+
+			tranAssertEqual(t, tt.wantRes, gotRes)
+		})
+	}
+}
+
+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{0x1, 0x2f},
+					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, 0x79},
+					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)
+		})
+	}
+}