mirror of
https://github.com/cwinfo/matterbridge.git
synced 2024-11-13 00:10:26 +00:00
Matrix: Permit uploading files of other mimetypes (#1237)
This includes at least c-source-files, cpp-source-files, markdown-files, Rust-files, and plaintext files. We already allow uploading arbitrary executables. (And javascript-files, coincidentally.) Not permitting these other text files would be highly unexpected.
This commit is contained in:
parent
91c58ec027
commit
06eb89b05b
@ -333,10 +333,6 @@ func (b *Bmatrix) handleUploadFile(msg *config.Message, channel string, fi *conf
|
|||||||
content := bytes.NewReader(*fi.Data)
|
content := bytes.NewReader(*fi.Data)
|
||||||
sp := strings.Split(fi.Name, ".")
|
sp := strings.Split(fi.Name, ".")
|
||||||
mtype := mime.TypeByExtension("." + sp[len(sp)-1])
|
mtype := mime.TypeByExtension("." + sp[len(sp)-1])
|
||||||
if !(strings.Contains(mtype, "image") || strings.Contains(mtype, "video") ||
|
|
||||||
strings.Contains(mtype, "application") || strings.Contains(mtype, "audio")) {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
if fi.Comment != "" {
|
if fi.Comment != "" {
|
||||||
_, err := b.mc.SendText(channel, msg.Username+fi.Comment)
|
_, err := b.mc.SendText(channel, msg.Username+fi.Comment)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@ -369,20 +365,6 @@ func (b *Bmatrix) handleUploadFile(msg *config.Message, channel string, fi *conf
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
b.Log.Errorf("sendImage failed: %#v", err)
|
b.Log.Errorf("sendImage failed: %#v", err)
|
||||||
}
|
}
|
||||||
case strings.Contains(mtype, "application"):
|
|
||||||
b.Log.Debugf("sendFile %s", res.ContentURI)
|
|
||||||
_, err = b.mc.SendMessageEvent(channel, "m.room.message", matrix.FileMessage{
|
|
||||||
MsgType: "m.file",
|
|
||||||
Body: fi.Name,
|
|
||||||
URL: res.ContentURI,
|
|
||||||
Info: matrix.FileInfo{
|
|
||||||
Mimetype: mtype,
|
|
||||||
Size: uint(len(*fi.Data)),
|
|
||||||
},
|
|
||||||
})
|
|
||||||
if err != nil {
|
|
||||||
b.Log.Errorf("sendFile failed: %#v", err)
|
|
||||||
}
|
|
||||||
case strings.Contains(mtype, "audio"):
|
case strings.Contains(mtype, "audio"):
|
||||||
b.Log.Debugf("sendAudio %s", res.ContentURI)
|
b.Log.Debugf("sendAudio %s", res.ContentURI)
|
||||||
_, err = b.mc.SendMessageEvent(channel, "m.room.message", matrix.AudioMessage{
|
_, err = b.mc.SendMessageEvent(channel, "m.room.message", matrix.AudioMessage{
|
||||||
@ -397,6 +379,20 @@ func (b *Bmatrix) handleUploadFile(msg *config.Message, channel string, fi *conf
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
b.Log.Errorf("sendAudio failed: %#v", err)
|
b.Log.Errorf("sendAudio failed: %#v", err)
|
||||||
}
|
}
|
||||||
|
default:
|
||||||
|
b.Log.Debugf("sendFile %s", res.ContentURI)
|
||||||
|
_, err = b.mc.SendMessageEvent(channel, "m.room.message", matrix.FileMessage{
|
||||||
|
MsgType: "m.file",
|
||||||
|
Body: fi.Name,
|
||||||
|
URL: res.ContentURI,
|
||||||
|
Info: matrix.FileInfo{
|
||||||
|
Mimetype: mtype,
|
||||||
|
Size: uint(len(*fi.Data)),
|
||||||
|
},
|
||||||
|
})
|
||||||
|
if err != nil {
|
||||||
|
b.Log.Errorf("sendFile failed: %#v", err)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
b.Log.Debugf("result: %#v", res)
|
b.Log.Debugf("result: %#v", res)
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user