π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
Add encrypted Space message reactions
Anand Baburajan65c7a659fdd2
diff --git a/server/migrations/147_space_message_reactions.down.sql b/server/migrations/147_space_message_reactions.down.sqlnew file mode 100644index 0000000000..7798e29f40--- /dev/null+++ b/server/migrations/147_space_message_reactions.down.sql@@ -0,0 +1,15 @@+CREATE OR REPLACE FUNCTION tg_space_messages_null_cipher_on_delete() RETURNS trigger AS $$+BEGIN+ IF NEW.is_deleted THEN+ NEW.message_cipher := NULL;+ NEW.sender_encrypted_message_key := NULL;+ NEW.recipient_encrypted_message_key := NULL;+ NEW.recipient_liked_at := NULL;+ END IF;+ RETURN NEW;+END; $$ LANGUAGE plpgsql;++ALTER TABLE space_messages+ DROP CONSTRAINT chk_space_messages_reaction,+ DROP COLUMN sender_encrypted_reaction,+ DROP COLUMN recipient_encrypted_reaction;diff --git a/server/migrations/147_space_message_reactions.up.sql b/server/migrations/147_space_message_reactions.up.sqlnew file mode 100644index 0000000000..b6f7f1d844--- /dev/null+++ b/server/migrations/147_space_message_reactions.up.sql@@ -0,0 +1,28 @@+ALTER TABLE space_messages+ ADD COLUMN sender_encrypted_reaction BYTEA,+ ADD COLUMN recipient_encrypted_reaction BYTEA,+ ADD CONSTRAINT chk_space_messages_reaction CHECK (+ (sender_encrypted_reaction IS NULL AND recipient_encrypted_reaction IS NULL)+ OR (+ sender_encrypted_reaction IS NOT NULL+ AND recipient_encrypted_reaction IS NOT NULL+ AND octet_length(sender_encrypted_reaction) = 304+ AND octet_length(recipient_encrypted_reaction) = 304+ AND recipient_liked_at IS NOT NULL+ AND kind IN ('regular', 'post_reply')+ AND is_deleted = FALSE+ )+ );++CREATE OR REPLACE FUNCTION tg_space_messages_null_cipher_on_delete() RETURNS trigger AS $$+BEGIN+ IF NEW.is_deleted THEN+ NEW.message_cipher := NULL;+ NEW.sender_encrypted_message_key := NULL;+ NEW.recipient_encrypted_message_key := NULL;+ NEW.recipient_liked_at := NULL;+ NEW.sender_encrypted_reaction := NULL;+ NEW.recipient_encrypted_reaction := NULL;+ END IF;+ RETURN NEW;+END; $$ LANGUAGE plpgsql;diff --git a/server/space/api/messages.go b/server/space/api/messages.goindex cc6e52b24c..cb17116e22 100644--- a/server/space/api/messages.go+++ b/server/space/api/messages.go@@ -19,6 +19,19 @@ func (h *Handlers) CreateMessage(c *gin.Context, space *spacerepo.SpaceRecord) {respondJSON(c, resp, err)}+func (h *Handlers) SetMessageReaction(c *gin.Context, space *spacerepo.SpaceRecord) {+ var req models.SetMessageReactionRequest+ if !bindJSON(c, &req) {+ return+ }+ messageID, ok := stringParam(c, "messageID")+ if !ok {+ return+ }+ resp, err := h.Module.Messages.SetReaction(c, space, messageID, req)+ respondJSON(c, resp, err)+}+func (h *Handlers) LikeMessage(c *gin.Context, space *spacerepo.SpaceRecord) {h.setMessageLike(c, space, true)}diff --git a/server/space/api/register.go b/server/space/api/register.goindex 7e332a4aa3..0e889440b5 100644--- a/server/space/api/register.go+++ b/server/space/api/register.go@@ -27,6 +27,8 @@ func Register(privateAPI, publicAPI gin.IRouter, handlers *Handlers) {spaceAPI.POST("/friends/:friendSpaceID/read", selected(handlers.MarkNotificationsRead))spaceAPI.GET("/friends/:friendSpaceID/messages", selected(handlers.ListMessageThread))spaceAPI.POST("/friends/:friendSpaceID/messages", selected(handlers.CreateMessage))+ spaceAPI.PUT("/messages/:messageID/reaction", selected(handlers.SetMessageReaction))+ spaceAPI.DELETE("/messages/:messageID/reaction", selected(handlers.UnlikeMessage))spaceAPI.PUT("/messages/:messageID/like", selected(handlers.LikeMessage))spaceAPI.DELETE("/messages/:messageID/like", selected(handlers.UnlikeMessage))spaceAPI.DELETE("/messages/:messageID", selected(handlers.DeleteMessage))diff --git a/server/space/controller/messages.go b/server/space/controller/messages.goindex b337aec1e4..91d696e75f 100644--- a/server/space/controller/messages.go+++ b/server/space/controller/messages.go@@ -219,6 +219,30 @@ func (c *MessagesController) ListThread(ctx context.Context, viewerSpace *repo.S}func (c *MessagesController) SetLike(ctx context.Context, actorSpace *repo.SpaceRecord, messageID string, like bool) (*models.LikeMessageResponse, error) {+ message, err := c.messageReactionTarget(ctx, actorSpace, messageID)+ if err != nil {+ return nil, err+ }+ otherSpaceID := message.SenderSpaceID+ var recipientUserID int64+ if like {+ otherSpace, err := c.SpacesRepo.GetSpaceByID(ctx, otherSpaceID)+ if err != nil {+ return nil, err+ }+ recipientUserID = otherSpace.OwnerID+ }+ changed, err := c.MessagesRepo.SetLikeWithChanged(ctx, message.MessageID, actorSpace.SpaceID, like)+ if err != nil {+ return nil, err+ }+ if like && changed {+ go c.ActivityNotifier.OnSpaceMessageLiked(spaceActivityActor(actorSpace), recipientUserID)+ }+ return &models.LikeMessageResponse{Liked: like}, nil+}++func (c *MessagesController) messageReactionTarget(ctx context.Context, actorSpace *repo.SpaceRecord, messageID string) (*repo.SpaceMessageRecord, error) {messageID = strings.TrimSpace(messageID)if messageID == "" {return nil, ente.NewBadRequestWithMessage("messageId is required")@@ -236,29 +260,43 @@ func (c *MessagesController) SetLike(ctx context.Context, actorSpace *repo.Spaceif message.RecipientSpaceID != actorSpace.SpaceID {return nil, ente.NewBadRequestWithMessage("only the recipient can like a message")}- otherSpaceID := message.SenderSpaceID- if _, err := c.FriendsRepo.GetShareForFriendAndSpace(ctx, actorSpace.SpaceID, otherSpaceID); err != nil {+ if _, err := c.FriendsRepo.GetShareForFriendAndSpace(ctx, actorSpace.SpaceID, message.SenderSpaceID); err != nil {if errors.Is(stacktrace.RootCause(err), sql.ErrNoRows) {return nil, ente.ErrPermissionDenied}return nil, err}- var recipientUserID int64- if like {- otherSpace, err := c.SpacesRepo.GetSpaceByID(ctx, otherSpaceID)- if err != nil {- return nil, err- }- recipientUserID = otherSpace.OwnerID+ return message, nil+}++func (c *MessagesController) SetReaction(ctx context.Context, actorSpace *repo.SpaceRecord, messageID string, req models.SetMessageReactionRequest) (*models.LikeMessageResponse, error) {+ senderCipher, err := decodeEncodedSpaceField("senderEncryptedReaction", req.SenderEncryptedReaction, 408, 304)+ if err != nil {+ return nil, err}- changed, err := c.MessagesRepo.SetLikeWithChanged(ctx, messageID, actorSpace.SpaceID, like)+ recipientCipher, err := decodeEncodedSpaceField("recipientEncryptedReaction", req.RecipientEncryptedReaction, 408, 304)if err != nil {return nil, err}- if like && changed {- go c.ActivityNotifier.OnSpaceMessageLiked(spaceActivityActor(actorSpace), recipientUserID)+ if len(senderCipher) != 304 || len(recipientCipher) != 304 {+ return nil, ente.NewBadRequestWithMessage("encrypted reactions must be 304 bytes")}- return &models.LikeMessageResponse{Liked: like}, nil+ message, err := c.messageReactionTarget(ctx, actorSpace, messageID)+ if err != nil {+ return nil, err+ }+ sender, err := c.SpacesRepo.GetSpaceByID(ctx, message.SenderSpaceID)+ if err != nil {+ return nil, err+ }+ added, err := c.MessagesRepo.SetReaction(ctx, message.MessageID, actorSpace.SpaceID, senderCipher, recipientCipher)+ if err != nil {+ return nil, err+ }+ if added {+ go c.ActivityNotifier.OnSpaceMessageLiked(spaceActivityActor(actorSpace), sender.OwnerID)+ }+ return &models.LikeMessageResponse{Liked: true}, nil}func (c *MessagesController) Delete(ctx context.Context, senderSpace *repo.SpaceRecord, messageID string) error {@@ -388,6 +426,7 @@ func toMessageResponse(message repo.SpaceMessageRecord) *models.MessageResponseRecipientSpaceID: message.RecipientSpaceID,MessageCipher: encodeSpaceField(message.MessageCipher),EncryptedMessageKey: encodeSpaceField(message.EncryptedMessageKey),+ EncryptedReaction: encodeSpaceField(message.EncryptedReaction),Text: message.Text,Liked: message.Liked,ViewerLiked: message.ViewerLiked,@@ -444,6 +483,7 @@ func toMessageConversationActivityResponse(activity repo.SpaceMessageConversatioif len(activity.EncryptedMessageKey) > 0 {resp.EncryptedMessageKey = encodeSpaceField(activity.EncryptedMessageKey)}+ resp.EncryptedReaction = encodeSpaceField(activity.EncryptedReaction)if activity.ReplyMessageID.Valid {replyMessageID := activity.ReplyMessageID.Stringresp.ReplyMessageID = &replyMessageIDdiff --git a/server/space/controller/messages_test.go b/server/space/controller/messages_test.goindex f2b57b0d28..8090085c45 100644--- a/server/space/controller/messages_test.go+++ b/server/space/controller/messages_test.go@@ -227,3 +227,83 @@ func createRepoMessage(t *testing.T, repos *spacerepo.Module, senderID int64, sefunc spaceTestB64(value string) string {return base64.StdEncoding.EncodeToString([]byte(value))}++func TestMessageReactions(t *testing.T) {+ controller, repos, ctx := setupMessagesControllerTest(t)+ aliceID, alice := createMessageControllerUserAndSpace(t, repos, "alice-reactions", "alice-reactions-key")+ bobID, bob := createMessageControllerUserAndSpace(t, repos, "bob-reactions", "bob-reactions-key")+ require.NoError(t, testAddFriend(ctx, repos, bobID, bob.SpaceID, alice.SpaceID, "alice-share-key", alice.CurrentVersion, "bob-share-key", bob.CurrentVersion))+ message := createRepoMessage(t, repos, bobID, bob.SpaceID, aliceID, alice.SpaceID, "")+ notifier := newRecordingSpaceActivityNotifier()+ controller.ActivityNotifier = notifier+ request := models.SetMessageReactionRequest{+ SenderEncryptedReaction: base64.StdEncoding.EncodeToString([]byte(strings.Repeat("s", 304))),+ RecipientEncryptedReaction: base64.StdEncoding.EncodeToString([]byte(strings.Repeat("r", 304))),+ }+ _, err := controller.SetReaction(ctx, bob, message.MessageID, request)+ require.Error(t, err)+ invalid := request+ invalid.SenderEncryptedReaction = "not base64"+ _, err = controller.SetReaction(ctx, alice, message.MessageID, invalid)+ require.Error(t, err)+ invalid.SenderEncryptedReaction = base64.StdEncoding.EncodeToString([]byte("short"))+ _, err = controller.SetReaction(ctx, alice, message.MessageID, invalid)+ require.Error(t, err)++ response, err := controller.SetReaction(ctx, alice, message.MessageID, request)+ require.NoError(t, err)+ require.True(t, response.Liked)+ require.Equal(t, bobID, requireSpaceActivity(t, notifier).recipientIDs[0])+ for _, viewer := range []*spacerepo.SpaceRecord{alice, bob} {+ loaded, err := repos.Messages.GetMessage(ctx, message.MessageID, viewer.SpaceID)+ require.NoError(t, err)+ expected := strings.Repeat("s", 304)+ if viewer.SpaceID == alice.SpaceID {+ expected = strings.Repeat("r", 304)+ }+ require.Equal(t, []byte(expected), loaded.EncryptedReaction)+ require.True(t, loaded.Liked)+ require.Equal(t, viewer.SpaceID == alice.SpaceID, loaded.ViewerLiked)+ }+ summaries, err := repos.Messages.ListLatestChatSummaries(ctx, bob.SpaceID, []string{alice.SpaceID})+ require.NoError(t, err)+ activity := summaries[alice.SpaceID].LatestActivity+ require.Equal(t, "message_like", activity.Type)+ require.Equal(t, []byte(strings.Repeat("s", 304)), activity.EncryptedReaction)+ require.NoError(t, repos.Read.UpsertNotificationReadMarker(ctx, bob.SpaceID, alice.SpaceID, activity.CreatedAt))++ _, err = controller.SetReaction(ctx, alice, message.MessageID, request)+ require.NoError(t, err)+ requireNoSpaceActivity(t, notifier)+ request.SenderEncryptedReaction = base64.StdEncoding.EncodeToString([]byte(strings.Repeat("n", 304)))+ _, err = controller.SetReaction(ctx, alice, message.MessageID, request)+ require.NoError(t, err)+ requireNoSpaceActivity(t, notifier)+ summaries, err = repos.Messages.ListLatestChatSummaries(ctx, bob.SpaceID, []string{alice.SpaceID})+ require.NoError(t, err)+ require.Equal(t, activity.CreatedAt, summaries[alice.SpaceID].LatestActivity.CreatedAt)+ require.Equal(t, []byte(strings.Repeat("n", 304)), summaries[alice.SpaceID].LatestActivity.EncryptedReaction)+ require.Empty(t, summaries[alice.SpaceID].UnreadActivities)++ _, err = controller.SetLike(ctx, alice, message.MessageID, false)+ require.NoError(t, err)+ loaded, err := repos.Messages.GetMessage(ctx, message.MessageID, bob.SpaceID)+ require.NoError(t, err)+ require.Empty(t, loaded.EncryptedReaction)+ require.False(t, loaded.Liked)+ _, err = controller.SetReaction(ctx, alice, message.MessageID, request)+ require.NoError(t, err)+ requireSpaceActivity(t, notifier)+ require.NoError(t, controller.Delete(ctx, bob, message.MessageID))+ loaded, err = repos.Messages.GetMessage(ctx, message.MessageID, bob.SpaceID)+ require.NoError(t, err)+ require.Empty(t, loaded.EncryptedReaction)+ require.False(t, loaded.Liked)+ _, err = controller.SetReaction(ctx, alice, message.MessageID, request)+ require.Error(t, err)++ message = createRepoMessage(t, repos, bobID, bob.SpaceID, aliceID, alice.SpaceID, "")+ require.NoError(t, repos.Friends.DeleteFriendship(ctx, alice.SpaceID, bob.SpaceID))+ _, err = controller.SetReaction(ctx, alice, message.MessageID, request)+ require.ErrorIs(t, err, ente.ErrPermissionDenied)+}diff --git a/server/space/controller/notifications.go b/server/space/controller/notifications.goindex eccad9da51..e43951ad31 100644--- a/server/space/controller/notifications.go+++ b/server/space/controller/notifications.go@@ -143,7 +143,7 @@ func (n *SpaceWebPushSender) OnSpacePokeSent(actor SpaceActivityActor, recipient}func (n *SpaceWebPushSender) OnSpaceMessageLiked(actor SpaceActivityActor, recipientUserID int64) {- n.sendAccountActivity(actor, "liked a message", "View conversation", spaceActivityMessageLiked, conversationURL(actor.SpaceID), recipientUserID)+ n.sendAccountActivity(actor, "reacted to your message", "View conversation", spaceActivityMessageLiked, conversationURL(actor.SpaceID), recipientUserID)}func (n *SpaceWebPushSender) OnSpaceFriendAdded(actor SpaceActivityActor, recipientUserID int64) {diff --git a/server/space/models/models.go b/server/space/models/models.goindex 689cc4a816..32faf2ba59 100644--- a/server/space/models/models.go+++ b/server/space/models/models.go@@ -318,6 +318,11 @@ type CreateMessageRequest struct {NotificationKind string `json:"notificationKind,omitempty"`}+type SetMessageReactionRequest struct {+ SenderEncryptedReaction string `json:"senderEncryptedReaction" binding:"required"`+ RecipientEncryptedReaction string `json:"recipientEncryptedReaction" binding:"required"`+}+type LikeMessageResponse struct {Liked bool `json:"liked"`}@@ -329,6 +334,7 @@ type MessageResponse struct {RecipientSpaceID string `json:"recipientSpaceId"`MessageCipher string `json:"messageCipher,omitempty"`EncryptedMessageKey string `json:"encryptedMessageKey,omitempty"`+ EncryptedReaction string `json:"encryptedReaction,omitempty"`Text string `json:"text,omitempty"`ReplyPostID *int64 `json:"replyPostId,omitempty"`ReplyMessageID *string `json:"replyMessageId,omitempty"`@@ -355,6 +361,7 @@ type MessageConversationActivityResponse struct {RecipientSpaceID string `json:"recipientSpaceId,omitempty"`MessageCipher string `json:"messageCipher,omitempty"`EncryptedMessageKey string `json:"encryptedMessageKey,omitempty"`+ EncryptedReaction string `json:"encryptedReaction,omitempty"`ReplyMessageID *string `json:"replyMessageId,omitempty"`PostID *int64 `json:"postId,omitempty"`PostSpaceID string `json:"postSpaceId,omitempty"`diff --git a/server/space/repo/messages.go b/server/space/repo/messages.goindex c78a21765f..f9e9c8c66b 100644--- a/server/space/repo/messages.go+++ b/server/space/repo/messages.go@@ -24,6 +24,7 @@ const spaceMessageBaseSelectColumns = `m.recipient_space_id,COALESCE(m.message_cipher, '\x'::bytea),%[2]s AS encrypted_message_key,+ CASE WHEN m.sender_space_id = %[1]s THEN m.sender_encrypted_reaction ELSE m.recipient_encrypted_reaction END AS encrypted_reaction,m.reply_post_id,m.reply_message_id,(m.recipient_liked_at IS NOT NULL) AS liked,@@ -91,6 +92,7 @@ SELECTrecipient_space_id,message_cipher,encrypted_message_key,+ encrypted_reaction,reply_message_id,notification_created_atFROM (@@ -123,6 +125,7 @@ FROM (WHEN m.sender_space_id = $1 THEN m.sender_encrypted_message_keyELSE m.recipient_encrypted_message_keyEND AS encrypted_message_key,+ NULL::bytea AS encrypted_reaction,m.reply_message_id,CASEWHEN m.recipient_space_id = $1 AND m.kind IN ('regular', 'post_reply', 'post_like', 'friend_added') THEN m.created_at@@ -153,6 +156,7 @@ FROM (WHEN m.sender_space_id = $1 THEN m.sender_encrypted_message_keyELSE m.recipient_encrypted_message_keyEND AS encrypted_message_key,+ CASE WHEN m.sender_space_id = $1 THEN m.sender_encrypted_reaction ELSE m.recipient_encrypted_reaction END AS encrypted_reaction,m.reply_message_id,CASE WHEN m.sender_space_id = $1 THEN m.recipient_liked_at ELSE NULL::bigint END AS notification_created_at,(m.recipient_space_id = $1) AS is_outgoing@@ -317,7 +321,9 @@ func (r *MessagesRepository) SetLikeWithChanged(ctx context.Context, messageID s}result, err := r.DB.ExecContext(ctx, `UPDATE space_messages- SET recipient_liked_at = NULL+ SET recipient_liked_at = NULL,+ sender_encrypted_reaction = NULL,+ recipient_encrypted_reaction = NULLWHERE message_id = $1AND recipient_space_id = $2AND kind IN ('regular', 'post_reply')@@ -330,6 +336,27 @@ func (r *MessagesRepository) SetLikeWithChanged(ctx context.Context, messageID sreturn affected > 0, stacktrace.Propagate(err, "")}+func (r *MessagesRepository) SetReaction(ctx context.Context, messageID, actorSpaceID string, senderCipher, recipientCipher []byte) (bool, error) {+ var added bool+ err := r.DB.QueryRowContext(ctx, `+ WITH target AS (+ SELECT message_id, recipient_liked_at+ FROM space_messages+ WHERE message_id = $1 AND recipient_space_id = $2+ AND kind IN ('regular', 'post_reply') AND is_deleted = FALSE+ FOR UPDATE+ )+ UPDATE space_messages m+ SET sender_encrypted_reaction = $3,+ recipient_encrypted_reaction = $4,+ recipient_liked_at = COALESCE(target.recipient_liked_at, now_utc_micro_seconds())+ FROM target+ WHERE m.message_id = target.message_id+ RETURNING target.recipient_liked_at IS NULL+ `, messageID, actorSpaceID, senderCipher, recipientCipher).Scan(&added)+ return added, stacktrace.Propagate(err, "")+}+func (r *MessagesRepository) DeleteMessage(ctx context.Context, messageID string, senderSpaceID string) error {res, err := r.DB.ExecContext(ctx, `UPDATE space_messages@@ -389,6 +416,7 @@ func (r *MessagesRepository) ListLatestChatSummaries(ctx context.Context, vieweractivity.RecipientSpaceID = sql.NullString{}activity.MessageCipher = nilactivity.EncryptedMessageKey = nil+ activity.EncryptedReaction = nilactivity.ReplyMessageID = sql.NullString{}summary.UnreadActivities = append(summary.UnreadActivities, activity)}@@ -432,6 +460,7 @@ func scanMessageRecord(scanner interface{ Scan(dest ...any) error }) (*SpaceMess&rec.RecipientSpaceID,&rec.MessageCipher,&rec.EncryptedMessageKey,+ &rec.EncryptedReaction,&rec.ReplyPostID,&rec.ReplyMessageID,&rec.Liked,@@ -474,6 +503,7 @@ func conversationActivityScanDest(activity *SpaceMessageConversationActivityReco&activity.RecipientSpaceID,&activity.MessageCipher,&activity.EncryptedMessageKey,+ &activity.EncryptedReaction,&activity.ReplyMessageID,}}diff --git a/server/space/repo/module.go b/server/space/repo/module.goindex 2e9a4c9c63..991a5d40d1 100644--- a/server/space/repo/module.go+++ b/server/space/repo/module.go@@ -139,6 +139,7 @@ type SpaceMessageRecord struct {RecipientSpaceID stringMessageCipher []byteEncryptedMessageKey []byte+ EncryptedReaction []byteReplyPostID sql.NullInt64ReplyMessageID sql.NullStringLiked bool@@ -166,6 +167,7 @@ type SpaceMessageConversationActivityRecord struct {RecipientSpaceID sql.NullStringMessageCipher []byteEncryptedMessageKey []byte+ EncryptedReaction []byteReplyMessageID sql.NullStringPostID sql.NullInt64PostSpaceID sql.NullString