"fmt"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
+ "io"
"io/fs"
"math/rand"
"os"
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")),
},
},
},
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")),
},
},
{
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")),
},
},
},
},
},
},
- t: NewTransaction(tranDeleteUser, nil, NewField(fieldChatID, []byte{0, 0, 0, 1})),
+ t: NewTransaction(TranDeleteUser, nil, NewField(FieldChatID, []byte{0, 0, 0, 1})),
},
want: []Transaction{
{
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}),
},
},
},
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,
},
},
},
clientID: &[]byte{1, 1},
Flags: 0x00,
IsReply: 0x01,
- Type: []byte{0, 1},
+ Type: []byte{0, 0},
ID: []byte{0, 0, 0, 1},
ErrorCode: []byte{0, 0, 0, 0},
Fields: []Field{
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},
),
},
},
t: &Transaction{
Fields: []Field{
- NewField(fieldData, []byte("hai")),
+ NewField(FieldData, []byte("hai")),
},
},
},
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}),
},
},
{
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}),
+ },
+ },
+ },
+ wantErr: false,
+ },
+ {
+ name: "treats Chat ID 00 00 00 00 as a public chat message",
+ args: args{
+ cc: &ClientConn{
+ Account: &Account{
+ Access: func() accessBitmap {
+ var bits accessBitmap
+ bits.Set(accessSendChat)
+ return bits
+ }(),
+ },
+ UserName: []byte{0x00, 0x01},
+ Server: &Server{
+ Clients: map[uint16]*ClientConn{
+ uint16(1): {
+ Account: &Account{
+ Access: accessBitmap{255, 255, 255, 255, 255, 255, 255, 255},
+ },
+ ID: &[]byte{0, 1},
+ },
+ uint16(2): {
+ Account: &Account{
+ Access: accessBitmap{255, 255, 255, 255, 255, 255, 255, 255},
+ },
+ ID: &[]byte{0, 2},
+ },
+ },
+ },
+ },
+ t: &Transaction{
+ Fields: []Field{
+ NewField(FieldData, []byte("hai")),
+ NewField(FieldChatID, []byte{0, 0, 0, 0}),
+ },
+ },
+ },
+ want: []Transaction{
+ {
+ clientID: &[]byte{0, 1},
+ Flags: 0x00,
+ IsReply: 0x00,
+ Type: []byte{0, 0x6a},
+ ID: []byte{0x9a, 0xcb, 0x04, 0x42}, // Random ID from rand.Seed(1)
+ ErrorCode: []byte{0, 0, 0, 0},
+ Fields: []Field{
+ NewField(FieldData, []byte{0x0d, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x01, 0x3a, 0x20, 0x20, 0x68, 0x61, 0x69}),
+ },
+ },
+ {
+ clientID: &[]byte{0, 2},
+ Flags: 0x00,
+ IsReply: 0x00,
+ Type: []byte{0, 0x6a},
+ ID: []byte{0xf0, 0xc5, 0x34, 0x1e}, // Random ID from rand.Seed(1)
+ ErrorCode: []byte{0, 0, 0, 0},
+ Fields: []Field{
+ NewField(FieldData, []byte{0x0d, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x01, 0x3a, 0x20, 0x20, 0x68, 0x61, 0x69}),
},
},
},
},
},
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",
+ name: "sends chat msg as emote if FieldChatOptions is set to 1",
args: args{
cc: &ClientConn{
Account: &Account{
},
t: &Transaction{
Fields: []Field{
- NewField(fieldData, []byte("performed action")),
- NewField(fieldChatOptions, []byte{0x00, 0x01}),
+ NewField(FieldData, []byte("performed action")),
+ NewField(FieldChatOptions, []byte{0x00, 0x01}),
},
},
},
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")),
},
},
{
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",
+ args: args{
+ cc: &ClientConn{
+ Account: &Account{
+ Access: func() accessBitmap {
+ var bits accessBitmap
+ bits.Set(accessSendChat)
+ return bits
+ }(),
+ },
+ UserName: []byte("Testy McTest"),
+ Server: &Server{
+ Clients: map[uint16]*ClientConn{
+ uint16(1): {
+ Account: &Account{
+ Access: accessBitmap{255, 255, 255, 255, 255, 255, 255, 255},
+ },
+ ID: &[]byte{0, 1},
+ },
+ uint16(2): {
+ Account: &Account{
+ Access: accessBitmap{255, 255, 255, 255, 255, 255, 255, 255},
+ },
+ ID: &[]byte{0, 2},
+ },
+ },
+ },
+ },
+ t: &Transaction{
+ Fields: []Field{
+ NewField(FieldData, []byte("hello")),
+ NewField(FieldChatOptions, []byte{0x00, 0x00}),
+ },
+ },
+ },
+ want: []Transaction{
+ {
+ clientID: &[]byte{0, 1},
+ Flags: 0x00,
+ IsReply: 0x00,
+ Type: []byte{0, 0x6a},
+ ID: []byte{0x9a, 0xcb, 0x04, 0x42},
+ ErrorCode: []byte{0, 0, 0, 0},
+ Fields: []Field{
+ NewField(FieldData, []byte("\r Testy McTest: hello")),
+ },
+ },
+ {
+ clientID: &[]byte{0, 2},
+ Flags: 0x00,
+ IsReply: 0x00,
+ Type: []byte{0, 0x6a},
+ ID: []byte{0xf0, 0xc5, 0x34, 0x1e},
+ ErrorCode: []byte{0, 0, 0, 0},
+ Fields: []Field{
+ NewField(FieldData, []byte("\r Testy McTest: hello")),
},
},
},
},
t: &Transaction{
Fields: []Field{
- NewField(fieldData, []byte("hai")),
+ NewField(FieldData, []byte("hai")),
},
},
},
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}),
},
},
},
},
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}),
},
},
},
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}),
},
},
{
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}),
},
},
},
},
},
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{
clientID: &[]byte{0, 1},
Flags: 0x00,
IsReply: 0x01,
- Type: []byte{0, 0xce},
+ Type: []byte{0, 0},
ID: []byte{0x9a, 0xcb, 0x04, 0x42}, // Random ID from rand.Seed(1)
ErrorCode: []byte{0, 0, 0, 0},
Fields: []Field{
- 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}),
},
},
},
// 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)
}
{
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.")),
},
},
},
},
},
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,
clientID: &[]byte{0, 1},
Flags: 0x00,
IsReply: 0x01,
- Type: []byte{0, 0xcd},
+ Type: []byte{0, 0},
ID: []byte{0x9a, 0xcb, 0x04, 0x42}, // Random ID from rand.Seed(1)
ErrorCode: []byte{0, 0, 0, 0},
},
},
},
t: NewTransaction(
- tranNewFolder, &[]byte{0, 1},
- NewField(fieldFileName, []byte("testFolder")),
+ TranNewFolder, &[]byte{0, 1},
+ NewField(FieldFileName, []byte("testFolder")),
),
},
wantRes: []Transaction{
clientID: &[]byte{0, 1},
Flags: 0x00,
IsReply: 0x01,
- Type: []byte{0, 0xcd},
+ Type: []byte{0, 0},
ID: []byte{0x9a, 0xcb, 0x04, 0x42}, // Random ID from rand.Seed(1)
ErrorCode: []byte{0, 0, 0, 0},
},
},
},
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,
}),
),
wantErr: true,
},
{
- name: "fieldFileName does not allow directory traversal",
+ name: "FieldFileName does not allow directory traversal",
args: args{
cc: &ClientConn{
Account: &Account{
},
},
t: NewTransaction(
- tranNewFolder, &[]byte{0, 1},
- NewField(fieldFileName, []byte("../../testFolder")),
+ TranNewFolder, &[]byte{0, 1},
+ NewField(FieldFileName, []byte("../../testFolder")),
),
},
wantRes: []Transaction{
clientID: &[]byte{0, 1},
Flags: 0x00,
IsReply: 0x01,
- Type: []byte{0, 0xcd},
+ Type: []byte{0, 0},
ID: []byte{0x9a, 0xcb, 0x04, 0x42}, // Random ID from rand.Seed(1)
ErrorCode: []byte{0, 0, 0, 0},
},
}, wantErr: false,
},
{
- name: "fieldFilePath does not allow directory traversal",
+ name: "FieldFilePath does not allow directory traversal",
args: args{
cc: &ClientConn{
Account: &Account{
},
},
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,
clientID: &[]byte{0, 1},
Flags: 0x00,
IsReply: 0x01,
- Type: []byte{0, 0xcd},
+ Type: []byte{0, 0},
ID: []byte{0x9a, 0xcb, 0x04, 0x42}, // Random ID from rand.Seed(1)
ErrorCode: []byte{0, 0, 0, 0},
},
}
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)
},
},
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,
{
Flags: 0x00,
IsReply: 0x01,
- Type: []byte{0, 0xcb},
+ Type: []byte{0, 0},
ID: []byte{0x9a, 0xcb, 0x04, 0x42},
ErrorCode: []byte{0, 0, 0, 0},
Fields: []Field{
- NewField(fieldRefNum, []byte{0x52, 0xfd, 0xfc, 0x07}), // rand.Seed(1)
+ NewField(FieldRefNum, []byte{0x52, 0xfd, 0xfc, 0x07}), // rand.Seed(1)
},
},
},
},
},
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,
{
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)
},
},
},
}
tranAssertEqual(t, tt.wantRes, gotRes)
-
})
}
}
},
},
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, 0xd1},
+ Type: []byte{0, 0},
ID: []byte{0x9a, 0xcb, 0x04, 0x42},
ErrorCode: []byte{0, 0, 0, 0},
Fields: []Field(nil),
},
},
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")),
},
},
},
},
},
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,
{
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.")),
},
},
},
},
},
t: NewTransaction(
- tranGetUser, &[]byte{0, 1},
- NewField(fieldUserLogin, []byte("guest")),
+ TranGetUser, &[]byte{0, 1},
+ NewField(FieldUserLogin, []byte("guest")),
),
},
wantRes: []Transaction{
{
Flags: 0x00,
IsReply: 0x01,
- Type: []byte{0x01, 0x60},
+ Type: []byte{0, 0},
ID: []byte{0x9a, 0xcb, 0x04, 0x42},
ErrorCode: []byte{0, 0, 0, 0},
Fields: []Field{
- NewField(fieldUserName, []byte("Guest")),
- NewField(fieldUserLogin, negateString([]byte("guest"))),
- NewField(fieldUserPassword, []byte("password")),
- NewField(fieldUserAccess, []byte{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}),
},
},
},
},
},
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.")),
},
},
},
},
},
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.")),
},
},
},
},
},
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{0x1, 0x5f},
+ Type: []byte{0, 0},
ID: []byte{0x9a, 0xcb, 0x04, 0x42},
ErrorCode: []byte{0, 0, 0, 0},
Fields: []Field(nil),
},
},
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.")),
},
},
},
},
},
t: NewTransaction(
- tranGetMsgs, &[]byte{0, 1},
+ TranGetMsgs, &[]byte{0, 1},
),
},
wantRes: []Transaction{
{
Flags: 0x00,
IsReply: 0x01,
- Type: []byte{0, 0x65},
+ Type: []byte{0, 0},
ID: []byte{0x9a, 0xcb, 0x04, 0x42},
ErrorCode: []byte{0, 0, 0, 0},
Fields: []Field{
- NewField(fieldData, []byte("TEST")),
+ NewField(FieldData, []byte("TEST")),
},
},
},
},
},
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.")),
},
},
},
},
},
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.")),
},
},
},
},
},
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)
{
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.")),
},
},
},
},
},
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.")),
},
},
},
},
},
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{0x01, 0x2f},
+ Type: []byte{0, 0},
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,
},
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.")),
},
},
},
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{
{
Flags: 0x00,
IsReply: 0x01,
- Type: []byte{0, 0x2},
+ Type: []byte{0, 0},
ID: []byte{0x9a, 0xcb, 0x04, 0x42},
ErrorCode: []byte{0, 0, 0, 0},
Fields: []Field{
- 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}),
},
},
},
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{},
{
Flags: 0x00,
IsReply: 0x01,
- Type: []byte{0, 0x2},
+ Type: []byte{0, 0},
ID: []byte{0x9a, 0xcb, 0x04, 0x42},
ErrorCode: []byte{0, 0, 0, 0},
Fields: []Field{
- 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}),
},
},
},
},
},
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,
}),
{
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.")),
},
},
},
},
},
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,
}),
{
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.")),
},
},
},
},
},
t: NewTransaction(
- tranUpdateUser,
+ TranUpdateUser,
&[]byte{0, 0},
- NewField(fieldData, []byte{
+ NewField(FieldData, []byte{
0x00, 0x01,
0x00, 0x65,
0x00, 0x03,
{
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.")),
},
},
},
},
},
t: NewTransaction(
- tranDelNewsArt,
+ TranDelNewsArt,
&[]byte{0, 0},
),
},
{
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.")),
},
},
},
},
},
t: NewTransaction(
- tranDelNewsArt,
+ TranDelNewsArt,
&[]byte{0, 0},
),
},
{
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.")),
},
},
},
},
},
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.")),
},
},
},
},
},
t: NewTransaction(
- tranDelNewsArt,
+ TranDelNewsArt,
&[]byte{0, 0},
),
},
{
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",
},
},
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},
Flags: 0x00,
IsReply: 0x01,
- Type: []byte{0x0, 0x6c},
+ Type: []byte{0, 0},
ID: []byte{0, 0, 0, 0},
ErrorCode: []byte{0, 0, 0, 0},
Fields: []Field(nil),
},
},
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},
Flags: 0x00,
IsReply: 0x01,
- Type: []byte{0x0, 0x6c},
+ Type: []byte{0, 0},
ID: []byte{0, 0, 0, 0},
ErrorCode: []byte{0, 0, 0, 0},
Fields: []Field(nil),
},
},
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},
Flags: 0x00,
IsReply: 0x01,
- Type: []byte{0x0, 0x6c},
+ Type: []byte{0, 0},
ID: []byte{0, 0, 0, 0},
ErrorCode: []byte{0, 0, 0, 0},
Fields: []Field(nil),
},
},
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,
{
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.")),
},
},
},
},
},
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,
{
Flags: 0x00,
IsReply: 0x01,
- Type: []byte{0x0, 0xcc},
+ Type: []byte{0, 0},
ID: []byte{0x0, 0x0, 0x0, 0x0},
ErrorCode: []byte{0, 0, 0, 0},
Fields: []Field(nil),
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{
},
},
t: NewTransaction(
- tranGetFileNameList, &[]byte{0, 1},
- NewField(fieldFilePath, []byte{
+ TranGetFileNameList, &[]byte{0, 1},
+ NewField(FieldFilePath, []byte{
0x00, 0x01,
0x00, 0x00,
0x08,
{
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.")),
},
},
},
},
},
t: NewTransaction(
- tranGetFileNameList, &[]byte{0, 1},
- NewField(fieldFilePath, []byte{
+ TranGetFileNameList, &[]byte{0, 1},
+ NewField(FieldFilePath, []byte{
0x00, 0x00,
0x00, 0x00,
}),
{
Flags: 0x00,
IsReply: 0x01,
- Type: []byte{0, 0xc8},
+ Type: []byte{0, 0},
ID: []byte{0, 0, 0, 0},
ErrorCode: []byte{0, 0, 0, 0},
Fields: []Field{
NewField(
- fieldFileNameWithInfo,
+ FieldFileNameWithInfo,
func() []byte {
fnwi := FileNameWithInfo{
fileNameWithInfoHeader: fileNameWithInfoHeader{
},
name: []byte("testfile-1k"),
}
- b, _ := fnwi.MarshalBinary()
+ b, _ := io.ReadAll(&fnwi)
return b
}(),
),
},
},
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.")),
},
},
},
},
},
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{0x1, 0x2f},
+ Type: []byte{0, 0},
ID: []byte{0, 0, 0, 0},
ErrorCode: []byte{0, 0, 0, 0},
Fields: []Field{
- NewField(fieldData, []byte(
- strings.Replace(`Nickname: Testy McTest
+ NewField(FieldData, []byte(
+ strings.ReplaceAll(`Nickname: Testy McTest
Name: test
Account: test
Address: 1.2.3.4:12345
None.
-`, "\n", "\r", -1)),
+`, "\n", "\r")),
),
- NewField(fieldUserName, []byte("Testy McTest")),
+ NewField(FieldUserName, []byte("Testy McTest")),
},
},
},
},
},
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{
ID: []byte{0, 0, 0, 0},
ErrorCode: []byte{0, 0, 0, 0},
Fields: []Field{
- NewField(fieldBannerType, []byte("JPEG")),
+ NewField(FieldBannerType, []byte("JPEG")),
},
},
{
clientID: &[]byte{0, 1},
Flags: 0x00,
IsReply: 0x01,
- Type: []byte{0, 0x79},
+ Type: []byte{0, 0},
ID: []byte{0, 0, 0, 0},
ErrorCode: []byte{0, 0, 0, 0},
Fields: []Field{},
},
},
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{
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,
Server: &Server{
ThreadedNews: &ThreadedNews{Categories: map[string]NewsCategoryListData15{
"test": {
- Type: []byte{0, 3},
+ Type: [2]byte{0, 3},
Count: nil,
NameSize: 0,
Name: "zz",
},
},
t: NewTransaction(
- tranDelNewsItem, nil,
- NewField(fieldNewsPath,
+ TranDelNewsItem, nil,
+ NewField(FieldNewsPath,
[]byte{
0, 1,
0, 0,
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.")),
},
},
},
Server: &Server{
ThreadedNews: &ThreadedNews{Categories: map[string]NewsCategoryListData15{
"testcat": {
- Type: []byte{0, 2},
+ Type: [2]byte{0, 2},
Count: nil,
NameSize: 0,
Name: "test",
},
},
t: NewTransaction(
- tranDelNewsItem, nil,
- NewField(fieldNewsPath,
+ TranDelNewsItem, nil,
+ NewField(FieldNewsPath,
[]byte{
0, 1,
0, 0,
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.")),
},
},
},
}(),
ThreadedNews: &ThreadedNews{Categories: map[string]NewsCategoryListData15{
"testcat": {
- Type: []byte{0, 2},
+ Type: [2]byte{0, 2},
Count: nil,
NameSize: 0,
Name: "test",
},
},
t: NewTransaction(
- tranDelNewsItem, nil,
- NewField(fieldNewsPath,
+ TranDelNewsItem, nil,
+ NewField(FieldNewsPath,
[]byte{
0, 1,
0, 0,
clientID: &[]byte{0, 1},
Flags: 0x00,
IsReply: 0x01,
- Type: []byte{0x01, 0x7c},
+ Type: []byte{0, 0},
ID: []byte{0, 0, 0, 0},
ErrorCode: []byte{0, 0, 0, 0},
Fields: []Field{},
}
}
-func TestHandleDownloadBanner(t *testing.T) {
- type args struct {
- cc *ClientConn
- t *Transaction
- }
- tests := []struct {
- name string
- args args
- wantRes []Transaction
- wantErr assert.ErrorAssertionFunc
- }{
- {
- name: "returns expected response",
- args: args{
- cc: &ClientConn{
- ID: &[]byte{0, 1},
- transfers: map[int]map[[4]byte]*FileTransfer{
- bannerDownload: {},
- },
- Server: &Server{
- ConfigDir: "/config",
- Config: &Config{
- BannerFile: "banner.jpg",
- },
- fileTransfers: map[[4]byte]*FileTransfer{},
- FS: func() *MockFileStore {
- mfi := &MockFileInfo{}
- mfi.On("Size").Return(int64(100))
-
- mfs := &MockFileStore{}
- mfs.On("Stat", "/config/banner.jpg").Return(mfi, nil)
- return mfs
- }(),
- },
- },
- t: NewTransaction(tranDownloadBanner, nil),
- },
- wantRes: []Transaction{
- {
- clientID: &[]byte{0, 1},
- Flags: 0x00,
- IsReply: 0x01,
- Type: []byte{0x00, 0xd4},
- ID: []byte{0, 0, 0, 0},
- ErrorCode: []byte{0, 0, 0, 0},
- Fields: []Field{
- NewField(fieldRefNum, []byte{1, 2, 3, 4}),
- NewField(fieldTransferSize, []byte{0, 0, 0, 0x64}),
- },
- },
- },
- wantErr: assert.NoError,
- },
- }
- for _, tt := range tests {
- t.Run(tt.name, func(t *testing.T) {
- gotRes, err := HandleDownloadBanner(tt.args.cc, tt.args.t)
- if !tt.wantErr(t, err, fmt.Sprintf("HandleDownloadBanner(%v, %v)", tt.args.cc, tt.args.t)) {
- return
- }
-
- tranAssertEqual(t, tt.wantRes, gotRes)
- })
- }
-}
-
func TestHandleTranOldPostNews(t *testing.T) {
type args struct {
cc *ClientConn
},
},
t: 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.")),
},
},
},
},
},
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, 0x67},
+ Type: []byte{0, 0},
ID: []byte{0, 0, 0, 0},
ErrorCode: []byte{0, 0, 0, 0},
},
}(),
},
},
- 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.")),
},
},
},
},
},
t: NewTransaction(
- tranInviteNewChat, &[]byte{0, 1},
- NewField(fieldUserID, []byte{0, 2}),
+ TranInviteNewChat, &[]byte{0, 1},
+ NewField(FieldUserID, []byte{0, 2}),
),
},
wantRes: []Transaction{
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}),
},
},
clientID: &[]byte{0, 1},
Flags: 0x00,
IsReply: 0x01,
- Type: []byte{0, 0x70},
+ Type: []byte{0, 0},
ID: []byte{0, 0, 0, 0},
ErrorCode: []byte{0, 0, 0, 0},
Fields: []Field{
- NewField(fieldChatID, []byte{0x52, 0xfd, 0xfc, 0x07}),
- NewField(fieldUserName, []byte("UserA")),
- NewField(fieldUserID, []byte{0, 1}),
- NewField(fieldUserIconID, []byte{0, 1}),
- NewField(fieldUserFlags, []byte{0, 0}),
+ 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}),
},
},
},
},
},
t: NewTransaction(
- tranInviteNewChat, &[]byte{0, 1},
- NewField(fieldUserID, []byte{0, 2}),
+ TranInviteNewChat, &[]byte{0, 1},
+ NewField(FieldUserID, []byte{0, 2}),
),
},
wantRes: []Transaction{
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}),
},
},
{
clientID: &[]byte{0, 1},
Flags: 0x00,
IsReply: 0x01,
- Type: []byte{0, 0x70},
+ Type: []byte{0, 0},
ID: []byte{0, 0, 0, 0},
ErrorCode: []byte{0, 0, 0, 0},
Fields: []Field{
- NewField(fieldChatID, []byte{0x52, 0xfd, 0xfc, 0x07}),
- NewField(fieldUserName, []byte("UserA")),
- NewField(fieldUserID, []byte{0, 1}),
- NewField(fieldUserIconID, []byte{0, 1}),
- NewField(fieldUserFlags, []byte{0, 0}),
+ 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}),
},
},
},
})
}
}
+
+func TestHandleGetNewsArtData(t *testing.T) {
+ type args struct {
+ cc *ClientConn
+ t *Transaction
+ }
+ tests := []struct {
+ name string
+ args args
+ wantRes []Transaction
+ wantErr assert.ErrorAssertionFunc
+ }{
+ {
+ name: "when user does not have required permission",
+ args: args{
+ cc: &ClientConn{
+ Account: &Account{
+ Access: func() accessBitmap {
+ var bits accessBitmap
+ return bits
+ }(),
+ },
+ Server: &Server{
+ Accounts: map[string]*Account{},
+ },
+ },
+ t: NewTransaction(
+ TranGetNewsArtData, &[]byte{0, 1},
+ ),
+ },
+ wantRes: []Transaction{
+ {
+ Flags: 0x00,
+ IsReply: 0x01,
+ Type: []byte{0, 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.")),
+ },
+ },
+ },
+ wantErr: assert.NoError,
+ },
+ }
+ for _, tt := range tests {
+ t.Run(tt.name, func(t *testing.T) {
+ gotRes, err := HandleGetNewsArtData(tt.args.cc, tt.args.t)
+ if !tt.wantErr(t, err, fmt.Sprintf("HandleGetNewsArtData(%v, %v)", tt.args.cc, tt.args.t)) {
+ return
+ }
+ tranAssertEqual(t, tt.wantRes, gotRes)
+ })
+ }
+}
+
+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: [2]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)
+ })
+ }
+}
git.r.bdr.sh / rbdr / mobius / blobdiff