From: korgoth1 Date: Sat, 29 Feb 2020 19:17:34 +0000 (+0300) Subject: [Test] URL compose map X-Git-Tag: 2.5~67^2~1 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ea0dda917b19cedcd5c21deaf2ef718826051a43;p=thirdparty%2Frspamd.git [Test] URL compose map --- diff --git a/test/functional/cases/300_rbl.robot b/test/functional/cases/300_rbl.robot index 8ac96915e3..525786eb74 100644 --- a/test/functional/cases/300_rbl.robot +++ b/test/functional/cases/300_rbl.robot @@ -36,6 +36,19 @@ RBL FROM HIT WL ${result} = Scan Message With Rspamc ${MESSAGE} -i 4.3.2.4 Check Rspamc ${result} FAKE_RBL_CODE_2 inverse=True +EMAILBL Compose Map 1 + ${result} = Scan Message With Rspamc ${TESTDIR}/messages/url14.eml + Should Contain ${result.stdout} RSPAMD_EMAILBL (0.00)[user.dirty.sanchez.com:email] + +EMAILBL Compose Map 2 + ${result} = Scan Message With Rspamc ${TESTDIR}/messages/url15.eml + Should Contain ${result.stdout} RSPAMD_EMAILBL (0.00)[4.very.dirty.sanchez.com:email] + +EMAILBL Compose Map 3 + ${result} = Scan Message With Rspamc ${TESTDIR}/messages/url16.eml + Should Contain ${result.stdout} RSPAMD_EMAILBL (0.00)[41.black.sanchez.com:email] + + *** Keywords *** Rbl Setup ${PLUGIN_CONFIG} = Get File ${TESTDIR}/configs/rbl.conf diff --git a/test/functional/cases/340_surbl.robot b/test/functional/cases/340_surbl.robot index 68088ed45b..ab89b9def0 100644 --- a/test/functional/cases/340_surbl.robot +++ b/test/functional/cases/340_surbl.robot @@ -151,9 +151,17 @@ SURBL html entity­ ${result} = Scan Message With Rspamc ${TESTDIR}/messages/url10.eml Should Contain ${result.stdout} RSPAMD_URIBL -SURBL url compose map +SURBL url compose map 1 ${result} = Scan Message With Rspamc ${TESTDIR}/messages/url11.eml - Should Contain ${result.stdout} BAD_SUBDOMAIN (0.00)[4.very.dirty.sanchez.com:url, clean.dirty.sanchez.com:url] + Should Contain ${result.stdout} BAD_SUBDOMAIN (0.00)[clean.dirty.sanchez.com:url] + +SURBL url compose map 2 + ${result} = Scan Message With Rspamc ${TESTDIR}/messages/url12.eml + Should Contain ${result.stdout} BAD_SUBDOMAIN (0.00)[4.very.dirty.sanchez.com:url] + +SURBL url compose map 3 + ${result} = Scan Message With Rspamc ${TESTDIR}/messages/url13.eml + Should Contain ${result.stdout} BAD_SUBDOMAIN (0.00)[41.black.sanchez.com:url] *** Keywords *** Surbl Setup diff --git a/test/functional/configs/maps/url_compose_map.list b/test/functional/configs/maps/url_compose_map.list index 06868b288c..808c455ca9 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 2abdc5e326..1d54a3e2af 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 47f2c99182..861b865451 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 4a9318a0a2..e4a57576ec 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 a2565784e8..6e3a40e180 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; - } } } diff --git a/test/functional/messages/url11.eml b/test/functional/messages/url11.eml index 0b19c5eee5..82ddbf77d6 100644 --- a/test/functional/messages/url11.eml +++ b/test/functional/messages/url11.eml @@ -1,5 +1,4 @@ Content-Type: text/plain http://clean.dirty.sanchez.com -http://not.dirty.sanchez.com -http://4.very.dirty.sanchez.com \ No newline at end of file +http://not.dirty.sanchez.com \ No newline at end of file diff --git a/test/functional/messages/url12.eml b/test/functional/messages/url12.eml index b8467f6809..75e8ecc515 100644 --- a/test/functional/messages/url12.eml +++ b/test/functional/messages/url12.eml @@ -1,3 +1,4 @@ Content-Type: text/plain +http://4.very.dirty.sanchez.com http://not.dirty.sanchez.com \ No newline at end of file diff --git a/test/functional/messages/url13.eml b/test/functional/messages/url13.eml new file mode 100644 index 0000000000..f73c9651fb --- /dev/null +++ b/test/functional/messages/url13.eml @@ -0,0 +1,4 @@ +Content-Type: text/plain + +http://41.black.sanchez.com +http://black.sanchez.com \ No newline at end of file diff --git a/test/functional/messages/url14.eml b/test/functional/messages/url14.eml new file mode 100644 index 0000000000..42653a6141 --- /dev/null +++ b/test/functional/messages/url14.eml @@ -0,0 +1,4 @@ +Content-Type: text/plain + +user@dirty.sanchez.com +admin@dirty.sanchez.com \ No newline at end of file diff --git a/test/functional/messages/url15.eml b/test/functional/messages/url15.eml new file mode 100644 index 0000000000..a55521e312 --- /dev/null +++ b/test/functional/messages/url15.eml @@ -0,0 +1,4 @@ +Content-Type: text/plain + +4@very.dirty.sanchez.com +admin@dirty.sanchez.com \ No newline at end of file diff --git a/test/functional/messages/url16.eml b/test/functional/messages/url16.eml new file mode 100644 index 0000000000..49bd398aab --- /dev/null +++ b/test/functional/messages/url16.eml @@ -0,0 +1,4 @@ +Content-Type: text/plain + +41@black.sanchez.com +black@sanchez.com \ No newline at end of file