mirror of
https://github.com/cwinfo/matterbridge.git
synced 2024-11-09 15:40:27 +00:00
Add MediaDownloadBlacklist option. Closes #442
This commit is contained in:
parent
51327a4056
commit
bd9ea7a88d
@ -74,10 +74,11 @@ type Protocol struct {
|
|||||||
Jid string // xmpp
|
Jid string // xmpp
|
||||||
Label string // all protocols
|
Label string // all protocols
|
||||||
Login string // mattermost, matrix
|
Login string // mattermost, matrix
|
||||||
|
MediaDownloadBlackList []string
|
||||||
|
MediaDownloadPath string // Basically MediaServerUpload, but instead of uploading it, just write it to a file on the same server.
|
||||||
MediaDownloadSize int // all protocols
|
MediaDownloadSize int // all protocols
|
||||||
MediaServerDownload string
|
MediaServerDownload string
|
||||||
MediaServerUpload string
|
MediaServerUpload string
|
||||||
MediaDownloadPath string // Basically MediaServerUpload, but instead of uploading it, just write it to a file on the same server.
|
|
||||||
MessageDelay int // IRC, time in millisecond to wait between messages
|
MessageDelay int // IRC, time in millisecond to wait between messages
|
||||||
MessageFormat string // telegram
|
MessageFormat string // telegram
|
||||||
MessageLength int // IRC, max length of a message allowed
|
MessageLength int // IRC, max length of a message allowed
|
||||||
|
@ -5,6 +5,7 @@ import (
|
|||||||
"fmt"
|
"fmt"
|
||||||
"io"
|
"io"
|
||||||
"net/http"
|
"net/http"
|
||||||
|
"regexp"
|
||||||
"strings"
|
"strings"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
@ -73,6 +74,19 @@ func GetAvatar(av map[string]string, userid string, general *config.Protocol) st
|
|||||||
}
|
}
|
||||||
|
|
||||||
func HandleDownloadSize(flog *log.Entry, msg *config.Message, name string, size int64, general *config.Protocol) error {
|
func HandleDownloadSize(flog *log.Entry, msg *config.Message, name string, size int64, general *config.Protocol) error {
|
||||||
|
// check blacklist here
|
||||||
|
for _, entry := range general.MediaDownloadBlackList {
|
||||||
|
if entry != "" {
|
||||||
|
re, err := regexp.Compile(entry)
|
||||||
|
if err != nil {
|
||||||
|
flog.Errorf("incorrect regexp %s for %s", entry, msg.Account)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if re.MatchString(name) {
|
||||||
|
return fmt.Errorf("Matching blacklist %s. Not downloading %s", entry, name)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
flog.Debugf("Trying to download %#v with size %#v", name, size)
|
flog.Debugf("Trying to download %#v with size %#v", name, size)
|
||||||
if int(size) > general.MediaDownloadSize {
|
if int(size) > general.MediaDownloadSize {
|
||||||
msg.Event = config.EVENT_FILE_FAILURE_SIZE
|
msg.Event = config.EVENT_FILE_FAILURE_SIZE
|
||||||
|
@ -1331,9 +1331,15 @@ MediaServerDownload="https://youserver.com/download"
|
|||||||
#It will only download from bridges that don't have public links available, which are for the moment
|
#It will only download from bridges that don't have public links available, which are for the moment
|
||||||
#slack, telegram, matrix and mattermost
|
#slack, telegram, matrix and mattermost
|
||||||
#
|
#
|
||||||
#Optional (default 1000000 (1 megabyte))
|
#OPTIONAL (default 1000000 (1 megabyte))
|
||||||
MediaDownloadSize=1000000
|
MediaDownloadSize=1000000
|
||||||
|
|
||||||
|
#MediaDownloadBlacklist allows you to blacklist specific files from being downloaded.
|
||||||
|
#Filenames matching these regexp will not be download/uploaded to the mediaserver
|
||||||
|
#You can use regex for this, see https://regex-golang.appspot.com/assets/html/index.html for more regex info
|
||||||
|
#OPTIONAL (default empty)
|
||||||
|
MediaDownloadBlacklist=[".html$",".htm$"]
|
||||||
|
|
||||||
###################################################################
|
###################################################################
|
||||||
#Gateway configuration
|
#Gateway configuration
|
||||||
###################################################################
|
###################################################################
|
||||||
|
Loading…
Reference in New Issue
Block a user