diff options
| author | korgoth1 <vladislav.stakhov@gmail.com> | 2020-02-29 14:52:27 +0300 |
|---|---|---|
| committer | korgoth1 <vladislav.stakhov@gmail.com> | 2020-02-29 14:52:27 +0300 |
| commit | a06ceaddcb133c5aeb9f966cde59677e8ea41262 (patch) | |
| tree | 935d5ebf5b635b6b0b5dc74c27c734b9347d68d6 /test/functional/configs | |
| parent | fee3538325652383a2d79dd12095f3bef263ab9e (diff) | |
| download | rspamd-a06ceaddcb133c5aeb9f966cde59677e8ea41262.tar.gz rspamd-a06ceaddcb133c5aeb9f966cde59677e8ea41262.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 | 1 | ||||
| -rw-r--r-- | test/functional/configs/plugins.conf | 10 | ||||
| -rw-r--r-- | test/functional/configs/surbl.conf | 11 |
4 files changed, 20 insertions, 5 deletions
diff --git a/test/functional/configs/maps/url_compose_map.list b/test/functional/configs/maps/url_compose_map.list index da65ffb0f..06868b288 100644 --- a/test/functional/configs/maps/url_compose_map.list +++ b/test/functional/configs/maps/url_compose_map.list @@ -1 +1,2 @@ -*.dirty.sanchez.com
\ No newline at end of file +*.dirty.sanchez.com +!not.dirty.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 new file mode 100644 index 000000000..2abdc5e32 --- /dev/null +++ b/test/functional/configs/maps/url_compose_map_for_mails.list @@ -0,0 +1 @@ +!very.clean.exclude.com
\ No newline at end of file diff --git a/test/functional/configs/plugins.conf b/test/functional/configs/plugins.conf index 17f004843..817b5e4db 100644 --- a/test/functional/configs/plugins.conf +++ b/test/functional/configs/plugins.conf @@ -670,6 +670,16 @@ options = { type = a; replies = ["127.0.0.2"]; }, + { + name = "clean.dirty.sanchez.com.test7.uribl"; + type = a; + replies = ["127.0.0.2"]; + }, + { + name = "not.dirty.sanchez.com.test7.uribl"; + type = a; + replies = ["127.0.0.2"]; + }, # TODO: add IPv6 tests ]; } diff --git a/test/functional/configs/surbl.conf b/test/functional/configs/surbl.conf index 764d5edd8..a2565784e 100644 --- a/test/functional/configs/surbl.conf +++ b/test/functional/configs/surbl.conf @@ -2,9 +2,6 @@ surbl { "whitelist" = [ "rspamd-test.com" ]; - "url_compose_map" = [ - "${TESTDIR}/configs/maps/url_compose_map.list", - ]; rules { "RSPAMD_URIBL" { suffix = "test.uribl"; @@ -69,9 +66,15 @@ EOD; } "BAD_SUBDOMAIN" { suffix = "test7.uribl"; + url_compose_map = "${TESTDIR}/configs/maps/url_compose_map.list"; check_dkim = true; check_emails = false; - images = true; + } + "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; } } } |