changeset 445:78eedbbce636

round spamassassin scores; check >= rather than >
author Carl Byington <carl@five-ten-sg.com>
date Mon, 19 Feb 2018 15:25:40 -0800
parents 9bb6af6ca26c
children 71019a7d2b59
files make-tld-conf.py src/context.cpp src/spamass.cpp.in src/spamass.h tld.conf
diffstat 5 files changed, 109 insertions(+), 19 deletions(-) [+]
line wrap: on
line diff
--- a/make-tld-conf.py	Fri Jan 05 17:28:46 2018 -0800
+++ b/make-tld-conf.py	Mon Feb 19 15:25:40 2018 -0800
@@ -36,7 +36,10 @@
                 if not rc: prefix = '// no ns record for '
         f.write('%s%s\n' % (prefix, x))
 f.write('\n')
-f.write('// enable rdns as a tld, so *.reverse.softlayer.com is effective in the rpz zone\n')
-f.write('reverse.softlayer.com\n')
-f.write('sl-reverse.com\n')
+
+c="grep '^\*.*multi.surbl' /etc/cron.daily/rpz | awk '{print $1}' | cut -c3- | sed -e 's/.multi.surbl.org//g'"
+content = cmd(c)
+for x in content.split('\n'):
+    f.write(x + '\n')
+
 f.close()
--- a/src/context.cpp	Fri Jan 05 17:28:46 2018 -0800
+++ b/src/context.cpp	Mon Feb 19 15:25:40 2018 -0800
@@ -1373,7 +1373,7 @@
         }
     }
 
