π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
Cap pending outgoing Space friend requests
Anand Baburajan7d328313368e
diff --git a/server/space/controller/friends.go b/server/space/controller/friends.goindex 0411ef9302..8d82cb528a 100644--- a/server/space/controller/friends.go+++ b/server/space/controller/friends.go@@ -69,6 +69,13 @@ func (c *FriendsController) Add(ctx context.Context, requesterSpace *repo.SpaceRif errors.Is(stacktrace.RootCause(err), sql.ErrNoRows) {return nil, ente.NewBadRequestWithMessage("space key version is stale")}+ if errors.Is(stacktrace.RootCause(err), repo.ErrSpaceSentFriendRequestLimitReached) {+ return nil, &ente.ApiError{+ Code: ente.ErrorCode("SPACE_SENT_FRIEND_REQUEST_LIMIT_REACHED"),+ Message: "space sent friend request limit reached",+ HttpStatusCode: http.StatusConflict,+ }+ }if errors.Is(stacktrace.RootCause(err), repo.ErrSpaceFriendRequestLimitReached) {return nil, &ente.ApiError{Code: ente.ErrorCode("SPACE_FRIEND_REQUEST_LIMIT_REACHED"),diff --git a/server/space/repo/friends.go b/server/space/repo/friends.goindex 8aec43e2ea..16545a0c18 100644--- a/server/space/repo/friends.go+++ b/server/space/repo/friends.go@@ -12,10 +12,11 @@ import ()var (- ErrAlreadyFriends = errors.New("space users are already friends")- ErrSelfFriendship = errors.New("space users cannot friend themselves")- ErrSpaceFriendRequestLimitReached = errors.New("space friend request limit reached")- ErrSpaceFriendRequestStale = errors.New("space friend request keys are stale")+ ErrAlreadyFriends = errors.New("space users are already friends")+ ErrSelfFriendship = errors.New("space users cannot friend themselves")+ ErrSpaceFriendRequestLimitReached = errors.New("space friend request limit reached")+ ErrSpaceSentFriendRequestLimitReached = errors.New("space sent friend request limit reached")+ ErrSpaceFriendRequestStale = errors.New("space friend request keys are stale"))const MaxPendingFriendRequestsPerSpace = 100@@ -209,6 +210,18 @@ func (r *FriendsRepository) CreateFriendRequest(ctx context.Context, requesterIDreturn nil, false, false, stacktrace.Propagate(err, "")}+ var sentRequestCount int+ if err := tx.QueryRowContext(ctx, `+ SELECT COUNT(*)+ FROM space_friend_requests+ WHERE requester_space_id = $1+ `, requesterSpaceID).Scan(&sentRequestCount); err != nil {+ return nil, false, false, stacktrace.Propagate(err, "")+ }+ if sentRequestCount >= MaxPendingFriendRequestsPerSpace {+ return nil, false, false, ErrSpaceSentFriendRequestLimitReached+ }+var pendingRequestCount intif err := tx.QueryRowContext(ctx, `SELECT COUNT(*)diff --git a/server/space/repo/module_test.go b/server/space/repo/module_test.goindex 25d68a4fc7..2a2d0c57a2 100644--- a/server/space/repo/module_test.go+++ b/server/space/repo/module_test.go@@ -377,6 +377,64 @@ func TestCreateFriendRequestEnforcesTargetLimit(t *testing.T) {require.True(t, created)}+func TestCreateFriendRequestEnforcesSenderLimit(t *testing.T) {+ module := newSpaceTestModule(t)+ ctx := context.Background()+ requesterID := insertSpaceUser(t, module, "[email protected]", "sender-limit-public")+ requester, err := testCreateSpace(ctx, module, requesterID, "sender_limit", "root", "public", "secret", "nonce", "profile")+ require.NoError(t, err)++ var firstTarget *SpaceRecord+ var firstRequestID int64+ for i := 0; i < MaxPendingFriendRequestsPerSpace; i++ {+ suffix := strconv.Itoa(i)+ targetID := insertSpaceUser(t, module, "sender-target-"+suffix+"@example.com", "sender-target-public-"+suffix)+ target, err := testCreateSpace(ctx, module, targetID, "sender_target_"+suffix, "root", "public", "secret", "nonce", "profile")+ require.NoError(t, err)+ request, created, err := testCreateFriendRequest(ctx, module, requesterID, requester.SpaceID, target.SpaceID, "share-key", requester.CurrentVersion)+ require.NoError(t, err)+ require.True(t, created)+ if i == 0 {+ firstTarget = target+ firstRequestID = request.RequestID+ }+ }++ extraID := insertSpaceUser(t, module, "[email protected]", "sender-extra-public")+ extra, err := testCreateSpace(ctx, module, extraID, "sender_extra", "root", "public", "secret", "nonce", "profile")+ require.NoError(t, err)+ _, created, err := testCreateFriendRequest(ctx, module, requesterID, requester.SpaceID, extra.SpaceID, "share-key", requester.CurrentVersion)+ require.ErrorIs(t, err, ErrSpaceSentFriendRequestLimitReached)+ require.False(t, created)+ require.Equal(t, int64(MaxPendingFriendRequestsPerSpace), countSpaceRows(t, module, `SELECT COUNT(*) FROM space_friend_requests WHERE requester_space_id = $1`, requester.SpaceID))++ request, created, err := testCreateFriendRequest(ctx, module, requesterID, requester.SpaceID, firstTarget.SpaceID, "updated-share-key", requester.CurrentVersion)+ require.NoError(t, err)+ require.False(t, created)+ require.Equal(t, firstRequestID, request.RequestID)+ require.Equal(t, []byte("updated-share-key"), request.RequesterFriendSealedSpaceKey)++ _, created, err = testCreateFriendRequest(ctx, module, extraID, extra.SpaceID, requester.SpaceID, "extra-share-key", extra.CurrentVersion)+ require.NoError(t, err)+ require.True(t, created)+ _, created, becameFriends, err := module.Friends.CreateFriendRequest(ctx, requesterID, requester.SpaceID, extra.SpaceID, []byte("share-key"), requester.CurrentVersion)+ require.NoError(t, err)+ require.False(t, created)+ require.True(t, becameFriends)+ require.Equal(t, int64(MaxPendingFriendRequestsPerSpace), countSpaceRows(t, module, `SELECT COUNT(*) FROM space_friend_requests WHERE requester_space_id = $1`, requester.SpaceID))++ require.NoError(t, module.Friends.DeleteFriendRequest(ctx, requester.SpaceID, firstRequestID))+ request, created, err = testCreateFriendRequest(ctx, module, requesterID, requester.SpaceID, firstTarget.SpaceID, "share-key", requester.CurrentVersion)+ require.NoError(t, err)+ require.True(t, created)+ require.NotEqual(t, firstRequestID, request.RequestID)++ _, becameFriends, err = module.Friends.ConfirmFriendRequest(ctx, firstTarget.SpaceID, request.RequestID, []byte("target-share-key"), firstTarget.CurrentVersion)+ require.NoError(t, err)+ require.True(t, becameFriends)+ require.Equal(t, int64(MaxPendingFriendRequestsPerSpace-1), countSpaceRows(t, module, `SELECT COUNT(*) FROM space_friend_requests WHERE requester_space_id = $1`, requester.SpaceID))+}+func TestCreateFriendRequestsBeyondNine(t *testing.T) {module := newSpaceTestModule(t)ctx := context.Background()