X-Git-Url: https://git.r.bdr.sh/rbdr/mobius/blobdiff_plain/2d52424e94e617627e4438fd207ee94949409328..bb1e98842e35b3affaf94971e78c86f8b9547928:/hotline/transaction_handlers_test.go

diff --git a/hotline/transaction_handlers_test.go b/hotline/transaction_handlers_test.go
index 6ff8cf1..01ae862 100644
--- a/hotline/transaction_handlers_test.go
+++ b/hotline/transaction_handlers_test.go
@@ -689,21 +689,65 @@ func TestHandleNewFolder(t *testing.T) {
 		t  *Transaction
 	}
 	tests := []struct {
-		setup   func()
 		name    string
 		args    args
 		wantRes []Transaction
 		wantErr bool
 	}{
+		{
+			name: "without required permission",
+			args: args{
+				cc: &ClientConn{
+					Account: &Account{
+						Access: func() *[]byte {
+							var bits accessBitmap
+							access := bits[:]
+							return &access
+						}(),
+					},
+				},
+				t: NewTransaction(
+					accessCreateFolder,
+					&[]byte{0, 0},
+				),
+			},
+			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 create folders.")),
+					},
+				},
+			},
+			wantErr: false,
+		},
 		{
 			name: "when path is nested",
 			args: args{
 				cc: &ClientConn{
+					Account: &Account{
+						Access: func() *[]byte {
+							var bits accessBitmap
+							bits.Set(accessCreateFolder)
+							access := bits[:]
+							return &access
+						}(),
+					},
 					ID: &[]byte{0, 1},
 					Server: &Server{
 						Config: &Config{
 							FileRoot: "/Files/",
 						},
+						FS: func() *MockFileStore {
+							mfs := &MockFileStore{}
+							mfs.On("Mkdir", "/Files/aaa/testFolder", fs.FileMode(0777)).Return(nil)
+							mfs.On("Stat", "/Files/aaa/testFolder").Return(nil, os.ErrNotExist)
+							return mfs
+						}(),
 					},
 				},
 				t: NewTransaction(
@@ -717,12 +761,6 @@ func TestHandleNewFolder(t *testing.T) {
 					}),
 				),
 			},
