X-Git-Url: https://git.r.bdr.sh/rbdr/mobius/blobdiff_plain/38f710ec30445df4a4d34ce0d3193e4ed4aa79c9..5853654f0a618dc89f893992a7f0d211456483f8:/hotline/transaction_handlers_test.go?ds=sidebyside

diff --git a/hotline/transaction_handlers_test.go b/hotline/transaction_handlers_test.go
index fd66fea..69dedf9 100644
--- a/hotline/transaction_handlers_test.go
+++ b/hotline/transaction_handlers_test.go
@@ -232,21 +232,18 @@ 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,
 							},
 						},
 					},
@@ -261,7 +258,7 @@ func TestHandleGetUserNameList(t *testing.T) {
 					clientID:  &[]byte{1, 1},
 					Flags:     0x00,
 					IsReply:   0x01,
-					Type:      []byte{0, 1},
+					Type:      []byte{0, 0},
 					ID:        []byte{0, 0, 0, 1},
 					ErrorCode: []byte{0, 0, 0, 0},
 					Fields: []Field{
@@ -363,6 +360,68 @@ func TestHandleChatSend(t *testing.T) {
 			},
 			wantErr: false,
 		},
+		{
+			name: "treats Chat ID 00 00 00 00 as a public chat message",
+			args: args{
+				cc: &ClientConn{
+					Account: &Account{
+						Access: func() accessBitmap {
+							var bits accessBitmap
+							bits.Set(accessSendChat)
+							return bits
+						}(),
+					},
+					UserName: []byte{0x00, 0x01},
+					Server: &Server{
+						Clients: map[uint16]*ClientConn{
+							uint16(1): {
+								Account: &Account{
+									Access: accessBitmap{255, 255, 255, 255, 255, 255, 255, 255},
+								},
+								ID: &[]byte{0, 1},
+							},
+							uint16(2): {
+								Account: &Account{
+									Access: accessBitmap{255, 255, 255, 255, 255, 255, 255, 255},
+								},
+								ID: &[]byte{0, 2},
+							},
+						},
+					},
+				},
+				t: &Transaction{
+					Fields: []Field{
+						NewField(fieldData, []byte("hai")),
+						NewField(fieldChatID, []byte{0, 0, 0, 0}),
+					},
+				},
+			},
+			want: []Transaction{
+				{
+					clientID:  &[]byte{0, 1},
+					Flags:     0x00,
+					IsReply:   0x00,
+					Type:      []byte{0, 0x6a},
+					ID:        []byte{0x9a, 0xcb, 0x04, 0x42}, // Random ID from rand.Seed(1)
+					ErrorCode: []byte{0, 0, 0, 0},
+					Fields: []Field{
+						NewField(fieldData, []byte{0x0d, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x01, 0x3a, 0x20, 0x20, 0x68, 0x61, 0x69}),
+					},
+				},
+				{
+					clientID:  &[]byte{0, 2},
+					Flags:     0x00,
+					IsReply:   0x00,
+					Type:      []byte{0, 0x6a},
+					ID:        []byte{0xf0, 0xc5, 0x34, 0x1e}, // Random ID from rand.Seed(1)
+					ErrorCode: []byte{0, 0, 0, 0},
+					Fields: []Field{
+						NewField(fieldData, []byte{0x0d, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x01, 0x3a, 0x20, 0x20, 0x68, 0x61, 0x69}),
+					},
+				},
+			},
+			wantErr: false,
+		},
 		{
 			name: "when user does not have required permission",
 			args: args{
@@ -397,7 +456,7 @@ func TestHandleChatSend(t *testing.T) {
 			wantErr: false,
 		},
 		{
-			name: "sends chat msg as emote if fieldChatOptions is set",
+			name: "sends chat msg as emote if fieldChatOptions is set to 1",
 			args: args{
 				cc: &ClientConn{
 					Account: &Account{
@@ -458,6 +517,68 @@ func TestHandleChatSend(t *testing.T) {
 			},
 			wantErr: false,
 		},
+		{
+			name: "does not send chat msg as emote if fieldChatOptions is set to 0",
+			args: args{
+				cc: &ClientConn{
+					Account: &Account{
+						Access: func() accessBitmap {
+							var bits accessBitmap
+							bits.Set(accessSendChat)
+							return bits
+						}(),
+					},
+					UserName: []byte("Testy McTest"),
+					Server: &Server{
+						Clients: map[uint16]*ClientConn{
+							uint16(1): {
+								Account: &Account{
+									Access: accessBitmap{255, 255, 255, 255, 255, 255, 255, 255},
+								},
+								ID: &[]byte{0, 1},
+							},
+							uint16(2): {
+								Account: &Account{
+									Access: accessBitmap{255, 255, 255, 255, 255, 255, 255, 255},
+								},
+								ID: &[]byte{0, 2},
+							},
+						},
+					},
+				},
+				t: &Transaction{
+					Fields: []Field{
+						NewField(fieldData, []byte("hello")),
+						NewField(fieldChatOptions, []byte{0x00, 0x00}),
+					},
+				},
+			},
+			want: []Transaction{
+				{
+					clientID:  &[]byte{0, 1},
+					Flags:     0x00,
+					IsReply:   0x00,
+					Type:      []byte{0, 0x6a},
+					ID:        []byte{0x9a, 0xcb, 0x04, 0x42},
+					ErrorCode: []byte{0, 0, 0, 0},
+					Fields: []Field{
+						NewField(fieldData, []byte("\r Testy McTest:  hello")),
+					},
+				},
+				{
+					clientID:  &[]byte{0, 2},
+					Flags:     0x00,
+					IsReply:   0x00,
+					Type:      []byte{0, 0x6a},
+					ID:        []byte{0xf0, 0xc5, 0x34, 0x1e},
+					ErrorCode: []byte{0, 0, 0, 0},
+					Fields: []Field{
+						NewField(fieldData, []byte("\r Testy McTest:  hello")),
+					},
+				},
+			},
+			wantErr: false,
+		},
 		{
 			name: "only sends chat msg to clients with accessReadChat permission",
 			args: args{
@@ -646,7 +767,7 @@ func TestHandleGetFileInfo(t *testing.T) {
 					clientID:  &[]byte{0, 1},
 					Flags:     0x00,
 					IsReply:   0x01,
-					Type:      []byte{0, 0xce},
+					Type:      []byte{0, 0},
 					ID:        []byte{0x9a, 0xcb, 0x04, 0x42}, // Random ID from rand.Seed(1)
 					ErrorCode: []byte{0, 0, 0, 0},
 					Fields: []Field{
@@ -766,7 +887,7 @@ func TestHandleNewFolder(t *testing.T) {
 					clientID:  &[]byte{0, 1},
 					Flags:     0x00,
 					IsReply:   0x01,
-					Type:      []byte{0, 0xcd},
+					Type:      []byte{0, 0},
 					ID:        []byte{0x9a, 0xcb, 0x04, 0x42}, // Random ID from rand.Seed(1)
 					ErrorCode: []byte{0, 0, 0, 0},
 				},
@@ -807,7 +928,7 @@ func TestHandleNewFolder(t *testing.T) {
 					clientID:  &[]byte{0, 1},
 					Flags:     0x00,
 					IsReply:   0x01,
-					Type:      []byte{0, 0xcd},
+					Type:      []byte{0, 0},
 					ID:        []byte{0x9a, 0xcb, 0x04, 0x42}, // Random ID from rand.Seed(1)
 					ErrorCode: []byte{0, 0, 0, 0},
 				},
@@ -883,7 +1004,7 @@ func TestHandleNewFolder(t *testing.T) {
 					clientID:  &[]byte{0, 1},
 					Flags:     0x00,
 					IsReply:   0x01,
-					Type:      []byte{0, 0xcd},
+					Type:      []byte{0, 0},
 					ID:        []byte{0x9a, 0xcb, 0x04, 0x42}, // Random ID from rand.Seed(1)
 					ErrorCode: []byte{0, 0, 0, 0},
 				},
@@ -932,7 +1053,7 @@ func TestHandleNewFolder(t *testing.T) {
 					clientID:  &[]byte{0, 1},
 					Flags:     0x00,
 					IsReply:   0x01,
-					Type:      []byte{0, 0xcd},
+					Type:      []byte{0, 0},
 					ID:        []byte{0x9a, 0xcb, 0x04, 0x42}, // Random ID from rand.Seed(1)
 					ErrorCode: []byte{0, 0, 0, 0},
 				},
@@ -1003,7 +1124,7 @@ func TestHandleUploadFile(t *testing.T) {
 				{
 					Flags:     0x00,
 					IsReply:   0x01,
-					Type:      []byte{0, 0xcb},
+					Type:      []byte{0, 0},
 					ID:        []byte{0x9a, 0xcb, 0x04, 0x42},
 					ErrorCode: []byte{0, 0, 0, 0},
 					Fields: []Field{
@@ -1119,7 +1240,7 @@ func TestHandleMakeAlias(t *testing.T) {
 				{
 					Flags:     0x00,
 					IsReply:   0x01,
-					Type:      []byte{0, 0xd1},
+					Type:      []byte{0, 0},
 					ID:        []byte{0x9a, 0xcb, 0x04, 0x42},
 					ErrorCode: []byte{0, 0, 0, 0},
 					Fields:    []Field(nil),
@@ -1287,7 +1408,7 @@ func TestHandleGetUser(t *testing.T) {
 				{
 					Flags:     0x00,
 					IsReply:   0x01,
-					Type:      []byte{0x01, 0x60},
+					Type:      []byte{0, 0},
 					ID:        []byte{0x9a, 0xcb, 0x04, 0x42},
 					ErrorCode: []byte{0, 0, 0, 0},
 					Fields: []Field{
@@ -1427,7 +1548,7 @@ func TestHandleDeleteUser(t *testing.T) {
 				{
 					Flags:     0x00,
 					IsReply:   0x01,
-					Type:      []byte{0x1, 0x5f},
+					Type:      []byte{0, 0},
 					ID:        []byte{0x9a, 0xcb, 0x04, 0x42},
 					ErrorCode: []byte{0, 0, 0, 0},
 					Fields:    []Field(nil),
@@ -1515,7 +1636,7 @@ func TestHandleGetMsgs(t *testing.T) {
 				{
 					Flags:     0x00,
 					IsReply:   0x01,
-					Type:      []byte{0, 0x65},
+					Type:      []byte{0, 0},
 					ID:        []byte{0x9a, 0xcb, 0x04, 0x42},
 					ErrorCode: []byte{0, 0, 0, 0},
 					Fields: []Field{
@@ -1613,6 +1734,48 @@ func TestHandleNewUser(t *testing.T) {
 			},
 			wantErr: assert.NoError,
 		},
+		{
+			name: "when user attempts to create account with greater access",
+			args: args{
+				cc: &ClientConn{
+					Account: &Account{
+						Access: func() accessBitmap {
+							var bits accessBitmap
+							bits.Set(accessCreateUser)
+							return bits
+						}(),
+					},
+					Server: &Server{
+						Accounts: map[string]*Account{},
+					},
+				},
+				t: NewTransaction(
+					tranNewUser, &[]byte{0, 1},
+					NewField(fieldUserLogin, []byte("userB")),
+					NewField(
+						fieldUserAccess,
+						func() []byte {
+							var bits accessBitmap
+							bits.Set(accessDisconUser)
+							return bits[:]
+						}(),
+					),
+				),
+			},
+			wantRes: []Transaction{
+				{
+					Flags:     0x00,
+					IsReply:   0x01,
+					Type:      []byte{0, 0x00},
+					ID:        []byte{0x9a, 0xcb, 0x04, 0x42},
+					ErrorCode: []byte{0, 0, 0, 1},
+					Fields: []Field{
+						NewField(fieldError, []byte("Cannot create account with more access than yourself.")),
+					},
+				},
+			},
+			wantErr: assert.NoError,
+		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
@@ -1700,7 +1863,7 @@ func TestHandleListUsers(t *testing.T) {
 				{
 					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{
@@ -1800,7 +1963,7 @@ func TestHandleDownloadFile(t *testing.T) {
 				{
 					Flags:     0x00,
 					IsReply:   0x01,
-					Type:      []byte{0, 0x2},
+					Type:      []byte{0, 0},
 					ID:        []byte{0x9a, 0xcb, 0x04, 0x42},
 					ErrorCode: []byte{0, 0, 0, 0},
 					Fields: []Field{
@@ -1891,7 +2054,7 @@ func TestHandleDownloadFile(t *testing.T) {
 				{
 					Flags:     0x00,
 					IsReply:   0x01,
-					Type:      []byte{0, 0x2},
+					Type:      []byte{0, 0},
 					ID:        []byte{0x9a, 0xcb, 0x04, 0x42},
 					ErrorCode: []byte{0, 0, 0, 0},
 					Fields: []Field{
@@ -2327,7 +2490,7 @@ func TestHandleSendInstantMsg(t *testing.T) {
 					clientID:  &[]byte{0, 1},
 					Flags:     0x00,
 					IsReply:   0x01,
-					Type:      []byte{0x0, 0x6c},
+					Type:      []byte{0, 0},
 					ID:        []byte{0, 0, 0, 0},
 					ErrorCode: []byte{0, 0, 0, 0},
 					Fields:    []Field(nil),
@@ -2387,7 +2550,7 @@ func TestHandleSendInstantMsg(t *testing.T) {
 					clientID:  &[]byte{0, 1},
 					Flags:     0x00,
 					IsReply:   0x01,
-					Type:      []byte{0x0, 0x6c},
+					Type:      []byte{0, 0},
 					ID:        []byte{0, 0, 0, 0},
 					ErrorCode: []byte{0, 0, 0, 0},
 					Fields:    []Field(nil),
@@ -2438,7 +2601,7 @@ func TestHandleSendInstantMsg(t *testing.T) {
 					clientID:  &[]byte{0, 1},
 					Flags:     0x00,
 					IsReply:   0x01,
-					Type:      []byte{0x0, 0x6c},
+					Type:      []byte{0, 0},
 					ID:        []byte{0, 0, 0, 0},
 					ErrorCode: []byte{0, 0, 0, 0},
 					Fields:    []Field(nil),
@@ -2584,7 +2747,7 @@ func TestHandleDeleteFile(t *testing.T) {
 				{
 					Flags:     0x00,
 					IsReply:   0x01,
-					Type:      []byte{0x0, 0xcc},
+					Type:      []byte{0, 0},
 					ID:        []byte{0x0, 0x0, 0x0, 0x0},
 					ErrorCode: []byte{0, 0, 0, 0},
 					Fields:    []Field(nil),
@@ -2687,7 +2850,7 @@ func TestHandleGetFileNameList(t *testing.T) {
 				{
 					Flags:     0x00,
 					IsReply:   0x01,
-					Type:      []byte{0, 0xc8},
+					Type:      []byte{0, 0},
 					ID:        []byte{0, 0, 0, 0},
 					ErrorCode: []byte{0, 0, 0, 0},
 					Fields: []Field{
@@ -2820,7 +2983,7 @@ func TestHandleGetClientInfoText(t *testing.T) {
 				{
 					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{
@@ -2926,7 +3089,7 @@ func TestHandleTranAgreed(t *testing.T) {
 					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{},
@@ -3163,7 +3326,7 @@ func TestHandleDelNewsItem(t *testing.T) {
 					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{},
@@ -3225,7 +3388,7 @@ func TestHandleDownloadBanner(t *testing.T) {
 					clientID:  &[]byte{0, 1},
 					Flags:     0x00,
 					IsReply:   0x01,
-					Type:      []byte{0x00, 0xd4},
+					Type:      []byte{0, 0},
 					ID:        []byte{0, 0, 0, 0},
 					ErrorCode: []byte{0, 0, 0, 0},
 					Fields: []Field{
@@ -3320,7 +3483,7 @@ func TestHandleTranOldPostNews(t *testing.T) {
 				{
 					Flags:     0x00,
 					IsReply:   0x01,
-					Type:      []byte{0, 0x67},
+					Type:      []byte{0, 0},
 					ID:        []byte{0, 0, 0, 0},
 					ErrorCode: []byte{0, 0, 0, 0},
 				},
@@ -3428,7 +3591,7 @@ func TestHandleInviteNewChat(t *testing.T) {
 					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{
@@ -3492,7 +3655,7 @@ func TestHandleInviteNewChat(t *testing.T) {
 					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{
@@ -3518,3 +3681,58 @@ func TestHandleInviteNewChat(t *testing.T) {
 		})
 	}
 }
+
+func TestHandleGetNewsArtData(t *testing.T) {
+	type args struct {
+		cc *ClientConn
+		t  *Transaction
+	}
+	tests := []struct {
+		name    string
+		args    args
+		wantRes []Transaction
+		wantErr assert.ErrorAssertionFunc
+	}{
+		{
+			name: "when user does not have required permission",
+			args: args{
+				cc: &ClientConn{
+					Account: &Account{
+						Access: func() accessBitmap {
+							var bits accessBitmap
+							return bits
+						}(),
+					},
+					Server: &Server{
+						Accounts: map[string]*Account{},
+					},
+				},
+				t: NewTransaction(
+					tranGetNewsArtData, &[]byte{0, 1},
+				),
+			},
+			wantRes: []Transaction{
+				{
+					Flags:     0x00,
+					IsReply:   0x01,
+					Type:      []byte{0, 0x00},
+					ID:        []byte{0x9a, 0xcb, 0x04, 0x42},
+					ErrorCode: []byte{0, 0, 0, 1},
+					Fields: []Field{
+						NewField(fieldError, []byte("You are not allowed to read news.")),
+					},
+				},
+			},
+			wantErr: assert.NoError,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			gotRes, err := HandleGetNewsArtData(tt.args.cc, tt.args.t)
+			if !tt.wantErr(t, err, fmt.Sprintf("HandleGetNewsArtData(%v, %v)", tt.args.cc, tt.args.t)) {
+				return
+			}
+			tranAssertEqual(t, tt.wantRes, gotRes)
+		})
+	}
+}