From a01edae1c3d6fe9491d45ebfe5ac899f355650e5 Mon Sep 17 00:00:00 2001
From: Tulir Asokan <tulir@maunium.net>
Date: Mon, 10 Mar 2025 22:52:06 +0200
Subject: [PATCH] bridgev2/portal: don't bridge remote edits by different users

---
 bridgev2/portal.go | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/bridgev2/portal.go b/bridgev2/portal.go
index dcd3cd37..409a9c10 100644
--- a/bridgev2/portal.go
+++ b/bridgev2/portal.go
@@ -2095,6 +2095,12 @@ func (portal *Portal) handleRemoteEdit(ctx context.Context, source *UserLogin, e
 	intent := portal.GetIntentFor(ctx, evt.GetSender(), source, RemoteEventEdit)
 	if intent == nil {
 		return
+	} else if intent.GetMXID() != existing[0].SenderMXID {
+		log.Warn().
+			Stringer("edit_sender_mxid", intent.GetMXID()).
+			Stringer("original_sender_mxid", existing[0].SenderMXID).
+			Msg("Not bridging edit: sender doesn't match original message sender")
+		return
 	}
 	ts := getEventTS(evt)
 	converted, err := evt.ConvertEdit(ctx, portal, intent, existing)