Use axios and more safety around file uploads #466
Conversation
src/BridgedRoom.ts
Outdated
| log.error("We have no client (or token) that can handle this file, sending as link"); | ||
| sendAsLink = true; | ||
| } else if (maxUploadSize && file.size > maxUploadSize) { | ||
| log.warn(`File size too large (${file.size / 1024}KB > ${maxUploadSize / 1024} KB)`); |
There was a problem hiding this comment.
KiB when dividing by 1024.
| log.warn(`File size too large (${file.size / 1024}KB > ${maxUploadSize / 1024} KB)`); | |
| log.warn(`File size too large (${file.size / 1024}KiB > ${maxUploadSize / 1024} KiB)`); |
There was a problem hiding this comment.
👍 i get those mixed up
| @@ -676,12 +676,36 @@ export class BridgedRoom { | |||
| return; | |||
| } | |||
|
|
|||
| let sendAsLink = false; | |||
| const authToken = this.SlackClient?.token; | |||
There was a problem hiding this comment.
Did you mean to use client or why did you add that seemingly unused parameter?
There was a problem hiding this comment.
I think the param was used originally then removed. Removing it now.
| @@ -0,0 +1 @@ | |||
| Don't automatically join new users to all public channels | |||
There was a problem hiding this comment.
i think someone (me) might have left out a file from another PR :s
|
i've just deployed the docker container including this fix and now all image uploads from slack are corrupt in matrix. when downloading and opening the image from matrix (e.g. https://synapse.jobmachine.org/_matrix/media/r0/download/jobmachine.org/pSdoKVhARBgOFICbhfvGrjLk and https://synapse.jobmachine.org/_matrix/media/r0/download/jobmachine.org/iDKjBHZSrMGwXPTAHDYTkRFR are a few examples from my testing) the file either just says "Error serving file", or shows that it is an image data file, but no image programs can open it properly (chromium, GIMP, feh, etc). GIMP says "Not a JPEG file: starts with 0xef 0xbf" this testing includes examples where i both waited for the image processing dialogs to finish in slack before sending to the channel, and tests where i did not. i've used several images of varying sizes, but i haven't had a single one come through to matrix yet. |
Sad :c. I'll take another look. |
Hopefully fixes #465