From 3f83c2f80c545daeb858801cbef6ad7c5a9c5198 Mon Sep 17 00:00:00 2001 From: Vsevolod Stakhov Date: Sun, 16 Dec 2018 17:10:50 +0000 Subject: [PATCH] [Test] Rbl: Add received and whitelists tests --- test/functional/cases/300_rbl.robot | 8 ++++++++ test/functional/configs/plugins.conf | 10 ++++++++++ test/functional/configs/rbl.conf | 27 +++++++++++++++++++++++++++ 3 files changed, 45 insertions(+) diff --git a/test/functional/cases/300_rbl.robot b/test/functional/cases/300_rbl.robot index 36d13c045..8ac96915e 100644 --- a/test/functional/cases/300_rbl.robot +++ b/test/functional/cases/300_rbl.robot @@ -28,6 +28,14 @@ RBL FROM UNKNOWN HIT ${result} = Scan Message With Rspamc ${MESSAGE} -i 4.3.2.2 Check Rspamc ${result} FAKE_RBL_UNKNOWN +RBL RECEIVED HIT + ${result} = Scan Message With Rspamc ${MESSAGE} -i 8.8.8.8 + Check Rspamc ${result} FAKE_RECEIVED_RBL_CODE_3 + +RBL FROM HIT WL + ${result} = Scan Message With Rspamc ${MESSAGE} -i 4.3.2.4 + Check Rspamc ${result} FAKE_RBL_CODE_2 inverse=True + *** Keywords *** Rbl Setup ${PLUGIN_CONFIG} = Get File ${TESTDIR}/configs/rbl.conf diff --git a/test/functional/configs/plugins.conf b/test/functional/configs/plugins.conf index c881e972e..d7a5b009c 100644 --- a/test/functional/configs/plugins.conf +++ b/test/functional/configs/plugins.conf @@ -497,6 +497,16 @@ options = { type = "a"; replies = ["127.0.0.2", "127.0.0.3"]; }, + { + name = "4.2.3.4.fake.rbl"; + type = "a"; + replies = ["127.0.0.2"]; + }, + { + name = "4.2.3.4.fake.wl"; + type = "a"; + replies = ["127.0.0.2"]; + }, { name = "4.3.2.1.fake.rbl"; type = "a"; diff --git a/test/functional/configs/rbl.conf b/test/functional/configs/rbl.conf index 15106548b..a66deea6a 100644 --- a/test/functional/configs/rbl.conf +++ b/test/functional/configs/rbl.conf @@ -12,5 +12,32 @@ rbl { "FAKE_RBL_CODE_3" = "127.0.0.3"; } } + fake_received { + from = false; + ipv4 = true; + ipv6 = true; + received = true; + rbl = "fake.rbl"; + symbol = "FAKE_RECEIVED_RBL_UNKNOWN"; + unknown = true; + returncodes = { + "FAKE_RECEIVED_RBL_CODE_2" = "127.0.0.2"; + "FAKE_RECEIVED_RBL_CODE_3" = "127.0.0.3"; + } + } + fake_whitelist { + from = true; + ipv4 = true; + ipv6 = true; + received = true; + is_whitelist = true; + rbl = "fake.wl"; + symbol = "FAKE_WL_RBL_UNKNOWN"; + unknown = true; + returncodes = { + "FAKE_WL_RBL_CODE_2" = "127.0.0.2"; + "FAKE_WL_RBL_CODE_3" = "127.0.0.3"; + } + } } } \ No newline at end of file -- 2.39.5