X-Git-Url: https://git.r.bdr.sh/rbdr/mobius/blobdiff_plain/72dd37f1abb2b550aaaac48eac677403d5664797..c697d13aac49ede1258762b4cf41d9bdcabb4b27:/hotline/transaction_handlers_test.go diff --git a/hotline/transaction_handlers_test.go b/hotline/transaction_handlers_test.go index e62cce2..7c5ee43 100644 --- a/hotline/transaction_handlers_test.go +++ b/hotline/transaction_handlers_test.go @@ -2,8 +2,9 @@ package hotline import ( "github.com/stretchr/testify/assert" + "io/fs" "math/rand" - "reflect" + "os" "testing" ) @@ -225,6 +226,21 @@ func TestHandleGetUserNameList(t *testing.T) { 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}, + UserName: []byte{0, 4}, + Agreed: true, + }, + uint16(3): { + ID: &[]byte{0, 3}, + Icon: &[]byte{0, 2}, + Flags: &[]byte{0, 3}, + UserName: []byte{0, 4}, + Agreed: false, }, }, }, @@ -247,6 +263,10 @@ func TestHandleGetUserNameList(t *testing.T) { fieldUsernameWithInfo, []byte{00, 01, 00, 02, 00, 03, 00, 02, 00, 04}, ), + NewField( + fieldUsernameWithInfo, + []byte{00, 02, 00, 02, 00, 03, 00, 02, 00, 04}, + ), }, }, }, @@ -260,9 +280,7 @@ func TestHandleGetUserNameList(t *testing.T) { t.Errorf("HandleGetUserNameList() error = %v, wantErr %v", err, tt.wantErr) return } - if !reflect.DeepEqual(got, tt.want) { - t.Errorf("HandleGetUserNameList() got = %v, want %v", got, tt.want) - } + assert.Equal(t, tt.want, got) }) } } @@ -467,7 +485,10 @@ func TestHandleGetFileInfo(t *testing.T) { ID: &[]byte{0x00, 0x01}, Server: &Server{ Config: &Config{ - FileRoot: "./test/config/Files/", + FileRoot: func() string { + path, _ := os.Getwd() + return path + "/test/config/Files" + }(), }, }, }, @@ -475,19 +496,6 @@ func TestHandleGetFileInfo(t *testing.T) { tranGetFileInfo, nil, NewField(fieldFileName, []byte("testfile.txt")), NewField(fieldFilePath, []byte{0x00, 0x00}), - //NewField(fieldFilePath, []byte{ - // 0x00, 0x03, - // 0x00, 0x00, - // 0x04, - // 0x74, 0x65, 0x73, 0x74, - // 0x00, 0x00, - // 0x06, - // 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, - // - // 0x00, 0x00, - // 0x05, - // 0x46, 0x69, 0x6c, 0x65, 73}, - //), ), }, wantRes: []Transaction{ @@ -501,11 +509,11 @@ func TestHandleGetFileInfo(t *testing.T) { Fields: []Field{ NewField(fieldFileName, []byte("testfile.txt")), NewField(fieldFileTypeString, []byte("TEXT")), - NewField(fieldFileCreatorString, []byte("TTXT")), - NewField(fieldFileComment, []byte("TODO")), + NewField(fieldFileCreatorString, []byte("ttxt")), + NewField(fieldFileComment, []byte{}), NewField(fieldFileType, []byte("TEXT")), - NewField(fieldFileCreateDate, []byte{0x07, 0x70, 0x00, 0x00, 0xba, 0x74, 0x24, 0x73}), - NewField(fieldFileModifyDate, []byte{0x07, 0x70, 0x00, 0x00, 0xba, 0x74, 0x24, 0x73}), + NewField(fieldFileCreateDate, make([]byte, 8)), + NewField(fieldFileModifyDate, make([]byte, 8)), NewField(fieldFileSize, []byte{0x0, 0x0, 0x0, 0x17}), }, }, @@ -522,9 +530,328 @@ func TestHandleGetFileInfo(t *testing.T) { t.Errorf("HandleGetFileInfo() error = %v, wantErr %v", err, tt.wantErr) return } - if !assert.Equal(t, tt.wantRes, gotRes) { + + // Clear the file 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[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) } }) } } + +func TestHandleNewFolder(t *testing.T) { + type args struct { + cc *ClientConn + t *Transaction + } + tests := []struct { + setup func() + name string + args args + wantRes []Transaction + wantErr bool + }{ + { + name: "when path is nested", + args: args{ + cc: &ClientConn{ + ID: &[]byte{0, 1}, + Server: &Server{ + Config: &Config{ + FileRoot: "/Files/", + }, + }, + }, + t: NewTransaction( + tranNewFolder, &[]byte{0, 1}, + NewField(fieldFileName, []byte("testFolder")), + NewField(fieldFilePath, []byte{ + 0x00, 0x01, + 0x00, 0x00, + 0x03, + 0x61, 0x61, 0x61, + }), + ), + }, + setup: func() { + mfs := MockFileStore{} + mfs.On("Mkdir", "/Files/aaa/testFolder", fs.FileMode(0777)).Return(nil) + mfs.On("Stat", "/Files/aaa/testFolder").Return(nil, os.ErrNotExist) + FS = mfs + }, + wantRes: []Transaction{ + { + clientID: &[]byte{0, 1}, + Flags: 0x00, + IsReply: 0x01, + Type: []byte{0, 0xcd}, + ID: []byte{0x9a, 0xcb, 0x04, 0x42}, // Random ID from rand.Seed(1) + ErrorCode: []byte{0, 0, 0, 0}, + }, + }, + wantErr: false, + }, + { + name: "when path is not nested", + args: args{ + cc: &ClientConn{ + ID: &[]byte{0, 1}, + Server: &Server{ + Config: &Config{ + FileRoot: "/Files", + }, + }, + }, + t: NewTransaction( + tranNewFolder, &[]byte{0, 1}, + NewField(fieldFileName, []byte("testFolder")), + ), + }, + setup: func() { + mfs := MockFileStore{} + mfs.On("Mkdir", "/Files/testFolder", fs.FileMode(0777)).Return(nil) + mfs.On("Stat", "/Files/testFolder").Return(nil, os.ErrNotExist) + FS = mfs + }, + wantRes: []Transaction{ + { + clientID: &[]byte{0, 1}, + Flags: 0x00, + IsReply: 0x01, + Type: []byte{0, 0xcd}, + ID: []byte{0x9a, 0xcb, 0x04, 0x42}, // Random ID from rand.Seed(1) + ErrorCode: []byte{0, 0, 0, 0}, + }, + }, + wantErr: false, + }, + { + name: "when UnmarshalBinary returns an err", + args: args{ + cc: &ClientConn{ + ID: &[]byte{0, 1}, + Server: &Server{ + Config: &Config{ + FileRoot: "/Files/", + }, + }, + }, + t: NewTransaction( + tranNewFolder, &[]byte{0, 1}, + NewField(fieldFileName, []byte("testFolder")), + NewField(fieldFilePath, []byte{ + 0x00, + }), + ), + }, + setup: func() { + mfs := MockFileStore{} + mfs.On("Mkdir", "/Files/aaa/testFolder", fs.FileMode(0777)).Return(nil) + mfs.On("Stat", "/Files/aaa/testFolder").Return(nil, os.ErrNotExist) + FS = mfs + }, + wantRes: []Transaction{}, + wantErr: true, + }, + { + name: "fieldFileName does not allow directory traversal", + args: args{ + cc: &ClientConn{ + ID: &[]byte{0, 1}, + Server: &Server{ + Config: &Config{ + FileRoot: "/Files/", + }, + }, + }, + t: NewTransaction( + tranNewFolder, &[]byte{0, 1}, + NewField(fieldFileName, []byte("../../testFolder")), + ), + }, + setup: func() { + mfs := MockFileStore{} + mfs.On("Mkdir", "/Files/testFolder", fs.FileMode(0777)).Return(nil) + mfs.On("Stat", "/Files/testFolder").Return(nil, os.ErrNotExist) + FS = mfs + }, + wantRes: []Transaction{ + { + clientID: &[]byte{0, 1}, + Flags: 0x00, + IsReply: 0x01, + Type: []byte{0, 0xcd}, + ID: []byte{0x9a, 0xcb, 0x04, 0x42}, // Random ID from rand.Seed(1) + ErrorCode: []byte{0, 0, 0, 0}, + }, + }, wantErr: false, + }, + { + name: "fieldFilePath does not allow directory traversal", + args: args{ + cc: &ClientConn{ + ID: &[]byte{0, 1}, + Server: &Server{ + Config: &Config{ + FileRoot: "/Files/", + }, + }, + }, + t: NewTransaction( + tranNewFolder, &[]byte{0, 1}, + NewField(fieldFileName, []byte("testFolder")), + NewField(fieldFilePath, []byte{ + 0x00, 0x02, + 0x00, 0x00, + 0x03, + 0x2e, 0x2e, 0x2f, + 0x00, 0x00, + 0x03, + 0x66, 0x6f, 0x6f, + }), + ), + }, + setup: func() { + mfs := MockFileStore{} + mfs.On("Mkdir", "/Files/foo/testFolder", fs.FileMode(0777)).Return(nil) + mfs.On("Stat", "/Files/foo/testFolder").Return(nil, os.ErrNotExist) + FS = mfs + }, + wantRes: []Transaction{ + { + clientID: &[]byte{0, 1}, + Flags: 0x00, + IsReply: 0x01, + Type: []byte{0, 0xcd}, + ID: []byte{0x9a, 0xcb, 0x04, 0x42}, // Random ID from rand.Seed(1) + ErrorCode: []byte{0, 0, 0, 0}, + }, + }, wantErr: false, + }, + } + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + tt.setup() + + gotRes, err := HandleNewFolder(tt.args.cc, tt.args.t) + if (err != nil) != tt.wantErr { + t.Errorf("HandleNewFolder() error = %v, wantErr %v", err, tt.wantErr) + return + } + if !tranAssertEqual(t, tt.wantRes, gotRes) { + t.Errorf("HandleNewFolder() gotRes = %v, want %v", gotRes, tt.wantRes) + } + }) + } +} + +func TestHandleUploadFile(t *testing.T) { + type args struct { + cc *ClientConn + t *Transaction + } + tests := []struct { + name string + args args + wantRes []Transaction + wantErr bool + }{ + { + name: "when request is valid", + args: args{ + cc: &ClientConn{ + Server: &Server{ + FileTransfers: map[uint32]*FileTransfer{}, + }, + Account: &Account{ + Access: func() *[]byte { + var bits accessBitmap + bits.Set(accessUploadFile) + access := bits[:] + return &access + }(), + }, + }, + t: NewTransaction( + tranUploadFile, &[]byte{0, 1}, + NewField(fieldFileName, []byte("testFile")), + NewField(fieldFilePath, []byte{ + 0x00, 0x01, + 0x00, 0x00, + 0x03, + 0x2e, 0x2e, 0x2f, + }), + ), + }, + wantRes: []Transaction{ + { + Flags: 0x00, + IsReply: 0x01, + Type: []byte{0, 0xcb}, + ID: []byte{0x9a, 0xcb, 0x04, 0x42}, + ErrorCode: []byte{0, 0, 0, 0}, + Fields: []Field{ + NewField(fieldRefNum, []byte{0x52, 0xfd, 0xfc, 0x07}), // rand.Seed(1) + }, + }, + }, + wantErr: false, + }, + { + name: "when user does not have required access", + args: args{ + cc: &ClientConn{ + Account: &Account{ + Access: func() *[]byte { + var bits accessBitmap + access := bits[:] + return &access + }(), + }, + Server: &Server{ + FileTransfers: map[uint32]*FileTransfer{}, + }, + }, + t: NewTransaction( + tranUploadFile, &[]byte{0, 1}, + NewField(fieldFileName, []byte("testFile")), + NewField(fieldFilePath, []byte{ + 0x00, 0x01, + 0x00, 0x00, + 0x03, + 0x2e, 0x2e, 0x2f, + }), + ), + }, + 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 upload files.")), // rand.Seed(1) + }, + }, + }, + wantErr: false, + }, + } + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + rand.Seed(1) + gotRes, err := HandleUploadFile(tt.args.cc, tt.args.t) + if (err != nil) != tt.wantErr { + t.Errorf("HandleUploadFile() error = %v, wantErr %v", err, tt.wantErr) + return + } + if !tranAssertEqual(t, tt.wantRes, gotRes) { + t.Errorf("HandleUploadFile() gotRes = %v, want %v", gotRes, tt.wantRes) + } + }) + } +}