diff options
| author | Andrew Lewis <nerf@judo.za.org> | 2017-12-08 15:40:21 +0200 |
|---|---|---|
| committer | Andrew Lewis <nerf@judo.za.org> | 2017-12-08 15:40:21 +0200 |
| commit | 03cf7aff97c45a3fdbae75da0d7596cef9578a81 (patch) | |
| tree | c6e6c356b44b8b78e44692d18c46d2ed13ca19fa /test/functional/configs | |
| parent | 09f3015da643b82e24b054f1704aa6783bfc79e8 (diff) | |
| download | rspamd-03cf7aff97c45a3fdbae75da0d7596cef9578a81.tar.gz rspamd-03cf7aff97c45a3fdbae75da0d7596cef9578a81.zip | |
[Test] Redis key expansion & antivirus ordered patterns
Diffstat (limited to 'test/functional/configs')
| -rw-r--r-- | test/functional/configs/antivirus.conf | 15 | ||||
| -rw-r--r-- | test/functional/configs/multimap.conf | 16 |
2 files changed, 31 insertions, 0 deletions
diff --git a/test/functional/configs/antivirus.conf b/test/functional/configs/antivirus.conf index a4b0739aa..432d9a2de 100644 --- a/test/functional/configs/antivirus.conf +++ b/test/functional/configs/antivirus.conf @@ -17,4 +17,19 @@ antivirus { FPROT_EICAR = "^EICAR_Test_File$"; } } + fprot_duplicate { + prefix = "fp_dupe"; + attachments_only = false; + symbol = "FPROT_VIRUS_DUPLICATE_DEFAULT"; + type = "fprot"; + servers = "127.0.0.1:${PORT_FPROT_DUPLICATE}"; + patterns = [ + {FPROT_VIRUS_DUPLICATE_PATTERN = "^E"}, + {FPROT_VIRUS_DUPLICATE_NOPE1 = "^EI", + FPROT_VIRUS_DUPLICATE_NOPE2 = "^EIC", + FPROT_VIRUS_DUPLICATE_NOPE3 = "^EICA", + FPROT_VIRUS_DUPLICATE_NOPE4 = "^EICAR", + FPROT_VIRUS_DUPLICATE_NOPE5 = "^EICAR_"} + ]; + } } diff --git a/test/functional/configs/multimap.conf b/test/functional/configs/multimap.conf index 1c262a287..28d84f38e 100644 --- a/test/functional/configs/multimap.conf +++ b/test/functional/configs/multimap.conf @@ -2,6 +2,7 @@ asn { } redis { servers = "${REDIS_ADDR}:${REDIS_PORT}"; + expand_keys = true; } multimap { DNSBL_MAP { @@ -65,6 +66,10 @@ multimap { type = "hostname"; map = "redis://hostname"; } + REDIS_HOSTNAME_EXPANSION { + type = "hostname"; + map = "redis://\${ip}.\${principal_recipient_domain}"; + } REDIS_IPADDR { type = "ip"; map = "redis://ipaddr"; @@ -136,4 +141,15 @@ multimap { type = "received"; map = "redis://RCVD_TEST"; } + RCVD_AUTHED_ONE { + type = "received"; + map = "${TESTDIR}/configs/maps/rcvd2.list"; + flags = ["authenticated"]; + nflags = ["ssl"]; + } + RCVD_AUTHED_TWO { + type = "received"; + map = "${TESTDIR}/configs/maps/rcvd2.list"; + flags = ["authenticated", "ssl"]; + } } |