-			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},
@@ -739,11 +777,25 @@ func TestHandleNewFolder(t *testing.T) {
 			name: "when path is not nested",
 			args: args{
 				cc: &ClientConn{
+					Account: &Account{
+						Access: func() *[]byte {
+							var bits accessBitmap
+							bits.Set(accessCreateFolder)
+							access := bits[:]
+							return &access
+						}(),
+					},
 					ID: &[]byte{0, 1},
 					Server: &Server{
 						Config: &Config{
 							FileRoot: "/Files",
 						},
+						FS: func() *MockFileStore {
+							mfs := &MockFileStore{}
+							mfs.On("Mkdir", "/Files/testFolder", fs.FileMode(0777)).Return(nil)
+							mfs.On("Stat", "/Files/testFolder").Return(nil, os.ErrNotExist)
+							return mfs
+						}(),
 					},
 				},
 				t: NewTransaction(
@@ -751,12 +803,6 @@ func TestHandleNewFolder(t *testing.T) {
 					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},
@@ -773,11 +819,25 @@ func TestHandleNewFolder(t *testing.T) {
 			name: "when UnmarshalBinary returns an err",
 			args: args{
 				cc: &ClientConn{
+					Account: &Account{
+						Access: func() *[]byte {
+							var bits accessBitmap
+							bits.Set(accessCreateFolder)
+							access := bits[:]
+							return &access
+						}(),
+					},
 					ID: &[]byte{0, 1},
 					Server: &Server{
 						Config: &Config{
 							FileRoot: "/Files/",
 						},
+						FS: func() *MockFileStore {
+							mfs := &MockFileStore{}
+							mfs.On("Mkdir", "/Files/aaa/testFolder", fs.FileMode(0777)).Return(nil)
+							mfs.On("Stat", "/Files/aaa/testFolder").Return(nil, os.ErrNotExist)
+							return mfs
+						}(),
 					},
 				},
 				t: NewTransaction(
@@ -788,12 +848,6 @@ func TestHandleNewFolder(t *testing.T) {
 					}),
 				),
 			},
-			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,
 		},
@@ -801,11 +855,25 @@ func TestHandleNewFolder(t *testing.T) {
 			name: "fieldFileName does not allow directory traversal",
 			args: args{
 				cc: &ClientConn{
+					Account: &Account{
+						Access: func() *[]byte {
+							var bits accessBitmap
+							bits.Set(accessCreateFolder)
+							access := bits[:]
+							return &access
+						}(),
+					},
 					ID: &[]byte{0, 1},
 					Server: &Server{
 						Config: &Config{
 							FileRoot: "/Files/",
 						},
+						FS: func() *MockFileStore {
+							mfs := &MockFileStore{}
+							mfs.On("Mkdir", "/Files/testFolder", fs.FileMode(0777)).Return(nil)
+							mfs.On("Stat", "/Files/testFolder").Return(nil, os.ErrNotExist)
+							return mfs
+						}(),
 					},
 				},
 				t: NewTransaction(
@@ -813,12 +881,6 @@ func TestHandleNewFolder(t *testing.T) {
 					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},
@@ -834,11 +896,25 @@ func TestHandleNewFolder(t *testing.T) {
 			name: "fieldFilePath does not allow directory traversal",
 			args: args{
 				cc: &ClientConn{
+					Account: &Account{
+						Access: func() *[]byte {
+							var bits accessBitmap
+							bits.Set(accessCreateFolder)
+							access := bits[:]
+							return &access
+						}(),
+					},
 					ID: &[]byte{0, 1},
 					Server: &Server{
 						Config: &Config{
 							FileRoot: "/Files/",
 						},
+						FS: func() *MockFileStore {
+							mfs := &MockFileStore{}
+							mfs.On("Mkdir", "/Files/foo/testFolder", fs.FileMode(0777)).Return(nil)
+							mfs.On("Stat", "/Files/foo/testFolder").Return(nil, os.ErrNotExist)
+							return mfs
+						}(),
 					},
 				},
 				t: NewTransaction(
@@ -855,12 +931,6 @@ func TestHandleNewFolder(t *testing.T) {
 					}),
 				),
 			},
-			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},
@@ -875,13 +945,13 @@ func TestHandleNewFolder(t *testing.T) {
 	}
 	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)
 			}
@@ -1005,23 +1075,12 @@ func TestHandleMakeAlias(t *testing.T) {
 	}
 	tests := []struct {
 		name    string
-		setup   func()
 		args    args
 		wantRes []Transaction
 		wantErr bool
 	}{
 		{
 			name: "with valid input and required permissions",
-			setup: func() {
-				mfs := &MockFileStore{}
-				path, _ := os.Getwd()
-				mfs.On(
-					"Symlink",
-					path+"/test/config/Files/foo/testFile",
-					path+"/test/config/Files/bar/testFile",
-				).Return(nil)
-				FS = mfs
-			},
 			args: args{
 				cc: &ClientConn{
 					Account: &Account{
@@ -1040,6 +1099,16 @@ func TestHandleMakeAlias(t *testing.T) {
 							}(),
 						},
 						Logger: NewTestLogger(),
+						FS: func() *MockFileStore {
+							mfs := &MockFileStore{}
+							path, _ := os.Getwd()
+							mfs.On(
+								"Symlink",
+								path+"/test/config/Files/foo/testFile",
+								path+"/test/config/Files/bar/testFile",
+							).Return(nil)
+							return mfs
+						}(),
 					},
 				},
 				t: NewTransaction(
@@ -1063,16 +1132,6 @@ func TestHandleMakeAlias(t *testing.T) {
 		},
 		{
 			name: "when symlink returns an error",
-			setup: func() {
-				mfs := &MockFileStore{}
-				path, _ := os.Getwd()
-				mfs.On(
-					"Symlink",
-					path+"/test/config/Files/foo/testFile",
-					path+"/test/config/Files/bar/testFile",
-				).Return(errors.New("ohno"))
-				FS = mfs
-			},
 			args: args{
 				cc: &ClientConn{
 					Account: &Account{
@@ -1091,6 +1150,16 @@ func TestHandleMakeAlias(t *testing.T) {
 							}(),
 						},
 						Logger: NewTestLogger(),
+						FS: func() *MockFileStore {
+							mfs := &MockFileStore{}
+							path, _ := os.Getwd()
+							mfs.On(
+								"Symlink",
+								path+"/test/config/Files/foo/testFile",
+								path+"/test/config/Files/bar/testFile",
+							).Return(errors.New("ohno"))
+							return mfs
+						}(),
 					},
 				},
 				t: NewTransaction(
@@ -1115,8 +1184,7 @@ func TestHandleMakeAlias(t *testing.T) {
 			wantErr: false,
 		},
 		{
-			name:  "when user does not have required permission",
-			setup: func() {},
+			name: "when user does not have required permission",
 			args: args{
 				cc: &ClientConn{
 					Account: &Account{
@@ -1169,8 +1237,6 @@ func TestHandleMakeAlias(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			tt.setup()
-
 			gotRes, err := HandleMakeAlias(tt.args.cc, tt.args.t)
 			if (err != nil) != tt.wantErr {
 				t.Errorf("HandleMakeAlias(%v, %v)", tt.args.cc, tt.args.t)
@@ -1327,18 +1393,12 @@ func TestHandleDeleteUser(t *testing.T) {
 	}
 	tests := []struct {
 		name    string
-		setup   func()
 		args    args
 		wantRes []Transaction
 		wantErr assert.ErrorAssertionFunc
 	}{
 		{
 			name: "when user exists",
-			setup: func() {
-				mfs := &MockFileStore{}
-				mfs.On("Remove", "Users/testuser.yaml").Return(nil)
-				FS = mfs
-			},
 			args: args{
 				cc: &ClientConn{
 					Account: &Account{
@@ -1358,6 +1418,11 @@ func TestHandleDeleteUser(t *testing.T) {
 								Access:   &[]byte{1},
 							},
 						},
+						FS: func() *MockFileStore {
+							mfs := &MockFileStore{}
+							mfs.On("Remove", "Users/testuser.yaml").Return(nil)
+							return mfs
+						}(),
 					},
 				},
 				t: NewTransaction(
@@ -1378,8 +1443,7 @@ func TestHandleDeleteUser(t *testing.T) {
 			wantErr: assert.NoError,
 		},
 		{
-			name:  "when user does not have required permission",
-			setup: func() {},
+			name: "when user does not have required permission",
 			args: args{
 				cc: &ClientConn{
 					Account: &Account{
@@ -1415,7 +1479,6 @@ func TestHandleDeleteUser(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			tt.setup()
 			gotRes, err := HandleDeleteUser(tt.args.cc, tt.args.t)
 			if !tt.wantErr(t, err, fmt.Sprintf("HandleDeleteUser(%v, %v)", tt.args.cc, tt.args.t)) {
 				return
@@ -1907,3 +1970,277 @@ func TestHandleUpdateUser(t *testing.T) {
 		})
 	}
 }
+
+func TestHandleDelNewsArt(t *testing.T) {
+	type args struct {
+		cc *ClientConn
+		t  *Transaction
+	}
+	tests := []struct {
+		name    string
+		args    args
+		wantRes []Transaction
+		wantErr assert.ErrorAssertionFunc
+	}{
+		{
+			name: "without required permission",
+			args: args{
+				cc: &ClientConn{
+					Account: &Account{
+						Access: func() *[]byte {
+							var bits accessBitmap
+							access := bits[:]
+							return &access
+						}(),
+					},
+				},
+				t: NewTransaction(
+					tranDelNewsArt,
+					&[]byte{0, 0},
+				),
+			},
+			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 delete news articles.")),
+					},
+				},
+			},
+			wantErr: assert.NoError,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			gotRes, err := HandleDelNewsArt(tt.args.cc, tt.args.t)
+			if !tt.wantErr(t, err, fmt.Sprintf("HandleDelNewsArt(%v, %v)", tt.args.cc, tt.args.t)) {
+				return
+			}
+			tranAssertEqual(t, tt.wantRes, gotRes)
+		})
+	}
+}
+
+func TestHandleDisconnectUser(t *testing.T) {
+	type args struct {
+		cc *ClientConn
+		t  *Transaction
+	}
+	tests := []struct {
+		name    string
+		args    args
+		wantRes []Transaction
+		wantErr assert.ErrorAssertionFunc
+	}{
+		{
+			name: "without required permission",
+			args: args{
+				cc: &ClientConn{
+					Account: &Account{
+						Access: func() *[]byte {
+							var bits accessBitmap
+							access := bits[:]
+							return &access
+						}(),
+					},
+				},
+				t: NewTransaction(
+					tranDelNewsArt,
+					&[]byte{0, 0},
+				),
+			},
+			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 disconnect users.")),
+					},
+				},
+			},
+			wantErr: assert.NoError,
+		},
+		{
+			name: "when target user has 'cannot be disconnected' priv",
+			args: args{
+				cc: &ClientConn{
+					Server: &Server{
+						Clients: map[uint16]*ClientConn{
+							uint16(1): {
+								Account: &Account{
+									Login: "unnamed",
+									Access: func() *[]byte {
+										var bits accessBitmap
+										bits.Set(accessCannotBeDiscon)
+										access := bits[:]
+										return &access
+									}(),
+								},
+							},
+						},
+					},
+					Account: &Account{
+						Access: func() *[]byte {
+							var bits accessBitmap
+							bits.Set(accessDisconUser)
+							access := bits[:]
+							return &access
+						}(),
+					},
+				},
+				t: NewTransaction(
+					tranDelNewsArt,
+					&[]byte{0, 0},
+					NewField(fieldUserID, []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("unnamed is not allowed to be disconnected.")),
+					},
+				},
+			},
+			wantErr: assert.NoError,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			gotRes, err := HandleDisconnectUser(tt.args.cc, tt.args.t)
+			if !tt.wantErr(t, err, fmt.Sprintf("HandleDisconnectUser(%v, %v)", tt.args.cc, tt.args.t)) {
+				return
+			}
+			tranAssertEqual(t, tt.wantRes, gotRes)
+		})
+	}
+}
+
+func TestHandleSendInstantMsg(t *testing.T) {
+	type args struct {
+		cc *ClientConn
+		t  *Transaction
+	}
+	tests := []struct {
+		name    string
+		args    args
+		wantRes []Transaction
+		wantErr assert.ErrorAssertionFunc
+	}{
+		{
+			name: "when client 1 sends a message to client 2",
+			args: args{
+				cc: &ClientConn{
+					ID:       &[]byte{0, 1},
+					UserName: []byte("User1"),
+					Server: &Server{
+						Clients: map[uint16]*ClientConn{
+							uint16(2): {
+								AutoReply: []byte(nil),
+							},
+						},
+					},
+				},
+				t: NewTransaction(
+					tranSendInstantMsg,
+					&[]byte{0, 1},
+					NewField(fieldData, []byte("hai")),
+					NewField(fieldUserID, []byte{0, 2}),
+				),
+			},
+			wantRes: []Transaction{
+				*NewTransaction(
+					tranServerMsg,
+					&[]byte{0, 2},
+					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},
+					ID:        []byte{0, 0, 0, 0},
+					ErrorCode: []byte{0, 0, 0, 0},
+					Fields:    []Field(nil),
+				},
+			},
+			wantErr: assert.NoError,
+		},
+		{
+			name: "when client 2 has autoreply enabled",
+			args: args{
+				cc: &ClientConn{
+					ID:       &[]byte{0, 1},
+					UserName: []byte("User1"),
+					Server: &Server{
+						Clients: map[uint16]*ClientConn{
+							uint16(2): {
+								ID:        &[]byte{0, 2},
+								UserName:  []byte("User2"),
+								AutoReply: []byte("autohai"),
+							},
+						},
+					},
+				},
+				t: NewTransaction(
+					tranSendInstantMsg,
+					&[]byte{0, 1},
+					NewField(fieldData, []byte("hai")),
+					NewField(fieldUserID, []byte{0, 2}),
+				),
+			},
+			wantRes: []Transaction{
+				*NewTransaction(
+					tranServerMsg,
+					&[]byte{0, 2},
+					NewField(fieldData, []byte("hai")),
+					NewField(fieldUserName, []byte("User1")),
+					NewField(fieldUserID, []byte{0, 1}),
+					NewField(fieldOptions, []byte{0, 1}),
+				),
+				*NewTransaction(
+					tranServerMsg,
+					&[]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},
+					ID:        []byte{0, 0, 0, 0},
+					ErrorCode: []byte{0, 0, 0, 0},
+					Fields:    []Field(nil),
+				},
+			},
+			wantErr: assert.NoError,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			gotRes, err := HandleSendInstantMsg(tt.args.cc, tt.args.t)
+			if !tt.wantErr(t, err, fmt.Sprintf("HandleSendInstantMsg(%v, %v)", tt.args.cc, tt.args.t)) {
+				return
+			}
+
+			tranAssertEqual(t, tt.wantRes, gotRes)
+		})
+	}
+}