diff options
| author | korgoth1 <vladislav.stakhov@gmail.com> | 2020-02-29 22:17:34 +0300 |
|---|---|---|
| committer | korgoth1 <vladislav.stakhov@gmail.com> | 2020-02-29 22:17:34 +0300 |
| commit | ea0dda917b19cedcd5c21deaf2ef718826051a43 (patch) | |
| tree | 18fb0492e0f9502e6317ff99657a454341969d63 /test/functional/configs | |
| parent | f5439dceb784bff970507afbdc6f6e8e37755892 (diff) | |
| download | rspamd-ea0dda917b19cedcd5c21deaf2ef718826051a43.tar.gz rspamd-ea0dda917b19cedcd5c21deaf2ef718826051a43.zip | |
[Test] URL compose map
Diffstat (limited to 'test/functional/configs')
| -rw-r--r-- | test/functional/configs/maps/url_compose_map.list | 3 | ||||
| -rw-r--r-- | test/functional/configs/maps/url_compose_map_for_mails.list | 4 | ||||
| -rw-r--r-- | test/functional/configs/plugins.conf | 35 | ||||
| -rw-r--r-- | test/functional/configs/rbl.conf | 9 | ||||
| -rw-r--r-- | test/functional/configs/surbl.conf | 6 |
5 files changed, 49 insertions, 8 deletions
diff --git a/test/functional/configs/maps/url_compose_map.list b/test/functional/configs/maps/url_compose_map.list index 06868b288..808c455ca 100644 --- a/test/functional/configs/maps/url_compose_map.list +++ b/test/functional/configs/maps/url_compose_map.list @@ -1,2 +1,3 @@ *.dirty.sanchez.com -!not.dirty.sanchez.com
\ No newline at end of file +!not.dirty.sanchez.com +41.black.sanchez.com
\ No newline at end of file diff --git a/test/functional/configs/maps/url_compose_map_for_mails.list b/test/functional/configs/maps/url_compose_map_for_mails.list index 2abdc5e32..1d54a3e2a 100644 --- a/test/functional/configs/maps/url_compose_map_for_mails.list +++ b/test/functional/configs/maps/url_compose_map_for_mails.list @@ -1 +1,3 @@ -!very.clean.exclude.com
\ No newline at end of file +*.dirty.sanchez.com +!admin.dirty.sanchez.com +41.black.sanchez.com
\ No newline at end of file diff --git a/test/functional/configs/plugins.conf b/test/functional/configs/plugins.conf index 47f2c9918..861b86545 100644 --- a/test/functional/configs/plugins.conf +++ b/test/functional/configs/plugins.conf @@ -680,6 +680,41 @@ options = { type = a; replies = ["127.0.0.2"]; }, + { + name = "41.black.sanchez.com.test7.uribl"; + type = a; + replies = ["127.0.0.2"]; + }, + { + name = "black.sanchez.com.test7.uribl"; + type = a; + replies = ["127.0.0.2"]; + }, + { + name = "user.dirty.sanchez.com.test8.uribl"; + type = a; + replies = ["127.0.0.2"]; + }, + { + name = "admin.dirty.sanchez.com.test8.uribl"; + type = a; + replies = ["127.0.0.2"]; + }, + { + name = "4.very.dirty.sanchez.com.test8.uribl"; + type = a; + replies = ["127.0.0.2"]; + }, + { + name = "41.black.sanchez.com.test8.uribl"; + type = a; + replies = ["127.0.0.2"]; + }, + { + name = "black.sanchez.com.test8.uribl"; + type = a; + replies = ["127.0.0.2"]; + }, # TODO: add IPv6 tests ]; } diff --git a/test/functional/configs/rbl.conf b/test/functional/configs/rbl.conf index 4a9318a0a..e4a57576e 100644 --- a/test/functional/configs/rbl.conf +++ b/test/functional/configs/rbl.conf @@ -31,5 +31,14 @@ rbl { "FAKE_WL_RBL_CODE_3" = "127.0.0.3"; } } + RSPAMD_EMAILBL { + rbl = "test8.uribl"; + url_compose_map = "${TESTDIR}/configs/maps/url_compose_map_for_mails.list"; + emails = true; + emails_delimiter = "."; + returncodes = { + RSPAMD_EMAILBL = "127.0.0.2"; + } + } } }
\ No newline at end of file diff --git a/test/functional/configs/surbl.conf b/test/functional/configs/surbl.conf index a2565784e..6e3a40e18 100644 --- a/test/functional/configs/surbl.conf +++ b/test/functional/configs/surbl.conf @@ -70,12 +70,6 @@ EOD; check_dkim = true; check_emails = false; } - "BAD_SUBDOMAIN_IN_MAIL" { - suffix = "test8.uribl"; - url_compose_map = "${TESTDIR}/configs/maps/url_compose_map_for_mails.list"; - check_dkim = true; - check_emails = true; - } } } |