Stop bridging media from redacted events - #1865
Draft
nbuechner wants to merge 1 commit into
Draft
Conversation
Pass the source room and event ID through to MediaProxy.generateMediaUrl() so the proxy can refuse to serve media once the event sharing it has been redacted (e.g. NSFW content removed on Matrix). Requires the corresponding fix in matrix-appservice-bridge. Fixes matrix-org#1849
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
MediaProxy.generateMediaUrl()so the proxy can refuse to serve media once the event sharing it has been redacted (e.g. NSFW content removed on Matrix).Blocked on
This depends on the corresponding fix in
matrix-appservice-bridge: matrix-org/matrix-appservice-bridge#527.generateMediaUrl()'s new{ roomId, eventId }parameter only exists on that unmerged branch, so CI here will fail (matrix-appservice-bridgetype mismatch) until #527 merges and a new version is released. Marking as draft until then, at which point I'll bump thematrix-appservice-bridgedependency version and mark ready for review.Test plan
matrix-appservice-bridgeto the released version once MediaProxy: refuse to serve media whose source event has been redacted matrix-appservice-bridge#527 ships.Fixes #1849