Skip to content

Stop bridging media from redacted events #1865

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
nbuechner wants to merge 1 commit into
base: develop
Choose a base branch
from
Draft

Stop bridging media from redacted events #1865

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/1849.bugfix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
The bridge's media proxy no longer serves media whose source Matrix event has since been redacted.
5 changes: 4 additions & 1 deletion src/models/MatrixAction.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,10 @@ export class MatrixAction {
fileSize = "(" + Math.round(event.content.info.size / 1024) + "KiB)";
}

const url = await mediaProxy.generateMediaUrl(event.content.url);
const url = await mediaProxy.generateMediaUrl(event.content.url, {
roomId: event.room_id,
eventId: event.event_id,
});
if (!filename && event.content.body && /\S*\.[\w\d]{2,4}$/.test(event.content.body)) {
// Add filename to url if body is a filename.
filename = event.content.body;
Expand Down