Enhance media protections (#516)

matrix-org · Jul 29, 2024 · f526b97 · f526b97
1 parent 77357e4
commit f526b97
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 1 deletion.
diff --git a/src/protections/MessageIsMedia.ts b/src/protections/MessageIsMedia.ts
@@ -35,7 +35,11 @@ export class MessageIsMedia extends Protection {
 
     public async handleEvent(mjolnir: Mjolnir, roomId: string, event: any): Promise<any> {
         if (event['type'] === 'm.room.message') {
-            const content = event['content'] || {};
+            let content = event['content'] || {};
+            const relation = content["m.relates_to"]
+            if (relation?.["rel_type"] === "m.replace") {
+                content = content?.["m.new_content"] ?? content;
+            }
             const msgtype = content['msgtype'] || 'm.text';
             const formattedBody = content['formatted_body'] || '';
             const isMedia = msgtype === 'm.image' || msgtype === 'm.video' || msgtype === 'm.sticker' || formattedBody.toLowerCase().includes('<img');

diff --git a/test/integration/protectionSettingsTest.ts b/test/integration/protectionSettingsTest.ts
@@ -6,12 +6,16 @@ import { ProtectionSettingValidationError } from "../../src/protections/Protecti
 import { NumberProtectionSetting, StringProtectionSetting, StringListProtectionSetting } from "../../src/protections/ProtectionSettings";
 import { newTestUser, noticeListener } from "./clientHelper";
 import { matrixClient, mjolnir } from "./mjolnirSetupUtils";
+import {MessageIsMedia} from "../../src/protections/MessageIsMedia";
 
 describe("Test: Protection settings", function() {
     let client;
+    let room;
     this.beforeEach(async function () {
         client = await newTestUser(this.config.homeserverUrl, { name: { contains: "protection-settings" }});
         await client.start();
+        room = await client.createRoom();
+        await client.joinRoom(room)
     })
     this.afterEach(async function () {
         await client.stop();
@@ -158,5 +162,32 @@ describe("Test: Protection settings", function() {
             "Changed d0sNrt.test to asd2 (was asd1)"
         )
     });
+    it("Events are checked for new content under media protections", async function() {
+        this.timeout(20000);
+        await client.joinRoom(this.config.managementRoom);
+
+        await this.mjolnir.protectionManager.registerProtection(new MessageIsMedia());
+
+        // send a regular media message to make sure protections are running
+        await client.sendMessage(room, {msgtype: "m.image", body: ""})
+        let reply = () => new Promise((resolve, reject) => {
+            client.on('room.message', noticeListener(this.mjolnir.managementRoomId, (event) => {
+                if (event.content.body.includes("Redacting event")) {
+                    resolve(event);
+                }
+            }))
+        });
+        await reply;
+
+        await client.sendMessage(room, {body: "", msgtype: "m.text", "m.new_content": {msgtype: "m.image", body: ""}, "m.relates_to": {"rel_type": "m.replace"}})
+        let reply2 = () => new Promise((resolve, reject) => {
+            client.on('room.message', noticeListener(this.mjolnir.managementRoomId, (event) => {
+                if (event.content.body.includes("Redacting event")) {
+                    resolve(event);
+                }
+            }))
+        });
+        await reply2;
+    });
 });