Integrate MediaProxy to bridge authenticated Matrix media (MSC3916) #1805
Conversation
tadzik
force-pushed
the
tadzik/media-proxy
branch
from
c942794
to
8a4eedd
Compare
tadzik
force-pushed
the
tadzik/media-proxy
branch
from
8a4eedd
to
25990cf
Compare
|
just to confirm: does this mean to say MSC3916 instead of MSC3910? 3910 is a closed, but related, MSC. |
tadzik
changed the title
Yes, correct - I copied the old number from the MAB PR :) |
|
Is a release with this planned before Synapse defaults to disallowing unauthenticated media? |
Yes, that's the plan. |
| @@ -13,7 +13,6 @@ export interface BridgeConfig { | |||
| }; | |||
| homeserver: { | |||
| url: string; | |||
| media_url?: string; | |||
There was a problem hiding this comment.
It would be kind somewhere to fail to start if this is still configured?
There was a problem hiding this comment.
I'd keep it optional (maybe with a warning?) to make sure you can rollback easily without changing the configs too much.
We do require mediaProxy being configured now, so users will surely notice the change.
| oldConfig.homeserver.media_url = newConfig.homeserver.media_url; | ||
| log.info(`Adjusted media_url to ${newConfig.homeserver.media_url}`); | ||
| if (JSON.stringify(oldConfig.ircService.mediaProxy) !== JSON.stringify(newConfig.ircService.mediaProxy)) { | ||
| await this._mediaProxy?.close(); |
We have some tests covering the case of "do these URLs look like MediaProxy's URLs" – I'm not sure how much further we want to take this, if it all. |
I think that's sufficient, upstream has tests that the MP works? |
This reduces the chance of conflict with other processes, and also stops one non-clean shutdown from blowing up the rest of the test suite.
Depends on matrix-org/matrix-appservice-bridge#444