From bd9ea7a88dc44f92516315aa1e997a7c1b0e616d Mon Sep 17 00:00:00 2001 From: Wim Date: Sat, 9 Jun 2018 14:35:02 +0200 Subject: Add MediaDownloadBlacklist option. Closes #442 --- bridge/helper/helper.go | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'bridge/helper') diff --git a/bridge/helper/helper.go b/bridge/helper/helper.go index a3f4255c..13d94ede 100644 --- a/bridge/helper/helper.go +++ b/bridge/helper/helper.go @@ -5,6 +5,7 @@ import ( "fmt" "io" "net/http" + "regexp" "strings" "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 { + // 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) if int(size) > general.MediaDownloadSize { msg.Event = config.EVENT_FILE_FAILURE_SIZE -- cgit v1.2.3