commit 388c82f: [Test] 115 Dmarc is now separated by 115 dmarc, 116 dkim, 117 spf.
korgoth1
vladislav.stakhov at gmail.com
Tue Dec 3 09:49:06 UTC 2019
Author: korgoth1
Date: 2019-12-02 20:49:54 +0300
URL: https://github.com/rspamd/rspamd/commit/388c82ffff6cf9dee3942212f5fc94f0230e211b
[Test] 115 Dmarc is now separated by 115 dmarc, 116 dkim, 117 spf.
---
test/functional/cases/115_dmarc.robot | 132 ---------------------
.../cases/{130_dkim.robot => 116_dkim.robot} | 33 +++++-
.../cases/{115_dmarc.robot => 117_spf.robot} | 101 +---------------
test/functional/configs/plugins.conf | 10 ++
test/functional/configs/spf.conf | 1 +
5 files changed, 43 insertions(+), 234 deletions(-)
diff --git a/test/functional/cases/115_dmarc.robot b/test/functional/cases/115_dmarc.robot
index 597a6a330..a3c60f83f 100644
--- a/test/functional/cases/115_dmarc.robot
+++ b/test/functional/cases/115_dmarc.robot
@@ -87,138 +87,6 @@ DMARC PCT ZERO SP QUARANTINE
... -i 37.48.67.26 --from foo at mom.za.org
Check Rspamc ${result} DMARC_POLICY_SOFTFAIL
-DKIM PERMFAIL NXDOMAIN
- ${result} = Scan Message With Rspamc ${TESTDIR}/messages/dmarc/bad_dkim2.eml
- ... -i 37.48.67.26
- Check Rspamc ${result} R_DKIM_PERMFAIL
-
-DKIM PERMFAIL BAD RECORD
- ${result} = Scan Message With Rspamc ${TESTDIR}/messages/dmarc/bad_dkim1.eml
- ... -i 37.48.67.26
- Check Rspamc ${result} R_DKIM_PERMFAIL
-
-DKIM TEMPFAIL SERVFAIL UNALIGNED
- ${result} = Scan Message With Rspamc ${TESTDIR}/messages/dmarc/bad_dkim3.eml
- ... -i 37.48.67.26
- Check Rspamc ${result} R_DKIM_TEMPFAIL
- Should Contain ${result.stdout} DMARC_POLICY_SOFTFAIL
-
-DKIM NA NOSIG
- ${result} = Scan Message With Rspamc ${TESTDIR}/messages/utf.eml
- ... -i 37.48.67.26
- Check Rspamc ${result} R_DKIM_NA
-
-SPF PERMFAIL UNRESOLVEABLE INCLUDE
- ${result} = Scan Message With Rspamc ${TESTDIR}/messages/dmarc/bad_dkim1.eml
- ... -i 37.48.67.26 -F x at fail3.org.org.za
- Check Rspamc ${result} R_SPF_PERMFAIL
-
-SPF DNSFAIL FAILED INCLUDE UNALIGNED
- ${result} = Scan Message With Rspamc ${TESTDIR}/messages/dmarc/bad_dkim1.eml
- ... -i 8.8.8.8 -F x at fail2.org.org.za
- Check Rspamc ${result} R_SPF_DNSFAIL
- Should Contain ${result.stdout} DMARC_POLICY_SOFTFAIL
-
-SPF ALLOW UNRESOLVEABLE INCLUDE
- ${result} = Scan Message With Rspamc ${TESTDIR}/messages/dmarc/bad_dkim1.eml
- ... -i 8.8.8.8 -F x at fail3.org.org.za
- Check Rspamc ${result} R_SPF_ALLOW
-
-SPF ALLOW FAILED INCLUDE
- ${result} = Scan Message With Rspamc ${TESTDIR}/messages/dmarc/bad_dkim1.eml
- ... -i 8.8.4.4 -F x at fail2.org.org.za
- Check Rspamc ${result} R_SPF_ALLOW
-
-SPF NA NA
- ${result} = Scan Message With Rspamc ${TESTDIR}/messages/dmarc/bad_dkim1.eml
- ... -i 8.8.8.8 -F x at za
- Check Rspamc ${result} R_SPF_NA
-
-SPF NA NOREC
- ${result} = Scan Message With Rspamc ${TESTDIR}/messages/dmarc/bad_dkim1.eml
- ... -i 8.8.8.8 -F x at co.za
- Check Rspamc ${result} R_SPF_NA
-
-SPF NA NXDOMAIN
- ${result} = Scan Message With Rspamc ${TESTDIR}/messages/dmarc/bad_dkim1.eml
- ... -i 8.8.8.8 -F x at zzzzaaaa
- Check Rspamc ${result} R_SPF_NA
-
-SPF PERMFAIL UNRESOLVEABLE REDIRECT
- ${result} = Scan Message With Rspamc ${TESTDIR}/messages/dmarc/bad_dkim1.eml
- ... -i 8.8.8.8 -F x at fail4.org.org.za
- Check Rspamc ${result} R_SPF_PERMFAIL
-
-SPF REDIRECT NO USEABLE ELEMENTS
- ${result} = Scan Message With Rspamc ${TESTDIR}/messages/dmarc/bad_dkim1.eml
- ... -i 8.8.8.8 -F x at fail10.org.org.za
- Check Rspamc ${result} R_SPF_PERMFAIL
-
-SPF DNSFAIL FAILED REDIRECT
- ${result} = Scan Message With Rspamc ${TESTDIR}/messages/dmarc/bad_dkim1.eml
- ... -i 8.8.8.8 -F x at fail1.org.org.za
- Check Rspamc ${result} R_SPF_DNSFAIL
-
-SPF PERMFAIL NO USEABLE ELEMENTS
- ${result} = Scan Message With Rspamc ${TESTDIR}/messages/dmarc/bad_dkim1.eml
- ... -i 8.8.8.8 -F x at fail5.org.org.za
- Check Rspamc ${result} R_SPF_PERMFAIL
-
-SPF FAIL
- ${result} = Scan Message With Rspamc ${TESTDIR}/messages/dmarc/bad_dkim1.eml
- ... -i 8.8.8.8 -F x at example.net
- Check Rspamc ${result} R_SPF_FAIL
-
-SPF PERMFAIL UNRESOLVEABLE MX
- ${result} = Scan Message With Rspamc ${TESTDIR}/messages/dmarc/bad_dkim1.eml
- ... -i 1.2.3.4 -F x at fail6.org.org.za
- Check Rspamc ${result} R_SPF_PERMFAIL
-
-SPF PERMFAIL UNRESOLVEABLE A
- ${result} = Scan Message With Rspamc ${TESTDIR}/messages/dmarc/bad_dkim1.eml
- ... -i 1.2.3.4 -F x at fail7.org.org.za
- Check Rspamc ${result} R_SPF_PERMFAIL
-
-SPF DNSFAIL FAILED A
- ${result} = Scan Message With Rspamc ${TESTDIR}/messages/dmarc/bad_dkim1.eml
- ... -i 1.2.3.4 -F x at fail8.org.org.za
- Check Rspamc ${result} R_SPF_DNSFAIL
-
-SPF DNSFAIL FAILED MX
- ${result} = Scan Message With Rspamc ${TESTDIR}/messages/dmarc/bad_dkim1.eml
- ... -i 1.2.3.4 -F x at fail9.org.org.za
- Check Rspamc ${result} R_SPF_DNSFAIL
-
-SPF DNSFAIL FAILED RECORD
- ${result} = Scan Message With Rspamc ${TESTDIR}/messages/dmarc/bad_dkim1.eml
- ... -i 1.2.3.4 -F x at www.dnssec-failed.org
- Check Rspamc ${result} R_SPF_DNSFAIL
-
-SPF PASS INCLUDE
- ${result} = Scan Message With Rspamc ${TESTDIR}/messages/dmarc/bad_dkim1.eml
- ... -i 8.8.8.8 -F x at pass1.org.org.za
- Check Rspamc ${result} R_SPF_ALLOW
-
-SPF PTRS
- ${result} = Scan Message With Rspamc /dev/null
- ... -i 88.99.142.95 -F foo at crazyspf.cacophony.za.org
- Check Rspamc ${result} R_SPF_ALLOW
- ${result} = Scan Message With Rspamc /dev/null
- ... -i 128.66.0.1 -F foo at crazyspf.cacophony.za.org
- Check Rspamc ${result} R_SPF_PERMFAIL
- ${result} = Scan Message With Rspamc /dev/null
- ... -i 209.85.216.182 -F foo at crazyspf.cacophony.za.org
- Check Rspamc ${result} R_SPF_FAIL
- #${result} = Scan Message With Rspamc /dev/null
- #... -i 98.138.91.166 -F foo at crazyspf.cacophony.za.org
- #Check Rspamc ${result} R_SPF_ALLOW
- #${result} = Scan Message With Rspamc /dev/null
- #... -i 98.138.91.167 -F foo at crazyspf.cacophony.za.org
- #Check Rspamc ${result} R_SPF_ALLOW
- #${result} = Scan Message With Rspamc /dev/null
- #... -i 98.138.91.168 -F foo at crazyspf.cacophony.za.org
- #Check Rspamc ${result} R_SPF_ALLOW
-
*** Keywords ***
DMARC Setup
${PLUGIN_CONFIG} = Get File ${TESTDIR}/configs/dmarc.conf
diff --git a/test/functional/cases/130_dkim.robot b/test/functional/cases/116_dkim.robot
similarity index 50%
rename from test/functional/cases/130_dkim.robot
rename to test/functional/cases/116_dkim.robot
index ad0b27ac4..79a40b1e6 100644
--- a/test/functional/cases/130_dkim.robot
+++ b/test/functional/cases/116_dkim.robot
@@ -1,15 +1,36 @@
*** Settings ***
-Suite Setup Generic Setup
+Suite Setup DKIM Setup
Suite Teardown Simple Teardown
Library ${TESTDIR}/lib/rspamd.py
Resource ${TESTDIR}/lib/rspamd.robot
Variables ${TESTDIR}/lib/vars.py
*** Variables ***
-${CONFIG} ${TESTDIR}/configs/dkim.conf
+${CONFIG} ${TESTDIR}/configs/plugins.conf
${RSPAMD_SCOPE} Suite
+${URL_TLD} ${TESTDIR}/../../contrib/publicsuffix/effective_tld_names.dat
*** Test Cases ***
+DKIM PERMFAIL NXDOMAIN
+ ${result} = Scan Message With Rspamc ${TESTDIR}/messages/dmarc/bad_dkim2.eml
+ ... -i 37.48.67.26
+ Check Rspamc ${result} R_DKIM_PERMFAIL
+
+DKIM PERMFAIL BAD RECORD
+ ${result} = Scan Message With Rspamc ${TESTDIR}/messages/dmarc/bad_dkim1.eml
+ ... -i 37.48.67.26
+ Check Rspamc ${result} R_DKIM_PERMFAIL
+
+DKIM TEMPFAIL SERVFAIL UNALIGNED
+ ${result} = Scan Message With Rspamc ${TESTDIR}/messages/dmarc/bad_dkim3.eml
+ ... -i 37.48.67.26
+ Check Rspamc ${result} R_DKIM_TEMPFAIL
+
+DKIM NA NOSIG
+ ${result} = Scan Message With Rspamc ${TESTDIR}/messages/utf.eml
+ ... -i 37.48.67.26
+ Check Rspamc ${result} R_DKIM_NA
+
DKIM Sign
Set Suite Variable ${RAN_SIGNTEST} 0
${result} = Scan Message With Rspamc ${TESTDIR}/messages/spam_message.eml --mime --header=dodkim=1
@@ -29,4 +50,10 @@ DKIM Verify ED25519 PASS
DKIM Verify ED25519 REJECT
${result} = Scan Message With Rspamc ${TESTDIR}/messages/ed25519-broken.eml
- Check Rspamc ${result} R_DKIM_REJECT
\ No newline at end of file
+ Check Rspamc ${result} R_DKIM_REJECT
+
+*** Keywords ***
+DKIM Setup
+ ${PLUGIN_CONFIG} = Get File ${TESTDIR}/configs/dkim.conf
+ Set Suite Variable ${PLUGIN_CONFIG}
+ Generic Setup PLUGIN_CONFIG
diff --git a/test/functional/cases/115_dmarc.robot b/test/functional/cases/117_spf.robot
similarity index 55%
copy from test/functional/cases/115_dmarc.robot
copy to test/functional/cases/117_spf.robot
index 597a6a330..2ac6997b6 100644
--- a/test/functional/cases/115_dmarc.robot
+++ b/test/functional/cases/117_spf.robot
@@ -1,5 +1,5 @@
*** Settings ***
-Suite Setup DMARC Setup
+Suite Setup SPF Setup
Suite Teardown Simple Teardown
Library ${TESTDIR}/lib/rspamd.py
Resource ${TESTDIR}/lib/rspamd.robot
@@ -11,103 +11,6 @@ ${RSPAMD_SCOPE} Suite
${URL_TLD} ${TESTDIR}/../../contrib/publicsuffix/effective_tld_names.dat
*** Test Cases ***
-DMARC NONE PASS DKIM
- ${result} = Scan Message With Rspamc ${TESTDIR}/messages/dmarc/pass_none.eml
- Check Rspamc ${result} DMARC_POLICY_ALLOW
-
-DMARC NONE PASS SPF
- ${result} = Scan Message With Rspamc ${TESTDIR}/messages/dmarc/fail_none.eml
- ... -i 8.8.4.4 --from foo at spf.cacophony.za.org
- Check Rspamc ${result} DMARC_POLICY_ALLOW
-
-DMARC NONE FAIL
- ${result} = Scan Message With Rspamc ${TESTDIR}/messages/dmarc/fail_none.eml
- Check Rspamc ${result} DMARC_POLICY_SOFTFAIL
-
-DMARC REJECT FAIL
- ${result} = Scan Message With Rspamc ${TESTDIR}/messages/dmarc/fail_reject.eml
- Check Rspamc ${result} DMARC_POLICY_REJECT
-
-DMARC QUARANTINE FAIL
- ${result} = Scan Message With Rspamc ${TESTDIR}/messages/dmarc/fail_quarantine.eml
- Check Rspamc ${result} DMARC_POLICY_QUARANTINE
-
-DMARC SP NONE FAIL
- ${result} = Scan Message With Rspamc ${TESTDIR}/messages/dmarc/subdomain_fail_none.eml
- Check Rspamc ${result} DMARC_POLICY_SOFTFAIL
-
-DMARC SP REJECT FAIL
- ${result} = Scan Message With Rspamc ${TESTDIR}/messages/dmarc/subdomain_fail_reject.eml
- Check Rspamc ${result} DMARC_POLICY_REJECT
-
-DMARC SP QUARANTINE FAIL
- ${result} = Scan Message With Rspamc ${TESTDIR}/messages/dmarc/subdomain_fail_quarantine.eml
- Check Rspamc ${result} DMARC_POLICY_QUARANTINE
-
-DMARC SUBDOMAIN FAIL DKIM STRICT ALIGNMENT
- ${result} = Scan Message With Rspamc ${TESTDIR}/messages/dmarc/onsubdomain_fail_alignment.eml
- Check Rspamc ${result} DMARC_POLICY_REJECT
-
-DMARC SUBDOMAIN PASS DKIM RELAXED ALIGNMENT
- ${result} = Scan Message With Rspamc ${TESTDIR}/messages/dmarc/onsubdomain_pass_relaxed.eml
- Check Rspamc ${result} DMARC_POLICY_ALLOW
-
-DMARC SUBDOMAIN PASS SPF STRICT ALIGNMENT
- ${result} = Scan Message With Rspamc ${TESTDIR}/messages/dmarc/onsubdomain_fail_alignment.eml
- ... -i 37.48.67.26 --from foo at yo.mom.za.org
- Check Rspamc ${result} DMARC_POLICY_ALLOW
-
-DMARC SUBDOMAIN FAIL SPF STRICT ALIGNMENT
- ${result} = Scan Message With Rspamc ${TESTDIR}/messages/dmarc/onsubdomain_fail_alignment.eml
- ... -i 37.48.67.26 --from foo at mom.za.org
- Check Rspamc ${result} DMARC_POLICY_REJECT
-
-DMARC SUBDOMAIN PASS SPF RELAXED ALIGNMENT
- ${result} = Scan Message With Rspamc ${TESTDIR}/messages/dmarc/onsubdomain_fail.eml
- ... -i 37.48.67.26 --from foo at mom.za.org
- Check Rspamc ${result} DMARC_POLICY_ALLOW
-
-DMARC DNSFAIL
- ${result} = Scan Message With Rspamc ${TESTDIR}/messages/dmarc/dmarc_tmpfail.eml
- ... -i 37.48.67.26 --from foo at mom.za.org
- Check Rspamc ${result} DMARC_DNSFAIL
-
-DMARC NA NXDOMAIN
- ${result} = Scan Message With Rspamc ${TESTDIR}/messages/utf.eml
- ... -i 37.48.67.26 --from foo at mom.za.org
- Check Rspamc ${result} DMARC_NA
-
-DMARC PCT ZERO REJECT
- ${result} = Scan Message With Rspamc ${TESTDIR}/messages/dmarc/pct_none.eml
- ... -i 37.48.67.26 --from foo at mom.za.org
- Check Rspamc ${result} DMARC_POLICY_QUARANTINE
-
-DMARC PCT ZERO SP QUARANTINE
- ${result} = Scan Message With Rspamc ${TESTDIR}/messages/dmarc/pct_none1.eml
- ... -i 37.48.67.26 --from foo at mom.za.org
- Check Rspamc ${result} DMARC_POLICY_SOFTFAIL
-
-DKIM PERMFAIL NXDOMAIN
- ${result} = Scan Message With Rspamc ${TESTDIR}/messages/dmarc/bad_dkim2.eml
- ... -i 37.48.67.26
- Check Rspamc ${result} R_DKIM_PERMFAIL
-
-DKIM PERMFAIL BAD RECORD
- ${result} = Scan Message With Rspamc ${TESTDIR}/messages/dmarc/bad_dkim1.eml
- ... -i 37.48.67.26
- Check Rspamc ${result} R_DKIM_PERMFAIL
-
-DKIM TEMPFAIL SERVFAIL UNALIGNED
- ${result} = Scan Message With Rspamc ${TESTDIR}/messages/dmarc/bad_dkim3.eml
- ... -i 37.48.67.26
- Check Rspamc ${result} R_DKIM_TEMPFAIL
- Should Contain ${result.stdout} DMARC_POLICY_SOFTFAIL
-
-DKIM NA NOSIG
- ${result} = Scan Message With Rspamc ${TESTDIR}/messages/utf.eml
- ... -i 37.48.67.26
- Check Rspamc ${result} R_DKIM_NA
-
SPF PERMFAIL UNRESOLVEABLE INCLUDE
${result} = Scan Message With Rspamc ${TESTDIR}/messages/dmarc/bad_dkim1.eml
... -i 37.48.67.26 -F x at fail3.org.org.za
@@ -220,7 +123,7 @@ SPF PTRS
#Check Rspamc ${result} R_SPF_ALLOW
*** Keywords ***
-DMARC Setup
+SPF Setup
${PLUGIN_CONFIG} = Get File ${TESTDIR}/configs/dmarc.conf
Set Suite Variable ${PLUGIN_CONFIG}
Generic Setup PLUGIN_CONFIG
diff --git a/test/functional/configs/plugins.conf b/test/functional/configs/plugins.conf
index 1587ce584..a4386f636 100644
--- a/test/functional/configs/plugins.conf
+++ b/test/functional/configs/plugins.conf
@@ -13,6 +13,16 @@ options = {
type = txt;
replies = ["k=ed25519; p=yi50DjK5O9pqbFpNHklsv9lqaS0ArSYu02qp1S0DW1Y="];
},
+ {
+ name = "brisbane._domainkey.football.example.com";
+ type = txt;
+ replies = ["v=DKIM1; k=ed25519; p=11qYAYKxCrfVS/7TyWQHOg7hcvPapiMlrwIaaPcHURo="];
+ },
+ {
+ name = "test._domainkey.football.example.com";
+ type = txt;
+ replies = ["v=DKIM1; k=rsa; p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDkHlOQoBTzWRiGs5V6NpP3idY6Wk08a5qhdR6wy5bdOKb2jLQiY/J16JYi0Qvx/byYzCNb3W91y3FutACDfzwQ/BC/e/8uBsCR+yz1Lxj+PL6lHvqMKrM3rG4hstT5QjvHO9PzoxZyVYLzBfO2EeC3Ip3G+2kryOTIKT+l/K4w3QIDAQAB"],
+ },
{
name = "dkim._domainkey.cacophony.za.org",
type = "txt";
diff --git a/test/functional/configs/spf.conf b/test/functional/configs/spf.conf
new file mode 100644
index 000000000..37028b1a7
--- /dev/null
+++ b/test/functional/configs/spf.conf
@@ -0,0 +1 @@
+spf { }
More information about the Commits
mailing list