-    if (spamassassin_limit && (score > spamassassin_limit)) {
+    if (spamassassin_limit && (score >= spamassassin_limit)) {
         char buf[maxlen];
         snprintf(buf, sizeof(buf), "Mail rejected - spam assassin score %d", score);
         msg = string(buf);
--- a/src/spamass.cpp.in	Fri Jan 05 17:28:46 2018 -0800
+++ b/src/spamass.cpp.in	Mon Feb 19 15:25:40 2018 -0800
@@ -155,7 +155,7 @@
     close_output(); // signal EOF to SpamAssassin
     input();        // read what the Assassin is telling us
     my_syslog(priv, "spamc returned " + spamc_output);
-    return atoi(spamc_output.c_str());
+    return int(round(atof(spamc_output.c_str())));
 }
 
 
--- a/src/spamass.h	Fri Jan 05 17:28:46 2018 -0800
+++ b/src/spamass.h	Mon Feb 19 15:25:40 2018 -0800
@@ -20,6 +20,7 @@
 #endif
 
 #include <list>
+#include <math.h>
 
 extern const char *spamc;
 extern const char *spamc_empty;
--- a/tld.conf	Fri Jan 05 17:28:46 2018 -0800
+++ b/tld.conf	Mon Feb 19 15:25:40 2018 -0800
@@ -1,4 +1,4 @@
-// generated by make-tld-conf.py on 2017-12-07 07:38:52
+// generated by make-tld-conf.py on 2018-02-15 09:55:12
 
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -386,27 +386,62 @@
 // bn : https://en.wikipedia.org/wiki/.bn
 *.bn
 
-// bo : http://www.nic.bo/
+// bo : https://nic.bo/delegacion2015.php#h-1.10
 bo
 com.bo
 edu.bo
-gov.bo
 gob.bo
 int.bo
 org.bo
 net.bo
 mil.bo
 tv.bo
+web.bo
+// Social Domains
+academia.bo
+agro.bo
+arte.bo
+blog.bo
+bolivia.bo
+ciencia.bo
+cooperativa.bo
+democracia.bo
+deporte.bo
+ecologia.bo
+economia.bo
+empresa.bo
+indigena.bo
+industria.bo
+info.bo
+medicina.bo
+movimiento.bo
+musica.bo
+natural.bo
+nombre.bo
+noticias.bo
+patria.bo
+politica.bo
+profesional.bo
+plurinacional.bo
+pueblo.bo
+revista.bo
+salud.bo
+tecnologia.bo
+tksat.bo
+transporte.bo
+wiki.bo
 
 // br : http://registro.br/dominio/categoria.html
 // Submitted by registry <fneves@registro.br>
 br
+9guacu.br
 abc.br
 adm.br
 adv.br
 agr.br
 aju.br
 am.br
+anani.br
 aparecida.br
 arq.br
 art.br
@@ -419,6 +454,7 @@
 bmd.br
 boavista.br
 bsb.br
+campinagrande.br
 campinas.br
 caxias.br
 cim.br
@@ -429,6 +465,7 @@
 coop.br
 cri.br
 cuiaba.br
+curitiba.br
 def.br
 ecn.br
 eco.br
@@ -446,6 +483,7 @@
 fnd.br
 fortal.br
 fot.br
+foz.br
 fst.br
 g12.br
 ggf.br
@@ -494,6 +532,8 @@
 londrina.br
 macapa.br
 maceio.br
+manaus.br
+maringa.br
 mat.br
 med.br
 mil.br
@@ -523,8 +563,13 @@
 ribeirao.br
 rio.br
 riobranco.br
+riopreto.br
 salvador.br
 sampa.br
+santamaria.br
+santoandre.br
+saobernardo.br
+saogonca.br
 sjc.br
 slg.br
 slz.br
@@ -3562,8 +3607,17 @@
 yamanakako.yamanashi.jp
 yamanashi.yamanashi.jp
 
-// ke : http://www.kenic.or.ke/index.php?option=com_content&task=view&id=117&Itemid=145
-*.ke
+// ke : http://www.kenic.or.ke/index.php/en/ke-domains/ke-domains
+ke
+ac.ke
+co.ke
+go.ke
+info.ke
+me.ke
+mobi.ke
+ne.ke
+or.ke
+sc.ke
 
 // kg : http://www.domain.kg/dmn_n.html
 kg
@@ -7074,7 +7128,7 @@
 
 // xn--mgbx4cd0ab ("Malaysia", Malay) : MY
 // مليسيا
-// no ns record for xn--mgbx4cd0ab
+xn--mgbx4cd0ab
 
 // xn--mgb9awbf ("Oman", Arabic) : OM
 // عمان
@@ -11007,6 +11061,12 @@
 inf.ua
 ltd.ua
 
+// AgileBits Inc : https://agilebits.com
+// Submitted by Roustem Karimov <roustem@agilebits.com>
+1password.ca
+1password.com
+1password.eu
+
 // Agnat sp. z o.o. : https://domena.pl
 // Submitted by Przemyslaw Plewa <it-admin@domena.pl>
 beep.pl
@@ -11018,7 +11078,7 @@
 
 // alwaysdata : https://www.alwaysdata.com
 // Submitted by Cyril <admin@alwaysdata.com>
-*.alwaysdata.net
+alwaysdata.net
 
 // Amazon CloudFront : https://aws.amazon.com/cloudfront/
 // Submitted by Donavan Miller <donavanm@amazon.com>
@@ -11044,6 +11104,7 @@
 eu-central-1.elasticbeanstalk.com
 eu-west-1.elasticbeanstalk.com
 eu-west-2.elasticbeanstalk.com
+eu-west-3.elasticbeanstalk.com
 sa-east-1.elasticbeanstalk.com
 us-east-1.elasticbeanstalk.com
 us-east-2.elasticbeanstalk.com
@@ -11068,6 +11129,7 @@
 s3-eu-central-1.amazonaws.com
 s3-eu-west-1.amazonaws.com
 s3-eu-west-2.amazonaws.com
+s3-eu-west-3.amazonaws.com
 s3-external-1.amazonaws.com
 s3-fips-us-gov-west-1.amazonaws.com
 s3-sa-east-1.amazonaws.com
@@ -11081,6 +11143,7 @@
 s3.ca-central-1.amazonaws.com
 s3.eu-central-1.amazonaws.com
 s3.eu-west-2.amazonaws.com
+s3.eu-west-3.amazonaws.com
 s3.us-east-2.amazonaws.com
 s3.dualstack.ap-northeast-1.amazonaws.com
 s3.dualstack.ap-northeast-2.amazonaws.com
@@ -11091,6 +11154,7 @@
 s3.dualstack.eu-central-1.amazonaws.com
 s3.dualstack.eu-west-1.amazonaws.com
 s3.dualstack.eu-west-2.amazonaws.com
+s3.dualstack.eu-west-3.amazonaws.com
 s3.dualstack.sa-east-1.amazonaws.com
 s3.dualstack.us-east-1.amazonaws.com
 s3.dualstack.us-east-2.amazonaws.com
@@ -11107,6 +11171,7 @@
 s3-website.ca-central-1.amazonaws.com
 s3-website.eu-central-1.amazonaws.com
 s3-website.eu-west-2.amazonaws.com
+s3-website.eu-west-3.amazonaws.com
 s3-website.us-east-2.amazonaws.com
 
 // Amune : https://amune.org/
@@ -11295,6 +11360,11 @@
 co.nl
 co.no
 
+// Combell.com : https://www.combell.com
+// Submitted by Thomas Wouters <thomas.wouters@combellgroup.com>
+webhosting.be
+hosting-cluster.nl
+
 // COSIMO GmbH : http://www.cosimo.de
 // Submitted by Rene Marticke <rmarticke@cosimo.de>
 dyn.cosidns.de
@@ -11893,6 +11963,8 @@
 fedorainfracloud.org
 fedorapeople.org
 cloud.fedoraproject.org
+app.os.fedoraproject.org
+app.os.stg.fedoraproject.org
 
 // Filegear Inc. : https://www.filegear.com
 // Submitted by Jason Zhu <jason@owtware.com>
@@ -11916,10 +11988,6 @@
 freebox-os.fr
 freeboxos.fr
 
-// Fusion Intranet : https://www.fusion-intranet.com
-// Submitted by Matthias Burtscher <matthias.burtscher@fusonic.net>
-myfusion.cloud
-
 // Futureweb OG : http://www.futureweb.at
 // Submitted by Andreas Schnederle-Wagner <schnederle@futureweb.at>
 *.futurecms.at
@@ -12205,6 +12273,10 @@
 // Submitted by Alan Shreve <alan@ngrok.com>
 ngrok.io
 
+// Nimbus Hosting Ltd. : https://www.nimbushosting.co.uk/
+// Submitted by Nicholas Ford <nick@nimbushosting.co.uk>
+nh-serv.co.uk
+
 // NFSN, Inc. : https://www.NearlyFreeSpeech.NET/
 // Submitted by Jeff Wheelhouse <support@nearlyfreespeech.net>
 nfshost.com
@@ -12462,6 +12534,11 @@
 // Submitted by Tim Kramer <tkramer@rhcloud.com>
 rhcloud.com
 
+// Resin.io : https://resin.io
+// Submitted by Tim Perry <tim@resin.io>
+resindevice.io
+devices.resinstaging.io
+
 // RethinkDB : https://www.rethinkdb.com/
 // Submitted by Chris Kastorff <info@rethinkdb.com>
 hzc.io
@@ -12481,6 +12558,10 @@
 logoip.de
 logoip.com
 
+// Scry Security : http://www.scrysec.com
+// Submitted by Shante Adam <shante@skyhat.io>
+scrysec.com
+
 // Securepoint GmbH : https://www.securepoint.de
 // Submitted by Erik Anders <erik.anders@securepoint.de>
 firewall-gateway.com
@@ -12496,6 +12577,7 @@
 
 // SensioLabs, SAS : https://sensiolabs.com/
 // Submitted by Fabien Potencier <fabien.potencier@sensiolabs.com>
+*.s5y.io
 *.sensiosite.cloud
 
 // Service Online LLC : http://drs.ua/
@@ -12709,6 +12791,10 @@
 
 // ===END PRIVATE DOMAINS===
 
-// enable rdns as a tld, so *.reverse.softlayer.com is effective in the rpz zone
-reverse.softlayer.com
-sl-reverse.com
+finemanrealty.com
+loan
+static.reverse.lstn.net
+cloudapp.net
+myactivedirectory.com
+ddns.net
+hopto.me