commit 8c437fa: Merge pull request #3172 from korgoth1/master

[GitHub]

Author: Vsevolod Stakhov
Date: 2019-12-03 09:43:03 +0000
URL: https://github.com/rspamd/rspamd/commit/8c437fa7c9138042217840ca8c45167ae6cb78da (HEAD -> master)

Merge pull request #3172 from korgoth1/master
[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 --combined test/functional/configs/plugins.conf
index 8511c7a3c,a4386f636..851f280d9
--- a/test/functional/configs/plugins.conf
+++ b/test/functional/configs/plugins.conf
@@@ -1,5 -1,5 +1,5 @@@
  options = {
 -  filters = ["spf", "dkim", "regexp"]
 +  filters = [ "dkim", "regexp"]
    url_tld = "${URL_TLD}"
    pidfile = "${TMPDIR}/rspamd.pid"
    lua_path = "${INSTALLROOT}/share/rspamd/lib/?.lua"
@@@ -13,6 -13,16 +13,16 @@@
            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";
@@@ -667,7 -677,6 +677,7 @@@ worker 
  modules {
      path = "${TESTDIR}/../../src/plugins/lua/"
  }
 +spf {}
  lua = "${TESTDIR}/lua/test_coverage.lua";
  lua = "${INSTALLROOT}/share/rspamd/rules/rspamd.lua"
  ${PLUGIN_CONFIG}