X-Git-Url: https://git.r.bdr.sh/rbdr/mobius/blobdiff_plain/8ce5db7c06589e30b22e4fb7ec8fdb415f711f60..84f3e842cefd5d56bfad299c9592d836dc13059a:/hotline/transaction_handlers_test.go diff --git a/hotline/transaction_handlers_test.go b/hotline/transaction_handlers_test.go index dae2dc0..b03e3b1 100644 --- a/hotline/transaction_handlers_test.go +++ b/hotline/transaction_handlers_test.go @@ -73,8 +73,8 @@ func TestHandleSetChatSubject(t *testing.T) { ID: []byte{0, 0, 0, 1}, ErrorCode: []byte{0, 0, 0, 0}, Fields: []Field{ - NewField(fieldChatID, []byte{0, 0, 0, 1}), - NewField(fieldChatSubject, []byte("Test Subject")), + NewField(FieldChatID, []byte{0, 0, 0, 1}), + NewField(FieldChatSubject, []byte("Test Subject")), }, }, }, @@ -87,8 +87,8 @@ func TestHandleSetChatSubject(t *testing.T) { ID: []byte{0x9a, 0xcb, 0x04, 0x42}, // Random ID from rand.Seed(1) ErrorCode: []byte{0, 0, 0, 0}, Fields: []Field{ - NewField(fieldChatID, []byte{0, 0, 0, 1}), - NewField(fieldChatSubject, []byte("Test Subject")), + NewField(FieldChatID, []byte{0, 0, 0, 1}), + NewField(FieldChatSubject, []byte("Test Subject")), }, }, { @@ -99,8 +99,8 @@ func TestHandleSetChatSubject(t *testing.T) { ID: []byte{0xf0, 0xc5, 0x34, 0x1e}, // Random ID from rand.Seed(1) ErrorCode: []byte{0, 0, 0, 0}, Fields: []Field{ - NewField(fieldChatID, []byte{0, 0, 0, 1}), - NewField(fieldChatSubject, []byte("Test Subject")), + NewField(FieldChatID, []byte{0, 0, 0, 1}), + NewField(FieldChatSubject, []byte("Test Subject")), }, }, }, @@ -174,7 +174,7 @@ func TestHandleLeaveChat(t *testing.T) { }, }, }, - t: NewTransaction(tranDeleteUser, nil, NewField(fieldChatID, []byte{0, 0, 0, 1})), + t: NewTransaction(TranDeleteUser, nil, NewField(FieldChatID, []byte{0, 0, 0, 1})), }, want: []Transaction{ { @@ -185,8 +185,8 @@ func TestHandleLeaveChat(t *testing.T) { ID: []byte{0x9a, 0xcb, 0x04, 0x42}, // Random ID from rand.Seed(1) ErrorCode: []byte{0, 0, 0, 0}, Fields: []Field{ - NewField(fieldChatID, []byte{0, 0, 0, 1}), - NewField(fieldUserID, []byte{0, 2}), + NewField(FieldChatID, []byte{0, 0, 0, 1}), + NewField(FieldUserID, []byte{0, 2}), }, }, }, @@ -257,11 +257,11 @@ func TestHandleGetUserNameList(t *testing.T) { ErrorCode: []byte{0, 0, 0, 0}, Fields: []Field{ NewField( - fieldUsernameWithInfo, + FieldUsernameWithInfo, []byte{00, 01, 00, 02, 00, 03, 00, 02, 00, 04}, ), NewField( - fieldUsernameWithInfo, + FieldUsernameWithInfo, []byte{00, 02, 00, 02, 00, 03, 00, 02, 00, 04}, ), }, @@ -324,7 +324,7 @@ func TestHandleChatSend(t *testing.T) { }, t: &Transaction{ Fields: []Field{ - NewField(fieldData, []byte("hai")), + NewField(FieldData, []byte("hai")), }, }, }, @@ -337,7 +337,7 @@ func TestHandleChatSend(t *testing.T) { 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}), + NewField(FieldData, []byte{0x0d, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x01, 0x3a, 0x20, 0x20, 0x68, 0x61, 0x69}), }, }, { @@ -348,7 +348,7 @@ func TestHandleChatSend(t *testing.T) { 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}), + NewField(FieldData, []byte{0x0d, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x01, 0x3a, 0x20, 0x20, 0x68, 0x61, 0x69}), }, }, }, @@ -385,8 +385,8 @@ func TestHandleChatSend(t *testing.T) { }, t: &Transaction{ Fields: []Field{ - NewField(fieldData, []byte("hai")), - NewField(fieldChatID, []byte{0, 0, 0, 0}), + NewField(FieldData, []byte("hai")), + NewField(FieldChatID, []byte{0, 0, 0, 0}), }, }, }, @@ -399,7 +399,7 @@ func TestHandleChatSend(t *testing.T) { 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}), + NewField(FieldData, []byte{0x0d, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x01, 0x3a, 0x20, 0x20, 0x68, 0x61, 0x69}), }, }, { @@ -410,7 +410,7 @@ func TestHandleChatSend(t *testing.T) { 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}), + NewField(FieldData, []byte{0x0d, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x01, 0x3a, 0x20, 0x20, 0x68, 0x61, 0x69}), }, }, }, @@ -431,26 +431,26 @@ func TestHandleChatSend(t *testing.T) { }, }, t: NewTransaction( - tranChatSend, &[]byte{0, 1}, - NewField(fieldData, []byte("hai")), + TranChatSend, &[]byte{0, 1}, + NewField(FieldData, []byte("hai")), ), }, want: []Transaction{ { Flags: 0x00, IsReply: 0x01, - Type: []byte{0, 0x00}, + Type: []byte{0, 0}, ID: []byte{0x9a, 0xcb, 0x04, 0x42}, ErrorCode: []byte{0, 0, 0, 1}, Fields: []Field{ - NewField(fieldError, []byte("You are not allowed to participate in chat.")), + NewField(FieldError, []byte("You are not allowed to participate in chat.")), }, }, }, wantErr: false, }, { - name: "sends chat msg as emote if fieldChatOptions is set to 1", + name: "sends chat msg as emote if FieldChatOptions is set to 1", args: args{ cc: &ClientConn{ Account: &Account{ @@ -480,8 +480,8 @@ func TestHandleChatSend(t *testing.T) { }, t: &Transaction{ Fields: []Field{ - NewField(fieldData, []byte("performed action")), - NewField(fieldChatOptions, []byte{0x00, 0x01}), + NewField(FieldData, []byte("performed action")), + NewField(FieldChatOptions, []byte{0x00, 0x01}), }, }, }, @@ -494,7 +494,7 @@ func TestHandleChatSend(t *testing.T) { ID: []byte{0x9a, 0xcb, 0x04, 0x42}, ErrorCode: []byte{0, 0, 0, 0}, Fields: []Field{ - NewField(fieldData, []byte("\r*** Testy McTest performed action")), + NewField(FieldData, []byte("\r*** Testy McTest performed action")), }, }, { @@ -505,14 +505,14 @@ func TestHandleChatSend(t *testing.T) { ID: []byte{0xf0, 0xc5, 0x34, 0x1e}, ErrorCode: []byte{0, 0, 0, 0}, Fields: []Field{ - NewField(fieldData, []byte("\r*** Testy McTest performed action")), + NewField(FieldData, []byte("\r*** Testy McTest performed action")), }, }, }, wantErr: false, }, { - name: "does not send chat msg as emote if fieldChatOptions is set to 0", + name: "does not send chat msg as emote if FieldChatOptions is set to 0", args: args{ cc: &ClientConn{ Account: &Account{ @@ -542,8 +542,8 @@ func TestHandleChatSend(t *testing.T) { }, t: &Transaction{ Fields: []Field{ - NewField(fieldData, []byte("hello")), - NewField(fieldChatOptions, []byte{0x00, 0x00}), + NewField(FieldData, []byte("hello")), + NewField(FieldChatOptions, []byte{0x00, 0x00}), }, }, }, @@ -556,7 +556,7 @@ func TestHandleChatSend(t *testing.T) { ID: []byte{0x9a, 0xcb, 0x04, 0x42}, ErrorCode: []byte{0, 0, 0, 0}, Fields: []Field{ - NewField(fieldData, []byte("\r Testy McTest: hello")), + NewField(FieldData, []byte("\r Testy McTest: hello")), }, }, { @@ -567,7 +567,7 @@ func TestHandleChatSend(t *testing.T) { ID: []byte{0xf0, 0xc5, 0x34, 0x1e}, ErrorCode: []byte{0, 0, 0, 0}, Fields: []Field{ - NewField(fieldData, []byte("\r Testy McTest: hello")), + NewField(FieldData, []byte("\r Testy McTest: hello")), }, }, }, @@ -607,7 +607,7 @@ func TestHandleChatSend(t *testing.T) { }, t: &Transaction{ Fields: []Field{ - NewField(fieldData, []byte("hai")), + NewField(FieldData, []byte("hai")), }, }, }, @@ -620,7 +620,7 @@ func TestHandleChatSend(t *testing.T) { 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}), + NewField(FieldData, []byte{0x0d, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x01, 0x3a, 0x20, 0x20, 0x68, 0x61, 0x69}), }, }, }, @@ -675,8 +675,8 @@ func TestHandleChatSend(t *testing.T) { }, t: &Transaction{ Fields: []Field{ - NewField(fieldData, []byte("hai")), - NewField(fieldChatID, []byte{0, 0, 0, 1}), + NewField(FieldData, []byte("hai")), + NewField(FieldChatID, []byte{0, 0, 0, 1}), }, }, }, @@ -689,8 +689,8 @@ func TestHandleChatSend(t *testing.T) { ID: []byte{0x9a, 0xcb, 0x04, 0x42}, ErrorCode: []byte{0, 0, 0, 0}, Fields: []Field{ - NewField(fieldChatID, []byte{0, 0, 0, 1}), - NewField(fieldData, []byte{0x0d, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x01, 0x3a, 0x20, 0x20, 0x68, 0x61, 0x69}), + NewField(FieldChatID, []byte{0, 0, 0, 1}), + NewField(FieldData, []byte{0x0d, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x01, 0x3a, 0x20, 0x20, 0x68, 0x61, 0x69}), }, }, { @@ -701,8 +701,8 @@ func TestHandleChatSend(t *testing.T) { ID: []byte{0x9a, 0xcb, 0x04, 0x42}, ErrorCode: []byte{0, 0, 0, 0}, Fields: []Field{ - NewField(fieldChatID, []byte{0, 0, 0, 1}), - NewField(fieldData, []byte{0x0d, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x01, 0x3a, 0x20, 0x20, 0x68, 0x61, 0x69}), + NewField(FieldChatID, []byte{0, 0, 0, 1}), + NewField(FieldData, []byte{0x0d, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x01, 0x3a, 0x20, 0x20, 0x68, 0x61, 0x69}), }, }, }, @@ -751,9 +751,9 @@ func TestHandleGetFileInfo(t *testing.T) { }, }, t: NewTransaction( - tranGetFileInfo, nil, - NewField(fieldFileName, []byte("testfile.txt")), - NewField(fieldFilePath, []byte{0x00, 0x00}), + TranGetFileInfo, nil, + NewField(FieldFileName, []byte("testfile.txt")), + NewField(FieldFilePath, []byte{0x00, 0x00}), ), }, wantRes: []Transaction{ @@ -765,14 +765,13 @@ func TestHandleGetFileInfo(t *testing.T) { ID: []byte{0x9a, 0xcb, 0x04, 0x42}, // Random ID from rand.Seed(1) ErrorCode: []byte{0, 0, 0, 0}, Fields: []Field{ - NewField(fieldFileName, []byte("testfile.txt")), - NewField(fieldFileTypeString, []byte("Text File")), - NewField(fieldFileCreatorString, []byte("ttxt")), - NewField(fieldFileComment, []byte{}), - NewField(fieldFileType, []byte("TEXT")), - NewField(fieldFileCreateDate, make([]byte, 8)), - NewField(fieldFileModifyDate, make([]byte, 8)), - NewField(fieldFileSize, []byte{0x0, 0x0, 0x0, 0x17}), + NewField(FieldFileName, []byte("testfile.txt")), + NewField(FieldFileTypeString, []byte("Text File")), + NewField(FieldFileCreatorString, []byte("ttxt")), + NewField(FieldFileType, []byte("TEXT")), + NewField(FieldFileCreateDate, make([]byte, 8)), + NewField(FieldFileModifyDate, make([]byte, 8)), + NewField(FieldFileSize, []byte{0x0, 0x0, 0x0, 0x17}), }, }, }, @@ -791,8 +790,8 @@ func TestHandleGetFileInfo(t *testing.T) { // Clear the fileWrapper timestamp fields to work around problems running the tests in multiple timezones // TODO: revisit how to test this by mocking the stat calls + gotRes[0].Fields[4].Data = make([]byte, 8) gotRes[0].Fields[5].Data = make([]byte, 8) - gotRes[0].Fields[6].Data = make([]byte, 8) if !assert.Equal(t, tt.wantRes, gotRes) { t.Errorf("HandleGetFileInfo() gotRes = %v, want %v", gotRes, tt.wantRes) } @@ -831,11 +830,11 @@ func TestHandleNewFolder(t *testing.T) { { Flags: 0x00, IsReply: 0x01, - Type: []byte{0, 0x00}, + Type: []byte{0, 0}, ID: []byte{0x9a, 0xcb, 0x04, 0x42}, ErrorCode: []byte{0, 0, 0, 1}, Fields: []Field{ - NewField(fieldError, []byte("You are not allowed to create folders.")), + NewField(FieldError, []byte("You are not allowed to create folders.")), }, }, }, @@ -866,9 +865,9 @@ func TestHandleNewFolder(t *testing.T) { }, }, t: NewTransaction( - tranNewFolder, &[]byte{0, 1}, - NewField(fieldFileName, []byte("testFolder")), - NewField(fieldFilePath, []byte{ + TranNewFolder, &[]byte{0, 1}, + NewField(FieldFileName, []byte("testFolder")), + NewField(FieldFilePath, []byte{ 0x00, 0x01, 0x00, 0x00, 0x03, @@ -913,8 +912,8 @@ func TestHandleNewFolder(t *testing.T) { }, }, t: NewTransaction( - tranNewFolder, &[]byte{0, 1}, - NewField(fieldFileName, []byte("testFolder")), + TranNewFolder, &[]byte{0, 1}, + NewField(FieldFileName, []byte("testFolder")), ), }, wantRes: []Transaction{ @@ -954,9 +953,9 @@ func TestHandleNewFolder(t *testing.T) { }, }, t: NewTransaction( - tranNewFolder, &[]byte{0, 1}, - NewField(fieldFileName, []byte("testFolder")), - NewField(fieldFilePath, []byte{ + TranNewFolder, &[]byte{0, 1}, + NewField(FieldFileName, []byte("testFolder")), + NewField(FieldFilePath, []byte{ 0x00, }), ), @@ -965,7 +964,7 @@ func TestHandleNewFolder(t *testing.T) { wantErr: true, }, { - name: "fieldFileName does not allow directory traversal", + name: "FieldFileName does not allow directory traversal", args: args{ cc: &ClientConn{ Account: &Account{ @@ -989,8 +988,8 @@ func TestHandleNewFolder(t *testing.T) { }, }, t: NewTransaction( - tranNewFolder, &[]byte{0, 1}, - NewField(fieldFileName, []byte("../../testFolder")), + TranNewFolder, &[]byte{0, 1}, + NewField(FieldFileName, []byte("../../testFolder")), ), }, wantRes: []Transaction{ @@ -1005,7 +1004,7 @@ func TestHandleNewFolder(t *testing.T) { }, wantErr: false, }, { - name: "fieldFilePath does not allow directory traversal", + name: "FieldFilePath does not allow directory traversal", args: args{ cc: &ClientConn{ Account: &Account{ @@ -1029,9 +1028,9 @@ func TestHandleNewFolder(t *testing.T) { }, }, t: NewTransaction( - tranNewFolder, &[]byte{0, 1}, - NewField(fieldFileName, []byte("testFolder")), - NewField(fieldFilePath, []byte{ + TranNewFolder, &[]byte{0, 1}, + NewField(FieldFileName, []byte("testFolder")), + NewField(FieldFilePath, []byte{ 0x00, 0x02, 0x00, 0x00, 0x03, @@ -1056,7 +1055,6 @@ func TestHandleNewFolder(t *testing.T) { } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - gotRes, err := HandleNewFolder(tt.args.cc, tt.args.t) if (err != nil) != tt.wantErr { t.Errorf("HandleNewFolder() error = %v, wantErr %v", err, tt.wantErr) @@ -1104,9 +1102,9 @@ func TestHandleUploadFile(t *testing.T) { }, }, t: NewTransaction( - tranUploadFile, &[]byte{0, 1}, - NewField(fieldFileName, []byte("testFile")), - NewField(fieldFilePath, []byte{ + TranUploadFile, &[]byte{0, 1}, + NewField(FieldFileName, []byte("testFile")), + NewField(FieldFilePath, []byte{ 0x00, 0x01, 0x00, 0x00, 0x03, @@ -1122,7 +1120,7 @@ func TestHandleUploadFile(t *testing.T) { ID: []byte{0x9a, 0xcb, 0x04, 0x42}, ErrorCode: []byte{0, 0, 0, 0}, Fields: []Field{ - NewField(fieldRefNum, []byte{0x52, 0xfd, 0xfc, 0x07}), // rand.Seed(1) + NewField(FieldRefNum, []byte{0x52, 0xfd, 0xfc, 0x07}), // rand.Seed(1) }, }, }, @@ -1140,9 +1138,9 @@ func TestHandleUploadFile(t *testing.T) { }, }, t: NewTransaction( - tranUploadFile, &[]byte{0, 1}, - NewField(fieldFileName, []byte("testFile")), - NewField(fieldFilePath, []byte{ + TranUploadFile, &[]byte{0, 1}, + NewField(FieldFileName, []byte("testFile")), + NewField(FieldFilePath, []byte{ 0x00, 0x01, 0x00, 0x00, 0x03, @@ -1154,11 +1152,11 @@ func TestHandleUploadFile(t *testing.T) { { Flags: 0x00, IsReply: 0x01, - Type: []byte{0, 0x00}, + Type: []byte{0, 0}, ID: []byte{0x9a, 0xcb, 0x04, 0x42}, ErrorCode: []byte{0, 0, 0, 1}, Fields: []Field{ - NewField(fieldError, []byte("You are not allowed to upload files.")), // rand.Seed(1) + NewField(FieldError, []byte("You are not allowed to upload files.")), // rand.Seed(1) }, }, }, @@ -1175,7 +1173,6 @@ func TestHandleUploadFile(t *testing.T) { } tranAssertEqual(t, tt.wantRes, gotRes) - }) } } @@ -1224,10 +1221,10 @@ func TestHandleMakeAlias(t *testing.T) { }, }, t: NewTransaction( - tranMakeFileAlias, &[]byte{0, 1}, - NewField(fieldFileName, []byte("testFile")), - NewField(fieldFilePath, EncodeFilePath(strings.Join([]string{"foo"}, "/"))), - NewField(fieldFileNewPath, EncodeFilePath(strings.Join([]string{"bar"}, "/"))), + TranMakeFileAlias, &[]byte{0, 1}, + NewField(FieldFileName, []byte("testFile")), + NewField(FieldFilePath, EncodeFilePath(strings.Join([]string{"foo"}, "/"))), + NewField(FieldFileNewPath, EncodeFilePath(strings.Join([]string{"bar"}, "/"))), ), }, wantRes: []Transaction{ @@ -1275,21 +1272,21 @@ func TestHandleMakeAlias(t *testing.T) { }, }, t: NewTransaction( - tranMakeFileAlias, &[]byte{0, 1}, - NewField(fieldFileName, []byte("testFile")), - NewField(fieldFilePath, EncodeFilePath(strings.Join([]string{"foo"}, "/"))), - NewField(fieldFileNewPath, EncodeFilePath(strings.Join([]string{"bar"}, "/"))), + TranMakeFileAlias, &[]byte{0, 1}, + NewField(FieldFileName, []byte("testFile")), + NewField(FieldFilePath, EncodeFilePath(strings.Join([]string{"foo"}, "/"))), + NewField(FieldFileNewPath, EncodeFilePath(strings.Join([]string{"bar"}, "/"))), ), }, wantRes: []Transaction{ { Flags: 0x00, IsReply: 0x01, - Type: []byte{0, 0x00}, + Type: []byte{0, 0}, ID: []byte{0x9a, 0xcb, 0x04, 0x42}, ErrorCode: []byte{0, 0, 0, 1}, Fields: []Field{ - NewField(fieldError, []byte("Error creating alias")), + NewField(FieldError, []byte("Error creating alias")), }, }, }, @@ -1316,15 +1313,15 @@ func TestHandleMakeAlias(t *testing.T) { }, }, t: NewTransaction( - tranMakeFileAlias, &[]byte{0, 1}, - NewField(fieldFileName, []byte("testFile")), - NewField(fieldFilePath, []byte{ + TranMakeFileAlias, &[]byte{0, 1}, + NewField(FieldFileName, []byte("testFile")), + NewField(FieldFilePath, []byte{ 0x00, 0x01, 0x00, 0x00, 0x03, 0x2e, 0x2e, 0x2e, }), - NewField(fieldFileNewPath, []byte{ + NewField(FieldFileNewPath, []byte{ 0x00, 0x01, 0x00, 0x00, 0x03, @@ -1336,11 +1333,11 @@ func TestHandleMakeAlias(t *testing.T) { { Flags: 0x00, IsReply: 0x01, - Type: []byte{0, 0x00}, + Type: []byte{0, 0}, ID: []byte{0x9a, 0xcb, 0x04, 0x42}, ErrorCode: []byte{0, 0, 0, 1}, Fields: []Field{ - NewField(fieldError, []byte("You are not allowed to make aliases.")), + NewField(FieldError, []byte("You are not allowed to make aliases.")), }, }, }, @@ -1394,8 +1391,8 @@ func TestHandleGetUser(t *testing.T) { }, }, t: NewTransaction( - tranGetUser, &[]byte{0, 1}, - NewField(fieldUserLogin, []byte("guest")), + TranGetUser, &[]byte{0, 1}, + NewField(FieldUserLogin, []byte("guest")), ), }, wantRes: []Transaction{ @@ -1406,10 +1403,10 @@ func TestHandleGetUser(t *testing.T) { 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{0, 0, 0, 0, 0, 0, 0, 0}), + NewField(FieldUserName, []byte("Guest")), + NewField(FieldUserLogin, encodeString([]byte("guest"))), + NewField(FieldUserPassword, []byte("password")), + NewField(FieldUserAccess, []byte{0, 0, 0, 0, 0, 0, 0, 0}), }, }, }, @@ -1430,19 +1427,19 @@ func TestHandleGetUser(t *testing.T) { }, }, t: NewTransaction( - tranGetUser, &[]byte{0, 1}, - NewField(fieldUserLogin, []byte("nonExistentUser")), + TranGetUser, &[]byte{0, 1}, + NewField(FieldUserLogin, []byte("nonExistentUser")), ), }, wantRes: []Transaction{ { Flags: 0x00, IsReply: 0x01, - Type: []byte{0, 0x00}, + Type: []byte{0, 0}, ID: []byte{0x9a, 0xcb, 0x04, 0x42}, ErrorCode: []byte{0, 0, 0, 1}, Fields: []Field{ - NewField(fieldError, []byte("You are not allowed to view accounts.")), + NewField(FieldError, []byte("You are not allowed to view accounts.")), }, }, }, @@ -1464,19 +1461,19 @@ func TestHandleGetUser(t *testing.T) { }, }, t: NewTransaction( - tranGetUser, &[]byte{0, 1}, - NewField(fieldUserLogin, []byte("nonExistentUser")), + TranGetUser, &[]byte{0, 1}, + NewField(FieldUserLogin, []byte("nonExistentUser")), ), }, wantRes: []Transaction{ { Flags: 0x00, IsReply: 0x01, - Type: []byte{0, 0x00}, + Type: []byte{0, 0}, ID: []byte{0x9a, 0xcb, 0x04, 0x42}, ErrorCode: []byte{0, 0, 0, 1}, Fields: []Field{ - NewField(fieldError, []byte("Account does not exist.")), + NewField(FieldError, []byte("Account does not exist.")), }, }, }, @@ -1534,8 +1531,8 @@ func TestHandleDeleteUser(t *testing.T) { }, }, t: NewTransaction( - tranDeleteUser, &[]byte{0, 1}, - NewField(fieldUserLogin, negateString([]byte("testuser"))), + TranDeleteUser, &[]byte{0, 1}, + NewField(FieldUserLogin, encodeString([]byte("testuser"))), ), }, wantRes: []Transaction{ @@ -1565,19 +1562,19 @@ func TestHandleDeleteUser(t *testing.T) { }, }, t: NewTransaction( - tranDeleteUser, &[]byte{0, 1}, - NewField(fieldUserLogin, negateString([]byte("testuser"))), + TranDeleteUser, &[]byte{0, 1}, + NewField(FieldUserLogin, encodeString([]byte("testuser"))), ), }, wantRes: []Transaction{ { Flags: 0x00, IsReply: 0x01, - Type: []byte{0, 0x00}, + Type: []byte{0, 0}, ID: []byte{0x9a, 0xcb, 0x04, 0x42}, ErrorCode: []byte{0, 0, 0, 1}, Fields: []Field{ - NewField(fieldError, []byte("You are not allowed to delete accounts.")), + NewField(FieldError, []byte("You are not allowed to delete accounts.")), }, }, }, @@ -1623,7 +1620,7 @@ func TestHandleGetMsgs(t *testing.T) { }, }, t: NewTransaction( - tranGetMsgs, &[]byte{0, 1}, + TranGetMsgs, &[]byte{0, 1}, ), }, wantRes: []Transaction{ @@ -1634,7 +1631,7 @@ func TestHandleGetMsgs(t *testing.T) { ID: []byte{0x9a, 0xcb, 0x04, 0x42}, ErrorCode: []byte{0, 0, 0, 0}, Fields: []Field{ - NewField(fieldData, []byte("TEST")), + NewField(FieldData, []byte("TEST")), }, }, }, @@ -1655,18 +1652,18 @@ func TestHandleGetMsgs(t *testing.T) { }, }, t: NewTransaction( - tranGetMsgs, &[]byte{0, 1}, + TranGetMsgs, &[]byte{0, 1}, ), }, wantRes: []Transaction{ { Flags: 0x00, IsReply: 0x01, - Type: []byte{0, 0x00}, + Type: []byte{0, 0}, ID: []byte{0x9a, 0xcb, 0x04, 0x42}, ErrorCode: []byte{0, 0, 0, 1}, Fields: []Field{ - NewField(fieldError, []byte("You are not allowed to read news.")), + NewField(FieldError, []byte("You are not allowed to read news.")), }, }, }, @@ -1711,18 +1708,18 @@ func TestHandleNewUser(t *testing.T) { }, }, t: NewTransaction( - tranNewUser, &[]byte{0, 1}, + TranNewUser, &[]byte{0, 1}, ), }, wantRes: []Transaction{ { Flags: 0x00, IsReply: 0x01, - Type: []byte{0, 0x00}, + Type: []byte{0, 0}, ID: []byte{0x9a, 0xcb, 0x04, 0x42}, ErrorCode: []byte{0, 0, 0, 1}, Fields: []Field{ - NewField(fieldError, []byte("You are not allowed to create new accounts.")), + NewField(FieldError, []byte("You are not allowed to create new accounts.")), }, }, }, @@ -1744,10 +1741,10 @@ func TestHandleNewUser(t *testing.T) { }, }, t: NewTransaction( - tranNewUser, &[]byte{0, 1}, - NewField(fieldUserLogin, []byte("userB")), + TranNewUser, &[]byte{0, 1}, + NewField(FieldUserLogin, []byte("userB")), NewField( - fieldUserAccess, + FieldUserAccess, func() []byte { var bits accessBitmap bits.Set(accessDisconUser) @@ -1760,11 +1757,11 @@ func TestHandleNewUser(t *testing.T) { { Flags: 0x00, IsReply: 0x01, - Type: []byte{0, 0x00}, + Type: []byte{0, 0}, 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.")), + NewField(FieldError, []byte("Cannot create account with more access than yourself.")), }, }, }, @@ -1809,18 +1806,18 @@ func TestHandleListUsers(t *testing.T) { }, }, t: NewTransaction( - tranNewUser, &[]byte{0, 1}, + TranNewUser, &[]byte{0, 1}, ), }, wantRes: []Transaction{ { Flags: 0x00, IsReply: 0x01, - Type: []byte{0, 0x00}, + Type: []byte{0, 0}, ID: []byte{0x9a, 0xcb, 0x04, 0x42}, ErrorCode: []byte{0, 0, 0, 1}, Fields: []Field{ - NewField(fieldError, []byte("You are not allowed to view accounts.")), + NewField(FieldError, []byte("You are not allowed to view accounts.")), }, }, }, @@ -1849,8 +1846,8 @@ func TestHandleListUsers(t *testing.T) { }, }, t: NewTransaction( - tranGetClientInfoText, &[]byte{0, 1}, - NewField(fieldUserID, []byte{0, 1}), + TranGetClientInfoText, &[]byte{0, 1}, + NewField(FieldUserID, []byte{0, 1}), ), }, wantRes: []Transaction{ @@ -1861,7 +1858,7 @@ func TestHandleListUsers(t *testing.T) { ID: []byte{0, 0, 0, 0}, ErrorCode: []byte{0, 0, 0, 0}, Fields: []Field{ - NewField(fieldData, []byte{ + 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, @@ -1907,17 +1904,17 @@ func TestHandleDownloadFile(t *testing.T) { }, Server: &Server{}, }, - t: NewTransaction(tranDownloadFile, &[]byte{0, 1}), + t: NewTransaction(TranDownloadFile, &[]byte{0, 1}), }, wantRes: []Transaction{ { Flags: 0x00, IsReply: 0x01, - Type: []byte{0, 0x00}, + Type: []byte{0, 0}, ID: []byte{0x9a, 0xcb, 0x04, 0x42}, ErrorCode: []byte{0, 0, 0, 1}, Fields: []Field{ - NewField(fieldError, []byte("You are not allowed to download files.")), + NewField(FieldError, []byte("You are not allowed to download files.")), }, }, }, @@ -1949,8 +1946,8 @@ func TestHandleDownloadFile(t *testing.T) { t: NewTransaction( accessDownloadFile, &[]byte{0, 1}, - NewField(fieldFileName, []byte("testfile.txt")), - NewField(fieldFilePath, []byte{0x0, 0x00}), + NewField(FieldFileName, []byte("testfile.txt")), + NewField(FieldFilePath, []byte{0x0, 0x00}), ), }, wantRes: []Transaction{ @@ -1961,10 +1958,10 @@ func TestHandleDownloadFile(t *testing.T) { ID: []byte{0x9a, 0xcb, 0x04, 0x42}, ErrorCode: []byte{0, 0, 0, 0}, Fields: []Field{ - NewField(fieldRefNum, []byte{0x52, 0xfd, 0xfc, 0x07}), - NewField(fieldWaitingCount, []byte{0x00, 0x00}), - NewField(fieldTransferSize, []byte{0x00, 0x00, 0x00, 0xa5}), - NewField(fieldFileSize, []byte{0x00, 0x00, 0x00, 0x17}), + NewField(FieldRefNum, []byte{0x52, 0xfd, 0xfc, 0x07}), + NewField(FieldWaitingCount, []byte{0x00, 0x00}), + NewField(FieldTransferSize, []byte{0x00, 0x00, 0x00, 0xa5}), + NewField(FieldFileSize, []byte{0x00, 0x00, 0x00, 0x17}), }, }, }, @@ -2013,10 +2010,10 @@ func TestHandleDownloadFile(t *testing.T) { t: NewTransaction( accessDownloadFile, &[]byte{0, 1}, - NewField(fieldFileName, []byte("testfile-1k")), - NewField(fieldFilePath, []byte{0x00, 0x00}), + NewField(FieldFileName, []byte("testfile-1k")), + NewField(FieldFilePath, []byte{0x00, 0x00}), NewField( - fieldFileResumeData, + FieldFileResumeData, func() []byte { frd := FileResumeData{ Format: [4]byte{}, @@ -2052,10 +2049,10 @@ func TestHandleDownloadFile(t *testing.T) { ID: []byte{0x9a, 0xcb, 0x04, 0x42}, ErrorCode: []byte{0, 0, 0, 0}, Fields: []Field{ - NewField(fieldRefNum, []byte{0x52, 0xfd, 0xfc, 0x07}), - NewField(fieldWaitingCount, []byte{0x00, 0x00}), - NewField(fieldTransferSize, []byte{0x00, 0x00, 0x03, 0x8d}), - NewField(fieldFileSize, []byte{0x00, 0x00, 0x03, 0x00}), + NewField(FieldRefNum, []byte{0x52, 0xfd, 0xfc, 0x07}), + NewField(FieldWaitingCount, []byte{0x00, 0x00}), + NewField(FieldTransferSize, []byte{0x00, 0x00, 0x03, 0x8d}), + NewField(FieldFileSize, []byte{0x00, 0x00, 0x03, 0x00}), }, }, }, @@ -2101,24 +2098,24 @@ func TestHandleUpdateUser(t *testing.T) { }, }, t: NewTransaction( - tranUpdateUser, + TranUpdateUser, &[]byte{0, 0}, - NewField(fieldData, []byte{ + NewField(FieldData, []byte{ 0x00, 0x04, // field count - 0x00, 0x69, // fieldUserLogin = 105 + 0x00, 0x69, // FieldUserLogin = 105 0x00, 0x03, 0x9d, 0x9d, 0x9d, - 0x00, 0x6a, // fieldUserPassword = 106 + 0x00, 0x6a, // FieldUserPassword = 106 0x00, 0x03, 0x9c, 0x9c, 0x9c, - 0x00, 0x66, // fieldUserName = 102 + 0x00, 0x66, // FieldUserName = 102 0x00, 0x03, 0x61, 0x61, 0x61, - 0x00, 0x6e, // fieldUserAccess = 110 + 0x00, 0x6e, // FieldUserAccess = 110 0x00, 0x08, 0x60, 0x70, 0x0c, 0x20, 0x03, 0x80, 0x00, 0x00, }), @@ -2128,11 +2125,11 @@ func TestHandleUpdateUser(t *testing.T) { { Flags: 0x00, IsReply: 0x01, - Type: []byte{0, 0x00}, + Type: []byte{0, 0}, ID: []byte{0x9a, 0xcb, 0x04, 0x42}, ErrorCode: []byte{0, 0, 0, 1}, Fields: []Field{ - NewField(fieldError, []byte("You are not allowed to create new accounts.")), + NewField(FieldError, []byte("You are not allowed to create new accounts.")), }, }, }, @@ -2157,24 +2154,24 @@ func TestHandleUpdateUser(t *testing.T) { }, }, t: NewTransaction( - tranUpdateUser, + TranUpdateUser, &[]byte{0, 0}, - NewField(fieldData, []byte{ + NewField(FieldData, []byte{ 0x00, 0x04, // field count - 0x00, 0x69, // fieldUserLogin = 105 + 0x00, 0x69, // FieldUserLogin = 105 0x00, 0x03, 0x9d, 0x9d, 0x9d, - 0x00, 0x6a, // fieldUserPassword = 106 + 0x00, 0x6a, // FieldUserPassword = 106 0x00, 0x03, 0x9c, 0x9c, 0x9c, - 0x00, 0x66, // fieldUserName = 102 + 0x00, 0x66, // FieldUserName = 102 0x00, 0x03, 0x61, 0x61, 0x61, - 0x00, 0x6e, // fieldUserAccess = 110 + 0x00, 0x6e, // FieldUserAccess = 110 0x00, 0x08, 0x60, 0x70, 0x0c, 0x20, 0x03, 0x80, 0x00, 0x00, }), @@ -2184,11 +2181,11 @@ func TestHandleUpdateUser(t *testing.T) { { Flags: 0x00, IsReply: 0x01, - Type: []byte{0, 0x00}, + Type: []byte{0, 0}, ID: []byte{0x9a, 0xcb, 0x04, 0x42}, ErrorCode: []byte{0, 0, 0, 1}, Fields: []Field{ - NewField(fieldError, []byte("You are not allowed to modify accounts.")), + NewField(FieldError, []byte("You are not allowed to modify accounts.")), }, }, }, @@ -2212,9 +2209,9 @@ func TestHandleUpdateUser(t *testing.T) { }, }, t: NewTransaction( - tranUpdateUser, + TranUpdateUser, &[]byte{0, 0}, - NewField(fieldData, []byte{ + NewField(FieldData, []byte{ 0x00, 0x01, 0x00, 0x65, 0x00, 0x03, @@ -2226,11 +2223,11 @@ func TestHandleUpdateUser(t *testing.T) { { Flags: 0x00, IsReply: 0x01, - Type: []byte{0, 0x00}, + Type: []byte{0, 0}, ID: []byte{0x9a, 0xcb, 0x04, 0x42}, ErrorCode: []byte{0, 0, 0, 1}, Fields: []Field{ - NewField(fieldError, []byte("You are not allowed to delete accounts.")), + NewField(FieldError, []byte("You are not allowed to delete accounts.")), }, }, }, @@ -2272,7 +2269,7 @@ func TestHandleDelNewsArt(t *testing.T) { }, }, t: NewTransaction( - tranDelNewsArt, + TranDelNewsArt, &[]byte{0, 0}, ), }, @@ -2280,11 +2277,11 @@ func TestHandleDelNewsArt(t *testing.T) { { Flags: 0x00, IsReply: 0x01, - Type: []byte{0, 0x00}, + Type: []byte{0, 0}, ID: []byte{0x9a, 0xcb, 0x04, 0x42}, ErrorCode: []byte{0, 0, 0, 1}, Fields: []Field{ - NewField(fieldError, []byte("You are not allowed to delete news articles.")), + NewField(FieldError, []byte("You are not allowed to delete news articles.")), }, }, }, @@ -2325,7 +2322,7 @@ func TestHandleDisconnectUser(t *testing.T) { }, }, t: NewTransaction( - tranDelNewsArt, + TranDelNewsArt, &[]byte{0, 0}, ), }, @@ -2333,11 +2330,11 @@ func TestHandleDisconnectUser(t *testing.T) { { Flags: 0x00, IsReply: 0x01, - Type: []byte{0, 0x00}, + Type: []byte{0, 0}, ID: []byte{0x9a, 0xcb, 0x04, 0x42}, ErrorCode: []byte{0, 0, 0, 1}, Fields: []Field{ - NewField(fieldError, []byte("You are not allowed to disconnect users.")), + NewField(FieldError, []byte("You are not allowed to disconnect users.")), }, }, }, @@ -2370,20 +2367,20 @@ func TestHandleDisconnectUser(t *testing.T) { }, }, t: NewTransaction( - tranDelNewsArt, + TranDelNewsArt, &[]byte{0, 0}, - NewField(fieldUserID, []byte{0, 1}), + NewField(FieldUserID, []byte{0, 1}), ), }, wantRes: []Transaction{ { Flags: 0x00, IsReply: 0x01, - Type: []byte{0, 0x00}, + Type: []byte{0, 0}, ID: []byte{0x9a, 0xcb, 0x04, 0x42}, ErrorCode: []byte{0, 0, 0, 1}, Fields: []Field{ - NewField(fieldError, []byte("unnamed is not allowed to be disconnected.")), + NewField(FieldError, []byte("unnamed is not allowed to be disconnected.")), }, }, }, @@ -2424,7 +2421,7 @@ func TestHandleSendInstantMsg(t *testing.T) { }, }, t: NewTransaction( - tranDelNewsArt, + TranDelNewsArt, &[]byte{0, 0}, ), }, @@ -2432,15 +2429,15 @@ func TestHandleSendInstantMsg(t *testing.T) { { Flags: 0x00, IsReply: 0x01, - Type: []byte{0, 0x00}, + Type: []byte{0, 0}, 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.")), + NewField(FieldError, []byte("You are not allowed to send private messages.")), }, }, }, - wantErr: assert.NoError, + wantErr: assert.Error, }, { name: "when client 1 sends a message to client 2", @@ -2465,20 +2462,20 @@ func TestHandleSendInstantMsg(t *testing.T) { }, }, t: NewTransaction( - tranSendInstantMsg, + TranSendInstantMsg, &[]byte{0, 1}, - NewField(fieldData, []byte("hai")), - NewField(fieldUserID, []byte{0, 2}), + NewField(FieldData, []byte("hai")), + NewField(FieldUserID, []byte{0, 2}), ), }, wantRes: []Transaction{ *NewTransaction( - tranServerMsg, + TranServerMsg, &[]byte{0, 2}, - NewField(fieldData, []byte("hai")), - NewField(fieldUserName, []byte("User1")), - NewField(fieldUserID, []byte{0, 1}), - NewField(fieldOptions, []byte{0, 1}), + NewField(FieldData, []byte("hai")), + NewField(FieldUserName, []byte("User1")), + NewField(FieldUserID, []byte{0, 1}), + NewField(FieldOptions, []byte{0, 1}), ), { clientID: &[]byte{0, 1}, @@ -2517,28 +2514,28 @@ func TestHandleSendInstantMsg(t *testing.T) { }, }, t: NewTransaction( - tranSendInstantMsg, + TranSendInstantMsg, &[]byte{0, 1}, - NewField(fieldData, []byte("hai")), - NewField(fieldUserID, []byte{0, 2}), + NewField(FieldData, []byte("hai")), + NewField(FieldUserID, []byte{0, 2}), ), }, wantRes: []Transaction{ *NewTransaction( - tranServerMsg, + TranServerMsg, &[]byte{0, 2}, - NewField(fieldData, []byte("hai")), - NewField(fieldUserName, []byte("User1")), - NewField(fieldUserID, []byte{0, 1}), - NewField(fieldOptions, []byte{0, 1}), + NewField(FieldData, []byte("hai")), + NewField(FieldUserName, []byte("User1")), + NewField(FieldUserID, []byte{0, 1}), + NewField(FieldOptions, []byte{0, 1}), ), *NewTransaction( - tranServerMsg, + TranServerMsg, &[]byte{0, 1}, - NewField(fieldData, []byte("autohai")), - NewField(fieldUserName, []byte("User2")), - NewField(fieldUserID, []byte{0, 2}), - NewField(fieldOptions, []byte{0, 1}), + NewField(FieldData, []byte("autohai")), + NewField(FieldUserName, []byte("User2")), + NewField(FieldUserID, []byte{0, 2}), + NewField(FieldOptions, []byte{0, 1}), ), { clientID: &[]byte{0, 1}, @@ -2576,20 +2573,20 @@ func TestHandleSendInstantMsg(t *testing.T) { }, }, t: NewTransaction( - tranSendInstantMsg, + TranSendInstantMsg, &[]byte{0, 1}, - NewField(fieldData, []byte("hai")), - NewField(fieldUserID, []byte{0, 2}), + NewField(FieldData, []byte("hai")), + NewField(FieldUserID, []byte{0, 2}), ), }, wantRes: []Transaction{ *NewTransaction( - tranServerMsg, + 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}), + 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}, @@ -2662,9 +2659,9 @@ func TestHandleDeleteFile(t *testing.T) { }, }, t: NewTransaction( - tranDeleteFile, &[]byte{0, 1}, - NewField(fieldFileName, []byte("testfile")), - NewField(fieldFilePath, []byte{ + TranDeleteFile, &[]byte{0, 1}, + NewField(FieldFileName, []byte("testfile")), + NewField(FieldFilePath, []byte{ 0x00, 0x01, 0x00, 0x00, 0x03, @@ -2676,11 +2673,11 @@ func TestHandleDeleteFile(t *testing.T) { { Flags: 0x00, IsReply: 0x01, - Type: []byte{0, 0x00}, + Type: []byte{0, 0}, ID: []byte{0x9a, 0xcb, 0x04, 0x42}, ErrorCode: []byte{0, 0, 0, 1}, Fields: []Field{ - NewField(fieldError, []byte("You are not allowed to delete files.")), + NewField(FieldError, []byte("You are not allowed to delete files.")), }, }, }, @@ -2727,9 +2724,9 @@ func TestHandleDeleteFile(t *testing.T) { }, }, t: NewTransaction( - tranDeleteFile, &[]byte{0, 1}, - NewField(fieldFileName, []byte("testfile")), - NewField(fieldFilePath, []byte{ + TranDeleteFile, &[]byte{0, 1}, + NewField(FieldFileName, []byte("testfile")), + NewField(FieldFilePath, []byte{ 0x00, 0x01, 0x00, 0x00, 0x03, @@ -2776,7 +2773,7 @@ func TestHandleGetFileNameList(t *testing.T) { wantErr assert.ErrorAssertionFunc }{ { - name: "when fieldFilePath is a drop box, but user does not have accessViewDropBoxes ", + name: "when FieldFilePath is a drop box, but user does not have accessViewDropBoxes ", args: args{ cc: &ClientConn{ Account: &Account{ @@ -2796,8 +2793,8 @@ func TestHandleGetFileNameList(t *testing.T) { }, }, t: NewTransaction( - tranGetFileNameList, &[]byte{0, 1}, - NewField(fieldFilePath, []byte{ + TranGetFileNameList, &[]byte{0, 1}, + NewField(FieldFilePath, []byte{ 0x00, 0x01, 0x00, 0x00, 0x08, @@ -2809,11 +2806,11 @@ func TestHandleGetFileNameList(t *testing.T) { { Flags: 0x00, IsReply: 0x01, - Type: []byte{0, 0x00}, + Type: []byte{0, 0}, 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.")), + NewField(FieldError, []byte("You are not allowed to view drop boxes.")), }, }, }, @@ -2833,8 +2830,8 @@ func TestHandleGetFileNameList(t *testing.T) { }, }, t: NewTransaction( - tranGetFileNameList, &[]byte{0, 1}, - NewField(fieldFilePath, []byte{ + TranGetFileNameList, &[]byte{0, 1}, + NewField(FieldFilePath, []byte{ 0x00, 0x00, 0x00, 0x00, }), @@ -2849,7 +2846,7 @@ func TestHandleGetFileNameList(t *testing.T) { ErrorCode: []byte{0, 0, 0, 0}, Fields: []Field{ NewField( - fieldFileNameWithInfo, + FieldFileNameWithInfo, func() []byte { fnwi := FileNameWithInfo{ fileNameWithInfoHeader: fileNameWithInfoHeader{ @@ -2910,19 +2907,19 @@ func TestHandleGetClientInfoText(t *testing.T) { }, }, t: NewTransaction( - tranGetClientInfoText, &[]byte{0, 1}, - NewField(fieldUserID, []byte{0, 1}), + TranGetClientInfoText, &[]byte{0, 1}, + NewField(FieldUserID, []byte{0, 1}), ), }, wantRes: []Transaction{ { Flags: 0x00, IsReply: 0x01, - Type: []byte{0, 0x00}, + Type: []byte{0, 0}, 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.")), + NewField(FieldError, []byte("You are not allowed to get client info.")), }, }, }, @@ -2969,8 +2966,8 @@ func TestHandleGetClientInfoText(t *testing.T) { }, }, t: NewTransaction( - tranGetClientInfoText, &[]byte{0, 1}, - NewField(fieldUserID, []byte{0, 1}), + TranGetClientInfoText, &[]byte{0, 1}, + NewField(FieldUserID, []byte{0, 1}), ), }, wantRes: []Transaction{ @@ -2981,8 +2978,8 @@ func TestHandleGetClientInfoText(t *testing.T) { ID: []byte{0, 0, 0, 0}, ErrorCode: []byte{0, 0, 0, 0}, Fields: []Field{ - NewField(fieldData, []byte( - strings.Replace(`Nickname: Testy McTest + NewField(FieldData, []byte( + strings.ReplaceAll(`Nickname: Testy McTest Name: test Account: test Address: 1.2.3.4:12345 @@ -3007,9 +3004,9 @@ None. None. -`, "\n", "\r", -1)), +`, "\n", "\r")), ), - NewField(fieldUserName, []byte("Testy McTest")), + NewField(FieldUserName, []byte("Testy McTest")), }, }, }, @@ -3061,10 +3058,10 @@ func TestHandleTranAgreed(t *testing.T) { }, }, t: NewTransaction( - tranAgreed, nil, - NewField(fieldUserName, []byte("username")), - NewField(fieldUserIconID, []byte{0, 1}), - NewField(fieldOptions, []byte{0, 0}), + TranAgreed, nil, + NewField(FieldUserName, []byte("username")), + NewField(FieldUserIconID, []byte{0, 1}), + NewField(FieldOptions, []byte{0, 0}), ), }, wantRes: []Transaction{ @@ -3076,7 +3073,7 @@ func TestHandleTranAgreed(t *testing.T) { ID: []byte{0, 0, 0, 0}, ErrorCode: []byte{0, 0, 0, 0}, Fields: []Field{ - NewField(fieldBannerType, []byte("JPEG")), + NewField(FieldBannerType, []byte("JPEG")), }, }, { @@ -3136,9 +3133,9 @@ func TestHandleSetClientUserInfo(t *testing.T) { }, }, t: NewTransaction( - tranSetClientUserInfo, nil, - NewField(fieldUserIconID, []byte{0, 1}), - NewField(fieldUserName, []byte("NOPE")), + TranSetClientUserInfo, nil, + NewField(FieldUserIconID, []byte{0, 1}), + NewField(FieldUserName, []byte("NOPE")), ), }, wantRes: []Transaction{ @@ -3150,10 +3147,10 @@ func TestHandleSetClientUserInfo(t *testing.T) { 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"))}, + NewField(FieldUserID, []byte{0, 1}), + NewField(FieldUserIconID, []byte{0, 1}), + NewField(FieldUserFlags, []byte{0, 1}), + NewField(FieldUserName, []byte("Guest"))}, }, }, wantErr: assert.NoError, @@ -3202,8 +3199,8 @@ func TestHandleDelNewsItem(t *testing.T) { }, }, t: NewTransaction( - tranDelNewsItem, nil, - NewField(fieldNewsPath, + TranDelNewsItem, nil, + NewField(FieldNewsPath, []byte{ 0, 1, 0, 0, @@ -3218,11 +3215,11 @@ func TestHandleDelNewsItem(t *testing.T) { clientID: &[]byte{0, 1}, Flags: 0x00, IsReply: 0x01, - Type: []byte{0, 0x00}, + Type: []byte{0, 0}, 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.")), + NewField(FieldError, []byte("You are not allowed to delete news categories.")), }, }, }, @@ -3248,8 +3245,8 @@ func TestHandleDelNewsItem(t *testing.T) { }, }, t: NewTransaction( - tranDelNewsItem, nil, - NewField(fieldNewsPath, + TranDelNewsItem, nil, + NewField(FieldNewsPath, []byte{ 0, 1, 0, 0, @@ -3264,11 +3261,11 @@ func TestHandleDelNewsItem(t *testing.T) { clientID: &[]byte{0, 1}, Flags: 0x00, IsReply: 0x01, - Type: []byte{0, 0x00}, + Type: []byte{0, 0}, 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.")), + NewField(FieldError, []byte("You are not allowed to delete news folders.")), }, }, }, @@ -3304,8 +3301,8 @@ func TestHandleDelNewsItem(t *testing.T) { }, }, t: NewTransaction( - tranDelNewsItem, nil, - NewField(fieldNewsPath, + TranDelNewsItem, nil, + NewField(FieldNewsPath, []byte{ 0, 1, 0, 0, @@ -3375,7 +3372,7 @@ func TestHandleDownloadBanner(t *testing.T) { }(), }, }, - t: NewTransaction(tranDownloadBanner, nil), + t: NewTransaction(TranDownloadBanner, nil), }, wantRes: []Transaction{ { @@ -3386,8 +3383,8 @@ func TestHandleDownloadBanner(t *testing.T) { 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}), + NewField(FieldRefNum, []byte{1, 2, 3, 4}), + NewField(FieldTransferSize, []byte{0, 0, 0, 0x64}), }, }, }, @@ -3429,19 +3426,19 @@ func TestHandleTranOldPostNews(t *testing.T) { }, }, t: NewTransaction( - tranOldPostNews, &[]byte{0, 1}, - NewField(fieldData, []byte("hai")), + TranOldPostNews, &[]byte{0, 1}, + NewField(FieldData, []byte("hai")), ), }, wantRes: []Transaction{ { Flags: 0x00, IsReply: 0x01, - Type: []byte{0, 0x00}, + Type: []byte{0, 0}, ID: []byte{0, 0, 0, 0}, ErrorCode: []byte{0, 0, 0, 1}, Fields: []Field{ - NewField(fieldError, []byte("You are not allowed to post news.")), + NewField(FieldError, []byte("You are not allowed to post news.")), }, }, }, @@ -3469,8 +3466,8 @@ func TestHandleTranOldPostNews(t *testing.T) { }, }, t: NewTransaction( - tranOldPostNews, &[]byte{0, 1}, - NewField(fieldData, []byte("hai")), + TranOldPostNews, &[]byte{0, 1}, + NewField(FieldData, []byte("hai")), ), }, wantRes: []Transaction{ @@ -3519,17 +3516,17 @@ func TestHandleInviteNewChat(t *testing.T) { }(), }, }, - t: NewTransaction(tranInviteNewChat, &[]byte{0, 1}), + t: NewTransaction(TranInviteNewChat, &[]byte{0, 1}), }, wantRes: []Transaction{ { Flags: 0x00, IsReply: 0x01, - Type: []byte{0, 0x00}, + Type: []byte{0, 0}, 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.")), + NewField(FieldError, []byte("You are not allowed to request private chat.")), }, }, }, @@ -3562,8 +3559,8 @@ func TestHandleInviteNewChat(t *testing.T) { }, }, t: NewTransaction( - tranInviteNewChat, &[]byte{0, 1}, - NewField(fieldUserID, []byte{0, 2}), + TranInviteNewChat, &[]byte{0, 1}, + NewField(FieldUserID, []byte{0, 2}), ), }, wantRes: []Transaction{ @@ -3575,9 +3572,9 @@ func TestHandleInviteNewChat(t *testing.T) { 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(FieldChatID, []byte{0x52, 0xfd, 0xfc, 0x07}), + NewField(FieldUserName, []byte("UserA")), + NewField(FieldUserID, []byte{0, 1}), }, }, @@ -3589,11 +3586,11 @@ func TestHandleInviteNewChat(t *testing.T) { 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}), + 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}), }, }, }, @@ -3626,8 +3623,8 @@ func TestHandleInviteNewChat(t *testing.T) { }, }, t: NewTransaction( - tranInviteNewChat, &[]byte{0, 1}, - NewField(fieldUserID, []byte{0, 2}), + TranInviteNewChat, &[]byte{0, 1}, + NewField(FieldUserID, []byte{0, 2}), ), }, wantRes: []Transaction{ @@ -3639,10 +3636,10 @@ func TestHandleInviteNewChat(t *testing.T) { 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}), + NewField(FieldData, []byte("UserB does not accept private chats.")), + NewField(FieldUserName, []byte("UserB")), + NewField(FieldUserID, []byte{0, 2}), + NewField(FieldOptions, []byte{0, 2}), }, }, { @@ -3653,11 +3650,11 @@ func TestHandleInviteNewChat(t *testing.T) { 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}), + 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}), }, }, }, @@ -3702,18 +3699,18 @@ func TestHandleGetNewsArtData(t *testing.T) { }, }, t: NewTransaction( - tranGetNewsArtData, &[]byte{0, 1}, + TranGetNewsArtData, &[]byte{0, 1}, ), }, wantRes: []Transaction{ { Flags: 0x00, IsReply: 0x01, - Type: []byte{0, 0x00}, + Type: []byte{0, 0}, ID: []byte{0x9a, 0xcb, 0x04, 0x42}, ErrorCode: []byte{0, 0, 0, 1}, Fields: []Field{ - NewField(fieldError, []byte("You are not allowed to read news.")), + NewField(FieldError, []byte("You are not allowed to read news.")), }, }, }, @@ -3730,3 +3727,226 @@ func TestHandleGetNewsArtData(t *testing.T) { }) } } + +func TestHandleGetNewsArtNameList(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( + TranGetNewsArtNameList, &[]byte{0, 1}, + ), + }, + wantRes: []Transaction{ + { + Flags: 0x00, + IsReply: 0x01, + Type: []byte{0, 0}, + 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 := HandleGetNewsArtNameList(tt.args.cc, tt.args.t) + if !tt.wantErr(t, err, fmt.Sprintf("HandleGetNewsArtNameList(%v, %v)", tt.args.cc, tt.args.t)) { + return + } + tranAssertEqual(t, tt.wantRes, gotRes) + }) + } +} + +func TestHandleNewNewsFldr(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( + TranGetNewsArtNameList, &[]byte{0, 1}, + ), + }, + wantRes: []Transaction{ + { + Flags: 0x00, + IsReply: 0x01, + Type: []byte{0, 0}, + ErrorCode: []byte{0, 0, 0, 1}, + Fields: []Field{ + NewField(FieldError, []byte("You are not allowed to create news folders.")), + }, + }, + }, + wantErr: assert.NoError, + }, + { + name: "with a valid request", + args: args{ + cc: &ClientConn{ + Account: &Account{ + Access: func() accessBitmap { + var bits accessBitmap + bits.Set(accessNewsCreateFldr) + return bits + }(), + }, + logger: NewTestLogger(), + 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) + return mfs + }(), + ThreadedNews: &ThreadedNews{Categories: map[string]NewsCategoryListData15{ + "test": { + Type: []byte{0, 2}, + Count: nil, + NameSize: 0, + Name: "test", + SubCats: make(map[string]NewsCategoryListData15), + }, + }}, + }, + }, + t: NewTransaction( + TranGetNewsArtNameList, &[]byte{0, 1}, + NewField(FieldFileName, []byte("testFolder")), + 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, + }, + //{ + // name: "when there is an error writing the threaded news file", + // args: args{ + // cc: &ClientConn{ + // Account: &Account{ + // Access: func() accessBitmap { + // var bits accessBitmap + // bits.Set(accessNewsCreateFldr) + // return bits + // }(), + // }, + // logger: NewTestLogger(), + // ID: &[]byte{0, 1}, + // Server: &Server{ + // ConfigDir: "/fakeConfigRoot", + // FS: func() *MockFileStore { + // mfs := &MockFileStore{} + // mfs.On("WriteFile", "/fakeConfigRoot/ThreadedNews.yaml", mock.Anything, mock.Anything).Return(os.ErrNotExist) + // return mfs + // }(), + // ThreadedNews: &ThreadedNews{Categories: map[string]NewsCategoryListData15{ + // "test": { + // Type: []byte{0, 2}, + // Count: nil, + // NameSize: 0, + // Name: "test", + // SubCats: make(map[string]NewsCategoryListData15), + // }, + // }}, + // }, + // }, + // t: NewTransaction( + // TranGetNewsArtNameList, &[]byte{0, 1}, + // NewField(FieldFileName, []byte("testFolder")), + // 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}, + // ErrorCode: []byte{0, 0, 0, 1}, + // Fields: []Field{ + // NewField(FieldError, []byte("Error creating news folder.")), + // }, + // }, + // }, + // wantErr: assert.Error, + // }, + } + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + gotRes, err := HandleNewNewsFldr(tt.args.cc, tt.args.t) + if !tt.wantErr(t, err, fmt.Sprintf("HandleNewNewsFldr(%v, %v)", tt.args.cc, tt.args.t)) { + return + } + tranAssertEqual(t, tt.wantRes, gotRes) + }) + } +}