You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by he...@apache.org on 2022/04/17 07:23:41 UTC
svn commit: r1899925 [3/3] - in /spamassassin/branches/trunk-welcomelist: ./ lib/ lib/Mail/ lib/Mail/SpamAssassin/ lib/Mail/SpamAssassin/Conf/ lib/Mail/SpamAssassin/Plugin/ lib/Mail/SpamAssassin/Util/ rules/ spamc/ spamd/ t/ t/data/ t/data/welcomelists...
Modified: spamassassin/branches/trunk-welcomelist/rules/20_vbounce.cf
URL: http://svn.apache.org/viewvc/spamassassin/branches/trunk-welcomelist/rules/20_vbounce.cf?rev=1899925&r1=1899924&r2=1899925&view=diff
==============================================================================
--- spamassassin/branches/trunk-welcomelist/rules/20_vbounce.cf (original)
+++ spamassassin/branches/trunk-welcomelist/rules/20_vbounce.cf Sun Apr 17 07:23:40 2022
@@ -48,7 +48,7 @@
#
###########################################################################
-if can(Mail::SpamAssassin::Conf::feature_blocklist_welcomelist)
+if can(Mail::SpamAssassin::Conf::feature_welcomelist_blocklist)
ifplugin Mail::SpamAssassin::Plugin::VBounce
body __MY_SERVERS_FOUND eval:check_welcomelist_bounce_relays()
endif
Modified: spamassassin/branches/trunk-welcomelist/rules/30_text_de.cf
URL: http://svn.apache.org/viewvc/spamassassin/branches/trunk-welcomelist/rules/30_text_de.cf?rev=1899925&r1=1899924&r2=1899925&view=diff
==============================================================================
--- spamassassin/branches/trunk-welcomelist/rules/30_text_de.cf (original)
+++ spamassassin/branches/trunk-welcomelist/rules/30_text_de.cf Sun Apr 17 07:23:40 2022
@@ -328,10 +328,10 @@ lang de describe BAYES_99 Spamwahrschein
lang de describe BAYES_999 Spamwahrscheinlichkeit nach Bayes-Test: 99.9-100%
endif
#
-lang de describe USER_IN_BLACKLIST Absenderadresse steht in Ihrer persönlichen schwarzen Liste
-lang de describe USER_IN_WHITELIST Absenderadresse steht in Ihrer persönlichen weißen Liste
-lang de describe USER_IN_DEF_WHITELIST Absenderadresse steht in der allgemeinen weißen Liste
-lang de describe USER_IN_BLACKLIST_TO Empfängeradresse steht in Ihrer persönlichen schwarzen Liste
+lang de describe USER_IN_BLOCKLIST Absenderadresse steht in Ihrer persönlichen schwarzen Liste
+lang de describe USER_IN_WELCOMELIST Absenderadresse steht in Ihrer persönlichen weißen Liste
+lang de describe USER_IN_DEF_WELCOMELIST Absenderadresse steht in der allgemeinen weißen Liste
+lang de describe USER_IN_BLOCKLIST_TO Empfängeradresse steht in Ihrer persönlichen schwarzen Liste
lang de describe USER_IN_WELCOMELIST_TO Empfängeradresse steht in Ihrer persönlichen weißen Liste
lang de describe USER_IN_MORE_SPAM_TO Empfängeradresse soll fast alle (Spam-) Nachrichten erhalten
lang de describe USER_IN_ALL_SPAM_TO Empfängeradresse soll alle (Spam-) Nachrichten erhalten
Modified: spamassassin/branches/trunk-welcomelist/rules/30_text_fr.cf
URL: http://svn.apache.org/viewvc/spamassassin/branches/trunk-welcomelist/rules/30_text_fr.cf?rev=1899925&r1=1899924&r2=1899925&view=diff
==============================================================================
--- spamassassin/branches/trunk-welcomelist/rules/30_text_fr.cf (original)
+++ spamassassin/branches/trunk-welcomelist/rules/30_text_fr.cf Sun Apr 17 07:23:40 2022
@@ -246,11 +246,11 @@ lang fr describe UPPERCASE_50_75 Message
lang fr describe UPPERCASE_75_100 Message composé de 75 à 100% de majuscules
lang fr describe URG_BIZ Contient la formule "urgent business"
lang fr describe USER_IN_ALL_SPAM_TO Destinataire sur la liste "all_spam_to" (config SA locale)
-lang fr describe USER_IN_BLACKLIST Expéditeur sur la liste noire (config SA locale)
-lang fr describe USER_IN_BLACKLIST_TO Destinataire sur la liste "blacklist_to" (config SA locale)
-lang fr describe USER_IN_DEF_WHITELIST Expéditeur dans la liste OK par défaut de SpamAssassin
+lang fr describe USER_IN_BLOCKLIST Expéditeur sur la liste noire (config SA locale)
+lang fr describe USER_IN_BLOCKLIST_TO Destinataire sur la liste "blocklist_to" (config SA locale)
+lang fr describe USER_IN_DEF_WELCOMELIST Expéditeur dans la liste OK par défaut de SpamAssassin
lang fr describe USER_IN_MORE_SPAM_TO Destinataire sur la liste "more_spam_to" (config SA locale)
-lang fr describe USER_IN_WHITELIST Expéditeur sur la liste blanche (OK) (config SA locale)
+lang fr describe USER_IN_WELCOMELIST Expéditeur sur la liste blanche (OK) (config SA locale)
lang fr describe USER_IN_WELCOMELIST_TO Destinataire sur la liste blanche (config SA)
#lang fr describe US_DOLLARS_3 Escroq. nigérienne, version modifiée, phrase clé ($NN,NNN,NNN.NN)
lang fr describe DRUG_ED_ONLINE Vente de Viagra par correspondance
Modified: spamassassin/branches/trunk-welcomelist/rules/30_text_pl.cf
URL: http://svn.apache.org/viewvc/spamassassin/branches/trunk-welcomelist/rules/30_text_pl.cf?rev=1899925&r1=1899924&r2=1899925&view=diff
==============================================================================
--- spamassassin/branches/trunk-welcomelist/rules/30_text_pl.cf (original)
+++ spamassassin/branches/trunk-welcomelist/rules/30_text_pl.cf Sun Apr 17 07:23:40 2022
@@ -232,12 +232,12 @@ lang pl describe UPPERCASE_75_100 Tre¶�
lang pl describe URG_BIZ Pilna sprawa
#lang pl describe US_DOLLARS_3 Wspomina miliony $ ($NN,NNN,NNN.NN)
lang pl describe USER_IN_ALL_SPAM_TO U¿ytkownik jest wymieniony w 'all_spam_to'
-lang pl describe USER_IN_BLACKLIST Od: zawiera adres z Twojej "czarnej listy"
-lang pl describe USER_IN_BLACKLIST_TO U¿ytkownik jest wymieniony w 'blacklist_to'
-lang pl describe USER_IN_DEF_WHITELIST U¿ytkownik jest wymieniony w domy¶lnej white-list (bia³ej li¶cie)
+lang pl describe USER_IN_BLOCKLIST Od: zawiera adres z Twojej "czarnej listy"
+lang pl describe USER_IN_BLOCKLIST_TO U¿ytkownik jest wymieniony w 'blocklist_to'
+lang pl describe USER_IN_DEF_WELCOMELIST U¿ytkownik jest wymieniony w domy¶lnej welcome-list (bia³ej li¶cie)
lang pl describe USER_IN_MORE_SPAM_TO U¿ytkownik jest wymieniony w 'more_spam_to'
-lang pl describe USER_IN_WHITELIST Od: zawiera adres z white-list (bia³ej listy)
-lang pl describe USER_IN_WELCOMELIST_TO U¿ytkownik jest wymieniony w 'whitelist_to'
+lang pl describe USER_IN_WELCOMELIST Od: zawiera adres z welcome-list (bia³ej listy)
+lang pl describe USER_IN_WELCOMELIST_TO U¿ytkownik jest wymieniony w 'welcomelist_to'
lang pl describe WEIRD_PORT U¿ywa niestandardowego numeru portu dla HTTP
lang pl describe WEIRD_QUOTING Dziwne, powtarzaj±ce siê znaki podwójnego cytowania
lang pl describe WITH_LC_SMTP Linia 'Received' zawiera spamerski podpis (smtp)
Modified: spamassassin/branches/trunk-welcomelist/rules/30_text_pt_br.cf
URL: http://svn.apache.org/viewvc/spamassassin/branches/trunk-welcomelist/rules/30_text_pt_br.cf?rev=1899925&r1=1899924&r2=1899925&view=diff
==============================================================================
--- spamassassin/branches/trunk-welcomelist/rules/30_text_pt_br.cf (original)
+++ spamassassin/branches/trunk-welcomelist/rules/30_text_pt_br.cf Sun Apr 17 07:23:40 2022
@@ -50,16 +50,16 @@ lang pt_BR unsafe_report ou confirmar qu
lang pt_BR unsafe_report Se quiser visualizar a mensagem, pode ser mais seguro salvá-la em um arquivo
lang pt_BR unsafe_report e abrí-la com um editor.
-lang pt_BR describe USER_IN_BLACKLIST Endereço do From: está na blacklist do usuário
-lang pt_BR describe USER_IN_WHITELIST Endereço do From: está na whitelist do usuário
-lang pt_BR describe USER_IN_DEF_WHITELIST Endereço do From: está na whitelist padrão
-lang pt_BR describe USER_IN_BLACKLIST_TO Usuário está listado na 'blacklist_to'
-lang pt_BR describe USER_IN_WELCOMELIST_TO Usuário está listado na 'whitelist_to'
+lang pt_BR describe USER_IN_BLOCKLIST Endereço do From: está na blocklist do usuário
+lang pt_BR describe USER_IN_WELCOMELIST Endereço do From: está na welcomelist do usuário
+lang pt_BR describe USER_IN_DEF_WELCOMELIST Endereço do From: está na welcomelist padrão
+lang pt_BR describe USER_IN_BLOCKLIST_TO Usuário está listado na 'blocklist_to'
+lang pt_BR describe USER_IN_WELCOMELIST_TO Usuário está listado na 'welcomelist_to'
lang pt_BR describe USER_IN_MORE_SPAM_TO Usuário está listado na 'more_spam_to'
lang pt_BR describe USER_IN_ALL_SPAM_TO Usuário está listado na 'all_spam_to'
ifplugin Mail::SpamAssassin::Plugin::AWL
-lang pt_BR describe AWL Endereço do From: está na auto whitelist
+lang pt_BR describe AWL Endereço do From: está na auto welcomelist
endif
# 20_advance_fee.cf - These are removed and will break lint
@@ -357,7 +357,7 @@ lang pt_BR describe EMPTY_MESSAGE Mensag
lang pt_BR describe NO_HEADERS_MESSAGE Mensagem parece não conter grande parte dos cabeçalhos RFC-822
# 20_net_tests.cf
-lang pt_BR describe DIGEST_MULTIPLE Remetente está listado em mais de uma blacklist
+lang pt_BR describe DIGEST_MULTIPLE Remetente está listado em mais de uma blocklist
lang pt_BR describe NO_DNS_FOR_FROM Remetente não possui registros MX ou A no DNS
# 20_phrases.cf
@@ -579,17 +579,17 @@ lang pt_BR describe BODY_8BITS Body cont
endif
# 25_uribl.cf
-lang pt_BR describe URIBL_SBL Contém uma URL listada na blacklist SBL
-lang pt_BR describe URIBL_DBL_SPAM Contém uma URL listada na blacklist DBL blocklist
+lang pt_BR describe URIBL_SBL Contém uma URL listada na blocklist SBL
+lang pt_BR describe URIBL_DBL_SPAM Contém uma URL listada na blocklist DBL blocklist
lang pt_BR describe URIBL_DBL_ERROR Erro: Consultou a DBL por um IP
-#lang pt_BR describe URIBL_SC_SURBL Contém uma URL listada na blacklist SC SURBL - removed bug 7279
-lang pt_BR describe URIBL_WS_SURBL Contém uma URL listada na blacklist WS SURBL
-lang pt_BR describe URIBL_PH_SURBL Contém uma URL listada na blacklist PH SURBL
-#lang pt_BR describe URIBL_OB_SURBL Contém uma URL listada na blacklist OB SURBL - REMOVED BUG 6853
-#lang pt_BR describe URIBL_AB_SURBL Contém uma URL listada na blacklist AB SURBL - removed bug 7279
+#lang pt_BR describe URIBL_SC_SURBL Contém uma URL listada na blocklist SC SURBL - removed bug 7279
+lang pt_BR describe URIBL_WS_SURBL Contém uma URL listada na blocklist WS SURBL
+lang pt_BR describe URIBL_PH_SURBL Contém uma URL listada na blocklist PH SURBL
+#lang pt_BR describe URIBL_OB_SURBL Contém uma URL listada na blocklist OB SURBL - REMOVED BUG 6853
+#lang pt_BR describe URIBL_AB_SURBL Contém uma URL listada na blocklist AB SURBL - removed bug 7279
#Changed from JP to ABUSE per bug 7279
-lang pt_BR describe URIBL_ABUSE_SURBL Contém uma URL listada na blacklist ABUSE SURBL
-lang pt_BR describe URIBL_BLACK Contém uma URL listada na blacklist URIBL
+lang pt_BR describe URIBL_ABUSE_SURBL Contém uma URL listada na blocklist ABUSE SURBL
+lang pt_BR describe URIBL_BLACK Contém uma URL listada na blocklist URIBL
lang pt_BR describe URIBL_GREY Contém uma URL listada na greylist URIBL
lang pt_BR describe URIBL_RED Contém uma URL listada na redlist URIBL
@@ -598,16 +598,12 @@ ifplugin Mail::SpamAssassin::Plugin::Sho
lang pt_BR describe SHORTCIRCUIT Nem todas as regras foram executadas por causa de um problema em uma delas
endif
-# 60_whitelist_dkim.cf
-lang pt_BR describe USER_IN_DKIM_WHITELIST Endereço do From: está na whitelist de DKIM do usuário
-lang pt_BR describe USER_IN_DEF_DKIM_WL Endereço do From: está na whitelist de DKIM padrão
-
-# 60_whitelist_spf.cf
-lang pt_BR describe USER_IN_SPF_WHITELIST Endereço do From: está na whitelist de SPF do usuário
-lang pt_BR describe USER_IN_DEF_SPF_WL Endereço do From: está na whitelist de SPF padrão
-lang pt_BR describe ENV_AND_HDR_SPF_MATCH Endereço do From: confere com Envelope From e está na whitelist de SPF
-
-# 60_whitelist_subject.cf
-lang pt_BR describe SUBJECT_IN_WHITELIST Assunto contém palavra que está na whitelist do usuário
-lang pt_BR describe SUBJECT_IN_BLACKLIST Assunto contém palavra que está na blacklist do usuário
+# 60_welcomelist_dkim.cf
+lang pt_BR describe USER_IN_DKIM_WELCOMELIST Endereço do From: está na welcomelist de DKIM do usuário
+lang pt_BR describe USER_IN_DEF_DKIM_WL Endereço do From: está na welcomelist de DKIM padrão
+
+# 60_welcomelist_spf.cf
+lang pt_BR describe USER_IN_SPF_WELCOMELIST Endereço do From: está na welcomelist de SPF do usuário
+lang pt_BR describe USER_IN_DEF_SPF_WL Endereço do From: está na welcomelist de SPF padrão
+lang pt_BR describe ENV_AND_HDR_SPF_MATCH Endereço do From: confere com Envelope From e está na welcomelist de SPF
Modified: spamassassin/branches/trunk-welcomelist/rules/50_scores.cf
URL: http://svn.apache.org/viewvc/spamassassin/branches/trunk-welcomelist/rules/50_scores.cf?rev=1899925&r1=1899924&r2=1899925&view=diff
==============================================================================
--- spamassassin/branches/trunk-welcomelist/rules/50_scores.cf (original)
+++ spamassassin/branches/trunk-welcomelist/rules/50_scores.cf Sun Apr 17 07:23:40 2022
@@ -702,30 +702,26 @@ score NO_HEADERS_MESSAGE 0.001
score HTML_CHARSET_FARAWAY 0.500
score MIME_CHARSET_FARAWAY 2.450
-# rescore never changes the whitelist/blacklist scores
+# rescore never changes the welcomelist/blocklist scores
ifplugin Mail::SpamAssassin::Plugin::WLBLEval
-#score USER_IN_BLACKLIST 100.000 - Moved to 60_whitelist.cf
-#score USER_IN_WHITELIST -100.000 - Moved to 60_whitelist.cf
-#score USER_IN_DEF_WHITELIST -15.000 - Moved to 60_whitelist.cf
-#score USER_IN_BLACKLIST_TO 10.000 - Moved to 60_whitelist.cf
-#score URI_HOST_IN_BLACKLIST 100.0 - Moved to 60_whitelist.cf
-#score URI_HOST_IN_WHITELIST -100.0 - Moved to 60_whitelist.cf
+#score USER_IN_BLOCKLIST 100.000 - Moved to 60_welcomelist.cf
+#score USER_IN_WELCOMELIST -100.000 - Moved to 60_welcomelist.cf
+#score USER_IN_DEF_WELCOMELIST -15.000 - Moved to 60_welcomelist.cf
+#score USER_IN_BLOCKLIST_TO 10.000 - Moved to 60_welcomelist.cf
+#score URI_HOST_IN_BLOCKLIST 100.0 - Moved to 60_welcomelist.cf
+#score URI_HOST_IN_WELCOMELIST -100.0 - Moved to 60_welcomelist.cf
#Removed in bug 7256
-#score HEADER_HOST_IN_BLACKLIST 100.0
-#score HEADER_HOST_IN_WHITELIST -100.0
+#score HEADER_HOST_IN_BLOCKLIST 100.0
+#score HEADER_HOST_IN_WELCOMELIST -100.0
# not really false positives but the user wants spam!
-#score USER_IN_WHITELIST_TO -6.000 - Moved to 60_whitelist.cf
+#score USER_IN_WELCOMELIST_TO -6.000 - Moved to 60_welcomelist.cf
score USER_IN_MORE_SPAM_TO -20.000
score USER_IN_ALL_SPAM_TO -100.000
endif
-ifplugin Mail::SpamAssassin::Plugin::WhiteListSubject
-score SUBJECT_IN_WHITELIST -100
-score SUBJECT_IN_BLACKLIST 100
-endif # Mail::SpamAssassin::Plugin::WhiteListSubject
-
ifplugin Mail::SpamAssassin::Plugin::SPF
+score USER_IN_SPF_WELCOMELIST -100.000
score USER_IN_SPF_WHITELIST -100.000
score USER_IN_DEF_SPF_WL -7.500
score ENV_AND_HDR_SPF_MATCH -0.5
@@ -733,7 +729,7 @@ endif # Mail::SpamAssassin::Plugin::SPF
# DKIM
ifplugin Mail::SpamAssassin::Plugin::DKIM
-#score USER_IN_DKIM_WHITELIST -100.000 - Moved to 60_whitelist_dkim.cf
+#score USER_IN_DKIM_WELCOMELIST -100.000 - Moved to 60_welcomelist_dkim.cf
score USER_IN_DEF_DKIM_WL -7.500
score DKIM_SIGNED 0.1
score DKIM_VALID -0.1
Modified: spamassassin/branches/trunk-welcomelist/rules/60_awl.cf
URL: http://svn.apache.org/viewvc/spamassassin/branches/trunk-welcomelist/rules/60_awl.cf?rev=1899925&r1=1899924&r2=1899925&view=diff
==============================================================================
--- spamassassin/branches/trunk-welcomelist/rules/60_awl.cf (original)
+++ spamassassin/branches/trunk-welcomelist/rules/60_awl.cf Sun Apr 17 07:23:40 2022
@@ -1,4 +1,4 @@
-# SpamAssassin rules file: auto-whitelist
+# SpamAssassin rules file: auto-welcomelist
#
# Please don't modify this file as your changes will be overwritten with
# the next update. Use @@LOCAL_RULES_DIR@@/local.cf instead.
@@ -23,7 +23,13 @@
ifplugin Mail::SpamAssassin::Plugin::AWL
+if can(Mail::SpamAssassin::Conf::feature_welcomelist_blocklist)
+header AWL eval:check_from_in_auto_welcomelist()
+endif
+if !can(Mail::SpamAssassin::Conf::feature_welcomelist_blocklist)
header AWL eval:check_from_in_auto_whitelist()
+endif
+
describe AWL Adjusted score from AWL reputation of From: address
tflags AWL userconf noautolearn
priority AWL 1000
Modified: spamassassin/branches/trunk-welcomelist/rules/60_shortcircuit.cf
URL: http://svn.apache.org/viewvc/spamassassin/branches/trunk-welcomelist/rules/60_shortcircuit.cf?rev=1899925&r1=1899924&r2=1899925&view=diff
==============================================================================
--- spamassassin/branches/trunk-welcomelist/rules/60_shortcircuit.cf (original)
+++ spamassassin/branches/trunk-welcomelist/rules/60_shortcircuit.cf Sun Apr 17 07:23:40 2022
@@ -27,16 +27,25 @@
###########################################################################
-priority USER_IN_WHITELIST -1000
-priority USER_IN_DEF_WHITELIST -1000
+if can(Mail::SpamAssassin::Conf::feature_welcomelist_blocklist)
+ priority USER_IN_WELCOMELIST -1000
+ priority USER_IN_DEF_WELCOMELIST -1000
+else
+ priority USER_IN_WHITELIST -1000
+ priority USER_IN_DEF_WHITELIST -1000
+endif
+
priority USER_IN_ALL_SPAM_TO -1000
-priority SUBJECT_IN_WHITELIST -1000
priority ALL_TRUSTED -950
-priority SUBJECT_IN_BLACKLIST -900
-priority USER_IN_BLACKLIST_TO -900
-priority USER_IN_BLACKLIST -900
+if can(Mail::SpamAssassin::Conf::feature_welcomelist_blocklist)
+ priority USER_IN_BLOCKLIST_TO -900
+ priority USER_IN_BLOCKLIST -900
+else
+ priority USER_IN_BLACKLIST_TO -900
+ priority USER_IN_BLACKLIST -900
+endif
###########################################################################
Copied: spamassassin/branches/trunk-welcomelist/rules/60_welcomelist.cf (from r1899924, spamassassin/branches/trunk-welcomelist/rules/60_whitelist.cf)
URL: http://svn.apache.org/viewvc/spamassassin/branches/trunk-welcomelist/rules/60_welcomelist.cf?p2=spamassassin/branches/trunk-welcomelist/rules/60_welcomelist.cf&p1=spamassassin/branches/trunk-welcomelist/rules/60_whitelist.cf&r1=1899924&r2=1899925&rev=1899925&view=diff
==============================================================================
--- spamassassin/branches/trunk-welcomelist/rules/60_whitelist.cf (original)
+++ spamassassin/branches/trunk-welcomelist/rules/60_welcomelist.cf Sun Apr 17 07:23:40 2022
@@ -29,22 +29,19 @@
# user slip-up could result in scribbling side-effects in the bayes
# db as a result -- which is hard to remedy.
-if can(Mail::SpamAssassin::Conf::feature_blocklist_welcomelist)
+if can(Mail::SpamAssassin::Conf::feature_welcomelist_blocklist)
ifplugin Mail::SpamAssassin::Plugin::WLBLEval
#bz7826 renames whitelist to welcomelist and blacklist to blocklist
header USER_IN_BLOCKLIST eval:check_from_in_blocklist()
describe USER_IN_BLOCKLIST From: user is listed in the block-list
tflags USER_IN_BLOCKLIST userconf nice noautolearn
- score USER_IN_BLOCKLIST 100.0
+ score USER_IN_BLOCKLIST 0.01
- ifplugin Mail::SpamAssassin::Plugin::RaciallyCharged
- meta USER_IN_BLACKLIST (USER_IN_BLOCKLIST)
- describe USER_IN_BLACKLIST DEPRECATED: See USER_IN_BLOCKLIST
- tflags USER_IN_BLACKLIST userconf nice noautolearn
- score USER_IN_BLOCKLIST 0.01
- score USER_IN_BLACKLIST 100.0
- endif
+ meta USER_IN_BLACKLIST (USER_IN_BLOCKLIST)
+ describe USER_IN_BLACKLIST DEPRECATED: See USER_IN_BLOCKLIST
+ tflags USER_IN_BLACKLIST userconf nice noautolearn
+ score USER_IN_BLACKLIST 100.0
endif
else
ifplugin Mail::SpamAssassin::Plugin::WLBLEval
@@ -60,21 +57,18 @@ else
endif
endif
-if can(Mail::SpamAssassin::Conf::feature_blocklist_welcomelist)
+if can(Mail::SpamAssassin::Conf::feature_welcomelist_blocklist)
ifplugin Mail::SpamAssassin::Plugin::WLBLEval
#bz7826 renames whitelist to welcomelist and blacklist to blocklist
header USER_IN_WELCOMELIST eval:check_from_in_welcomelist()
describe USER_IN_WELCOMELIST User is listed in 'welcomelist_from'
tflags USER_IN_WELCOMELIST userconf nice noautolearn
- score USER_IN_WELCOMELIST -100.0
+ score USER_IN_WELCOMELIST -0.01
- ifplugin Mail::SpamAssassin::Plugin::RaciallyCharged
- meta USER_IN_WHITELIST (USER_IN_WELCOMELIST)
- describe USER_IN_WHITELIST DEPRECATED: See USER_IN_WELCOMELIST
- tflags USER_IN_WHITELIST userconf nice noautolearn
- score USER_IN_WELCOMELIST -0.01
- score USER_IN_WHITELIST -100.0
- endif
+ meta USER_IN_WHITELIST (USER_IN_WELCOMELIST)
+ describe USER_IN_WHITELIST DEPRECATED: See USER_IN_WELCOMELIST
+ tflags USER_IN_WHITELIST userconf nice noautolearn
+ score USER_IN_WHITELIST -100.0
endif
else
ifplugin Mail::SpamAssassin::Plugin::WLBLEval
@@ -90,21 +84,18 @@ else
endif
endif
-if can(Mail::SpamAssassin::Conf::feature_blocklist_welcomelist)
+if can(Mail::SpamAssassin::Conf::feature_welcomelist_blocklist)
ifplugin Mail::SpamAssassin::Plugin::WLBLEval
#bz7826 renames whitelist to welcomelist and blacklist to blocklist
header USER_IN_DEF_WELCOMELIST eval:check_from_in_default_welcomelist()
describe USER_IN_DEF_WELCOMELIST From: user is listed in the default welcome-list
tflags USER_IN_DEF_WELCOMELIST userconf nice noautolearn
- score USER_IN_DEF_WELCOMELIST -15.0
+ score USER_IN_DEF_WELCOMELIST -0.01
- ifplugin Mail::SpamAssassin::Plugin::RaciallyCharged
- meta USER_IN_DEF_WHITELIST (USER_IN_DEF_WELCOMELIST)
- describe USER_IN_DEF_WHITELIST DEPRECATED: See USER_IN_WELCOMELIST
- tflags USER_IN_DEF_WHITELIST userconf nice noautolearn
- score USER_IN_DEF_WELCOMELIST -0.01
- score USER_IN_DEF_WHITELIST -15.0
- endif
+ meta USER_IN_DEF_WHITELIST (USER_IN_DEF_WELCOMELIST)
+ describe USER_IN_DEF_WHITELIST DEPRECATED: See USER_IN_WELCOMELIST
+ tflags USER_IN_DEF_WHITELIST userconf nice noautolearn
+ score USER_IN_DEF_WHITELIST -15.0
endif
else
ifplugin Mail::SpamAssassin::Plugin::WLBLEval
@@ -120,21 +111,18 @@ else
endif
endif
-if can(Mail::SpamAssassin::Conf::feature_blocklist_welcomelist)
+if can(Mail::SpamAssassin::Conf::feature_welcomelist_blocklist)
ifplugin Mail::SpamAssassin::Plugin::WLBLEval
#bz7826 renames whitelist to welcomelist and blacklist to blocklist
header USER_IN_BLOCKLIST_TO eval:check_to_in_blocklist()
describe USER_IN_BLOCKLIST_TO User is listed in 'blocklist_to'
tflags USER_IN_BLOCKLIST_TO userconf nice noautolearn
- score USER_IN_BLOCKLIST 10.0
-
- ifplugin Mail::SpamAssassin::Plugin::RaciallyCharged
- meta USER_IN_BLACKLIST_TO (USER_IN_BLOCKLIST_TO)
- describe USER_IN_BLACKLIST_TO DEPRECATED: See USER_IN_BLOCKLIST_TO
- tflags USER_IN_BLACKLIST_TO userconf nice noautolearn
- score USER_IN_BLOCKLIST_TO 0.01
- score USER_IN_BLACKLIST_TO 10.0
- endif
+ score USER_IN_BLOCKLIST 0.01
+
+ meta USER_IN_BLACKLIST_TO (USER_IN_BLOCKLIST_TO)
+ describe USER_IN_BLACKLIST_TO DEPRECATED: See USER_IN_BLOCKLIST_TO
+ tflags USER_IN_BLACKLIST_TO userconf nice noautolearn
+ score USER_IN_BLACKLIST_TO 10.0
endif
else
ifplugin Mail::SpamAssassin::Plugin::WLBLEval
@@ -150,21 +138,18 @@ else
endif
endif
-if can(Mail::SpamAssassin::Conf::feature_blocklist_welcomelist)
+if can(Mail::SpamAssassin::Conf::feature_welcomelist_blocklist)
ifplugin Mail::SpamAssassin::Plugin::WLBLEval
#bz7826 renames whitelist to welcomelist and blacklist to blocklist
header USER_IN_WELCOMELIST_TO eval:check_to_in_welcomelist()
describe USER_IN_WELCOMELIST_TO User is listed in 'welcomelist_to'
tflags USER_IN_WELCOMELIST_TO userconf nice noautolearn
- score USER_IN_WELCOMELIST_TO -6.0
+ score USER_IN_WELCOMELIST_TO -0.01
- ifplugin Mail::SpamAssassin::Plugin::RaciallyCharged
- meta USER_IN_WHITELIST_TO (USER_IN_WELCOMELIST_TO)
- describe USER_IN_WHITELIST_TO DEPRECATED: See USER_IN_WELCOMELIST_TO
- tflags USER_IN_WHITELIST_TO userconf nice noautolearn
- score USER_IN_WELCOMELIST_TO -0.01
- score USER_IN_WHITELIST_TO -6.0
- endif
+ meta USER_IN_WHITELIST_TO (USER_IN_WELCOMELIST_TO)
+ describe USER_IN_WHITELIST_TO DEPRECATED: See USER_IN_WELCOMELIST_TO
+ tflags USER_IN_WHITELIST_TO userconf nice noautolearn
+ score USER_IN_WHITELIST_TO -6.0
endif
else
ifplugin Mail::SpamAssassin::Plugin::WLBLEval
@@ -190,66 +175,60 @@ ifplugin Mail::SpamAssassin::Plugin::WLB
tflags USER_IN_ALL_SPAM_TO userconf nice noautolearn
endif
-if can(Mail::SpamAssassin::Conf::feature_blocklist_welcomelist)
+if can(Mail::SpamAssassin::Conf::feature_welcomelist_blocklist)
ifplugin Mail::SpamAssassin::Plugin::WLBLEval
#bz7826 renames whitelist to welcomelist and blacklist to blocklist
- body URI_HOST_IN_BLOCKLIST eval:check_uri_host_in_blocklist()
- describe URI_HOST_IN_BLOCKLIST Host or Domain is listed in the user's URI block-list
- tflags URI_HOST_IN_BLOCKLIST userconf noautolearn
- score URI_HOST_IN_BLOCKLIST 100.0
-
- ifplugin Mail::SpamAssassin::Plugin::RaciallyCharged
- meta URI_HOST_IN_BLACKLIST (URI_HOST_IN_BLOCKLIST)
- describe URI_HOST_IN_BLACKLIST DEPRECATED: See URI_HOST_IN_BLOCKLIST
- tflags URI_HOST_IN_BLACKLIST userconf noautolearn
- score URI_HOST_IN_BLOCKLIST -0.01
- score URI_HOST_IN_BLACKLIST 100.0
- endif
+ body URI_HOST_IN_BLOCKLIST eval:check_uri_host_in_blocklist()
+ describe URI_HOST_IN_BLOCKLIST Host or Domain is listed in the user's URI block-list
+ tflags URI_HOST_IN_BLOCKLIST userconf noautolearn
+ score URI_HOST_IN_BLOCKLIST -0.01
+
+ meta URI_HOST_IN_BLACKLIST (URI_HOST_IN_BLOCKLIST)
+ describe URI_HOST_IN_BLACKLIST DEPRECATED: See URI_HOST_IN_BLOCKLIST
+ tflags URI_HOST_IN_BLACKLIST userconf noautolearn
+ score URI_HOST_IN_BLACKLIST 100.0
endif
else
if (version >= 3.004000)
ifplugin Mail::SpamAssassin::Plugin::WLBLEval
- body URI_HOST_IN_BLOCKLIST eval:check_uri_host_in_blacklist()
- describe URI_HOST_IN_BLOCKLIST Host or Domain is listed in the user's URI block-list
- tflags URI_HOST_IN_BLOCKLIST userconf noautolearn
- score URI_HOST_IN_BLOCKLIST -0.01
+ body URI_HOST_IN_BLOCKLIST eval:check_uri_host_in_blacklist()
+ describe URI_HOST_IN_BLOCKLIST Host or Domain is listed in the user's URI block-list
+ tflags URI_HOST_IN_BLOCKLIST userconf noautolearn
+ score URI_HOST_IN_BLOCKLIST -0.01
- meta URI_HOST_IN_BLACKLIST (URI_HOST_IN_BLOCKLIST)
- describe URI_HOST_IN_BLACKLIST DEPRECATED: See URI_HOST_IN_BLOCKLIST
- tflags URI_HOST_IN_BLACKLIST userconf noautolearn
- score URI_HOST_IN_BLACKLIST 100.0
+ meta URI_HOST_IN_BLACKLIST (URI_HOST_IN_BLOCKLIST)
+ describe URI_HOST_IN_BLACKLIST DEPRECATED: See URI_HOST_IN_BLOCKLIST
+ tflags URI_HOST_IN_BLACKLIST userconf noautolearn
+ score URI_HOST_IN_BLACKLIST 100.0
endif
endif
endif
-if can(Mail::SpamAssassin::Conf::feature_blocklist_welcomelist)
+if can(Mail::SpamAssassin::Conf::feature_welcomelist_blocklist)
ifplugin Mail::SpamAssassin::Plugin::WLBLEval
#bz7826 renames whitelist to welcomelist and blacklist to blocklist
- body URI_HOST_IN_WELCOMELIST eval:check_uri_host_in_welcomelist()
- describe URI_HOST_IN_WELCOMELIST Host or Domain is listed in the user's URI welcome-list
- tflags URI_HOST_IN_WELCOMELIST userconf nice noautolearn
- score URI_HOST_IN_WELCOMELIST -100.0
+ body URI_HOST_IN_WELCOMELIST eval:check_uri_host_in_welcomelist()
+ describe URI_HOST_IN_WELCOMELIST Host or Domain is listed in the user's URI welcome-list
+ tflags URI_HOST_IN_WELCOMELIST userconf nice noautolearn
+ score URI_HOST_IN_WELCOMELIST -0.01
- ifplugin Mail::SpamAssassin::Plugin::RaciallyCharged
- meta URI_HOST_IN_WHITELIST (URI_HOST_IN_WELCOMELIST)
- describe URI_HOST_IN_WHITELIST DEPRECATED: See URI_HOST_IN_WELCOMELIST
- tflags URI_HOST_IN_WHITELIST userconf nice noautolearn
- score URI_HOST_IN_WELCOMELIST -0.01
- score URI_HOST_IN_WHITELIST -100.0
- endif
+ meta URI_HOST_IN_WHITELIST (URI_HOST_IN_WELCOMELIST)
+ describe URI_HOST_IN_WHITELIST DEPRECATED: See URI_HOST_IN_WELCOMELIST
+ tflags URI_HOST_IN_WHITELIST userconf nice noautolearn
+ score URI_HOST_IN_WHITELIST -100.0
endif
else
if (version >= 3.004000)
ifplugin Mail::SpamAssassin::Plugin::WLBLEval
- body URI_HOST_IN_WELCOMELIST eval:check_uri_host_in_whitelist()
- describe URI_HOST_IN_WELCOMELIST Host or Domain is listed in the user's URI welcome-list
- tflags URI_HOST_IN_WELCOMELIST userconf nice noautolearn
- score URI_HOST_IN_WELCOMELIST -0.01
-
- meta URI_HOST_IN_WHITELIST (URI_HOST_IN_WELCOMELIST)
- describe URI_HOST_IN_WHITELIST DEPRECATED: See URI_HOST_IN_WELCOMELIST
- tflags URI_HOST_IN_WHITELIST userconf nice noautolearn
- score URI_HOST_IN_WHITELIST -100.0
+ body URI_HOST_IN_WELCOMELIST eval:check_uri_host_in_whitelist()
+ describe URI_HOST_IN_WELCOMELIST Host or Domain is listed in the user's URI welcome-list
+ tflags URI_HOST_IN_WELCOMELIST userconf nice noautolearn
+ score URI_HOST_IN_WELCOMELIST -0.01
+
+ meta URI_HOST_IN_WHITELIST (URI_HOST_IN_WELCOMELIST)
+ describe URI_HOST_IN_WHITELIST DEPRECATED: See URI_HOST_IN_WELCOMELIST
+ tflags URI_HOST_IN_WHITELIST userconf nice noautolearn
+ score URI_HOST_IN_WHITELIST -100.0
endif
endif
endif
@@ -257,11 +236,11 @@ endif
# Bug 7256, using a header rule with an eval() function does not work the way
# this was intended.
- # header HEADER_HOST_IN_BLACKLIST eval:check_uri_host_listed('BLACK')
+ # header HEADER_HOST_IN_BLACKLIST eval:check_uri_host_listed('BLOCK')
# describe HEADER_HOST_IN_BLACKLIST Host or Domain in header is listed in the user's URI black-list
# tflags HEADER_HOST_IN_BLACKLIST userconf noautolearn
- # header HEADER_HOST_IN_WHITELIST eval:check_uri_host_listed('WHITE')
+ # header HEADER_HOST_IN_WHITELIST eval:check_uri_host_listed('WELCOME')
# describe HEADER_HOST_IN_WHITELIST Host or Domain in header is listed in the user's URI white-list
# tflags HEADER_HOST_IN_WHITELIST userconf nice noautolearn
Copied: spamassassin/branches/trunk-welcomelist/rules/60_welcomelist_auth.cf (from r1899924, spamassassin/branches/trunk-welcomelist/rules/60_whitelist_auth.cf)
URL: http://svn.apache.org/viewvc/spamassassin/branches/trunk-welcomelist/rules/60_welcomelist_auth.cf?p2=spamassassin/branches/trunk-welcomelist/rules/60_welcomelist_auth.cf&p1=spamassassin/branches/trunk-welcomelist/rules/60_whitelist_auth.cf&r1=1899924&r2=1899925&rev=1899925&view=diff
==============================================================================
--- spamassassin/branches/trunk-welcomelist/rules/60_whitelist_auth.cf (original)
+++ spamassassin/branches/trunk-welcomelist/rules/60_welcomelist_auth.cf Sun Apr 17 07:23:40 2022
@@ -24,7 +24,7 @@
###########################################################################
# SPF and DKIM whitelist rules
-if can(Mail::SpamAssassin::Conf::feature_blocklist_welcomelist)
+if can(Mail::SpamAssassin::Conf::feature_welcomelist_blocklist)
###########################################################################
# These should be primarily envelope-from addresses which send mail that is
@@ -1991,5 +1991,5 @@ def_whitelist_auth *@*.testingmom.com
def_whitelist_auth *@*.ceramicartsnetwork.org
def_whitelist_auth *@*.verintefm.com
-endif # if can(Mail::SpamAssassin::Conf::feature_blocklist_welcomelist)
+endif # if can(Mail::SpamAssassin::Conf::feature_welcomelist_blocklist)
Copied: spamassassin/branches/trunk-welcomelist/rules/60_welcomelist_dkim.cf (from r1899924, spamassassin/branches/trunk-welcomelist/rules/60_whitelist_dkim.cf)
URL: http://svn.apache.org/viewvc/spamassassin/branches/trunk-welcomelist/rules/60_welcomelist_dkim.cf?p2=spamassassin/branches/trunk-welcomelist/rules/60_welcomelist_dkim.cf&p1=spamassassin/branches/trunk-welcomelist/rules/60_whitelist_dkim.cf&r1=1899924&r2=1899925&rev=1899925&view=diff
==============================================================================
--- spamassassin/branches/trunk-welcomelist/rules/60_whitelist_dkim.cf (original)
+++ spamassassin/branches/trunk-welcomelist/rules/60_welcomelist_dkim.cf Sun Apr 17 07:23:40 2022
@@ -26,21 +26,18 @@
#For those wondering why there's not just an ifplugin in front of all of this, there's a big involving it
#in nested if statements
-if can(Mail::SpamAssassin::Conf::feature_blocklist_welcomelist)
+if can(Mail::SpamAssassin::Conf::feature_welcomelist_blocklist)
ifplugin Mail::SpamAssassin::Plugin::DKIM
#bz7826 renames whitelist to welcomelist and blacklist to blocklist
header USER_IN_DKIM_WELCOMELIST eval:check_for_dkim_welcomelist_from()
describe USER_IN_DKIM_WELCOMELIST From: address is in the user's DKIM welcomelist
tflags USER_IN_DKIM_WELCOMELIST nice noautolearn net userconf
- score USER_IN_DKIM_WELCOMELIST -100.000
+ score USER_IN_DKIM_WELCOMELIST -0.01
- ifplugin Mail::SpamAssassin::Plugin::RaciallyCharged
- meta USER_IN_DKIM_WHITELIST (USER_IN_DKIM_WELCOMELIST)
- describe USER_IN_DKIM_WHITELIST DEPRECATED: See USER_IN_DKIM_WELCOMELIST
- tflags USER_IN_DKIM_WHITELIST nice noautolearn net userconf
- score USER_IN_DKIM_WELCOMELIST -0.01
- score USER_IN_DKIM_WHITELIST -100.000
- endif
+ meta USER_IN_DKIM_WHITELIST (USER_IN_DKIM_WELCOMELIST)
+ describe USER_IN_DKIM_WHITELIST DEPRECATED: See USER_IN_DKIM_WELCOMELIST
+ tflags USER_IN_DKIM_WHITELIST nice noautolearn net userconf
+ score USER_IN_DKIM_WHITELIST -100.000
endif
#might be a way to only have one instance of the below block, unsure if it's even necessary
@@ -66,7 +63,7 @@ else
endif
-if can(Mail::SpamAssassin::Conf::feature_blocklist_welcomelist)
+if can(Mail::SpamAssassin::Conf::feature_welcomelist_blocklist)
ifplugin Mail::SpamAssassin::Plugin::DKIM
# The backwards compatibility for this rule will be after the else statement below
@@ -321,5 +318,5 @@ def_whitelist_from_dkim *@*.msgfocus.com
def_whitelist_from_dkim *@boredpanda.com mailersend.com
endif # Mail::SpamAssassin::Plugin::DKIM
-endif # if can(Mail::SpamAssassin::Conf::feature_blocklist_welcomelist)
+endif # if can(Mail::SpamAssassin::Conf::feature_welcomelist_blocklist)
Copied: spamassassin/branches/trunk-welcomelist/rules/60_welcomelist_subject.cf (from r1899924, spamassassin/branches/trunk-welcomelist/rules/60_whitelist_subject.cf)
URL: http://svn.apache.org/viewvc/spamassassin/branches/trunk-welcomelist/rules/60_welcomelist_subject.cf?p2=spamassassin/branches/trunk-welcomelist/rules/60_welcomelist_subject.cf&p1=spamassassin/branches/trunk-welcomelist/rules/60_whitelist_subject.cf&r1=1899924&r2=1899925&rev=1899925&view=diff
==============================================================================
--- spamassassin/branches/trunk-welcomelist/rules/60_whitelist_subject.cf (original)
+++ spamassassin/branches/trunk-welcomelist/rules/60_welcomelist_subject.cf Sun Apr 17 07:23:40 2022
@@ -29,6 +29,28 @@
# user slip-up could result in scribbling side-effects in the bayes
# db as a result -- which is hard to remedy.
+# 4.0 module rename, Bug 7826
+ifplugin Mail::SpamAssassin::Plugin::WelcomeListSubject
+
+header SUBJECT_IN_WELCOMELIST eval:check_subject_in_welcomelist()
+describe SUBJECT_IN_WELCOMELIST Subject: contains string in the user's welcome-list
+tflags SUBJECT_IN_WELCOMELIST userconf nice noautolearn
+score SUBJECT_IN_WELCOMELIST -100
+
+header SUBJECT_IN_BLOCKLIST eval:check_subject_in_blocklist()
+describe SUBJECT_IN_BLOCKLIST Subject: contains string in the user's block-list
+tflags SUBJECT_IN_BLOCKLIST userconf noautolearn
+score SUBJECT_IN_BLOCKLIST 100
+
+meta SUBJECT_IN_WHITELIST (SUBJECT_IN_WELCOMELIST)
+describe SUBJECT_IN_WHITELIST DEPRECATED: See SUBJECT_IN_WELCOMELIST
+score SUBJECT_IN_WHITELIST -0.01
+
+meta SUBJECT_IN_BLACKLIST (SUBJECT_IN_BLOCKLIST)
+describe SUBJECT_IN_BLACKLIST DEPRECATED: See SUBJECT_IN_BLOCKLIST
+score SUBJECT_IN_BLACKLIST -0.01
+
+else
ifplugin Mail::SpamAssassin::Plugin::WhiteListSubject
header SUBJECT_IN_WHITELIST eval:check_subject_in_whitelist()
@@ -40,3 +62,5 @@ describe SUBJECT_IN_BLACKLIST Subject: c
tflags SUBJECT_IN_BLACKLIST userconf noautolearn
endif # Mail::SpamAssassin::Plugin::WhiteListSubject
+endif
+
Modified: spamassassin/branches/trunk-welcomelist/rules/local.cf
URL: http://svn.apache.org/viewvc/spamassassin/branches/trunk-welcomelist/rules/local.cf?rev=1899925&r1=1899924&r2=1899925&view=diff
==============================================================================
--- spamassassin/branches/trunk-welcomelist/rules/local.cf (original)
+++ spamassassin/branches/trunk-welcomelist/rules/local.cf Sun Apr 17 07:23:40 2022
@@ -82,24 +82,22 @@
#
ifplugin Mail::SpamAssassin::Plugin::Shortcircuit
#
-# default: strongly-whitelisted mails are *really* whitelisted now, if the
-# shortcircuiting plugin is active, causing early exit to save CPU load.
-# Uncomment to turn this on
+# default: strongly-welcomelisted mails are *really* welcomelisted now, if
+# the shortcircuiting plugin is active, causing early exit to save CPU
+# load. Uncomment to turn this on
#
# SpamAssassin tries hard not to launch DNS queries before priority -100.
# If you want to shortcircuit without launching unneeded queries, make
# sure such rule priority is below -100. These examples are already:
#
-# shortcircuit USER_IN_WHITELIST on
-# shortcircuit USER_IN_DEF_WHITELIST on
+# shortcircuit USER_IN_WELCOMELIST on
+# shortcircuit USER_IN_DEF_WELCOMELIST on
# shortcircuit USER_IN_ALL_SPAM_TO on
-# shortcircuit SUBJECT_IN_WHITELIST on
# the opposite; blacklisted mails can also save CPU
#
# shortcircuit USER_IN_BLACKLIST on
# shortcircuit USER_IN_BLACKLIST_TO on
-# shortcircuit SUBJECT_IN_BLACKLIST on
# if you have taken the time to correctly specify your "trusted_networks",
# this is another good way to save CPU
Modified: spamassassin/branches/trunk-welcomelist/rules/v310.pre
URL: http://svn.apache.org/viewvc/spamassassin/branches/trunk-welcomelist/rules/v310.pre?rev=1899925&r1=1899924&r2=1899925&view=diff
==============================================================================
--- spamassassin/branches/trunk-welcomelist/rules/v310.pre (original)
+++ spamassassin/branches/trunk-welcomelist/rules/v310.pre Sun Apr 17 07:23:40 2022
@@ -40,7 +40,7 @@ loadplugin Mail::SpamAssassin::Plugin::S
#
#loadplugin Mail::SpamAssassin::Plugin::AntiVirus
-# AWL - do auto-whitelist checks
+# AWL - do auto-welcomelist checks
#
#loadplugin Mail::SpamAssassin::Plugin::AWL
@@ -56,9 +56,9 @@ loadplugin Mail::SpamAssassin::Plugin::A
#
#loadplugin Mail::SpamAssassin::Plugin::AccessDB
-# WhitelistSubject - Whitelist/Blacklist certain subject regular expressions
+# WelcomelistSubject - Welcomelist/Blocklist certain subject regular expressions
#
-loadplugin Mail::SpamAssassin::Plugin::WhiteListSubject
+loadplugin Mail::SpamAssassin::Plugin::WelcomeListSubject
###########################################################################
# experimental plugins
Modified: spamassassin/branches/trunk-welcomelist/rules/v400.pre
URL: http://svn.apache.org/viewvc/spamassassin/branches/trunk-welcomelist/rules/v400.pre?rev=1899925&r1=1899924&r2=1899925&view=diff
==============================================================================
--- spamassassin/branches/trunk-welcomelist/rules/v400.pre (original)
+++ spamassassin/branches/trunk-welcomelist/rules/v400.pre Sun Apr 17 07:23:40 2022
@@ -16,11 +16,6 @@
# added to new files, named according to the release they're added in.
###########################################################################
-# RaciallyCharged - Enables racially charged configuration options for
-# backwards compatibility
-#
-# loadplugin Mail::SpamAssassin::Plugin::RaciallyCharged
-
# Esp - Checks for spam coming from some Esp providers
#
# loadplugin Mail::SpamAssassin::Plugin::Esp
Modified: spamassassin/branches/trunk-welcomelist/sa-awl.raw
URL: http://svn.apache.org/viewvc/spamassassin/branches/trunk-welcomelist/sa-awl.raw?rev=1899925&r1=1899924&r2=1899925&view=diff
==============================================================================
--- spamassassin/branches/trunk-welcomelist/sa-awl.raw (original)
+++ spamassassin/branches/trunk-welcomelist/sa-awl.raw Sun Apr 17 07:23:40 2022
@@ -67,7 +67,13 @@ use AnyDBM_File ;
my $db;
if ($#ARGV == -1) {
- $db = $ENV{HOME}."/.spamassassin/auto-whitelist";
+ # Check for existing file from <4.0, compatibility to be removed in 4.1
+ if (!-e $ENV{HOME}."/.spamassassin/auto-welcomelist" &&
+ -e $ENV{HOME}."/.spamassassin/auto-whitelist") {
+ $db = $ENV{HOME}."/.spamassassin/auto-whitelist";
+ } else {
+ $db = $ENV{HOME}."/.spamassassin/auto-welcomelist";
+ }
} else {
$db = $ARGV[0];
}
@@ -120,7 +126,7 @@ untie %h;
=head1 NAME
-sa-awl - examine and manipulate SpamAssassin's auto-whitelist db
+sa-awl - examine and manipulate SpamAssassin's auto-welcomelist db
=head1 SYNOPSIS
@@ -128,10 +134,10 @@ B<sa-awl> [--clean] [--min n] [dbfile]
=head1 DESCRIPTION
-Check or clean a SpamAssassin auto-whitelist (AWL) database file.
+Check or clean a SpamAssassin auto-welcomelist (AWL) database file.
The name of the file is specified after any options, as C<dbfile>.
-The default is C<$HOME/.spamassassin/auto-whitelist>.
+The default is C<$HOME/.spamassassin/auto-welcomelist>.
=head1 OPTIONS
Modified: spamassassin/branches/trunk-welcomelist/sa-learn.raw
URL: http://svn.apache.org/viewvc/spamassassin/branches/trunk-welcomelist/sa-learn.raw?rev=1899925&r1=1899924&r2=1899925&view=diff
==============================================================================
--- spamassassin/branches/trunk-welcomelist/sa-learn.raw (original)
+++ spamassassin/branches/trunk-welcomelist/sa-learn.raw Sun Apr 17 07:23:40 2022
@@ -989,7 +989,7 @@ With Bayesian analysis, it's all probabi
it is likely as this falls into a probabilistic distribution common to past
spam in your systems". Tell that to your users! Tell that to the client
when he asks "what can I do to change this". (By the way, the answer in
-this case is "use whitelisting".)
+this case is "use welcomelisting".)
=item It will take disk space and memory.
Modified: spamassassin/branches/trunk-welcomelist/spamassassin.raw
URL: http://svn.apache.org/viewvc/spamassassin/branches/trunk-welcomelist/spamassassin.raw?rev=1899925&r1=1899924&r2=1899925&view=diff
==============================================================================
--- spamassassin/branches/trunk-welcomelist/spamassassin.raw (original)
+++ spamassassin/branches/trunk-welcomelist/spamassassin.raw Sun Apr 17 07:23:40 2022
@@ -160,7 +160,7 @@ if ($Mail::SpamAssassin::VERSION ne '@@V
#
my %opt = ( 'create-prefs' => 1, 'format' => 'detect', pre => [], cf => [] );
-my $doing_whitelist_operation = 0;
+my $doing_welcomelist_operation = 0;
my $count = 0;
my @targets = ();
my $exitvalue;
@@ -174,10 +174,14 @@ my $total_messages = 0;
Getopt::Long::Configure(
qw(bundling no_getopt_compat no_auto_abbrev no_ignore_case));
GetOptions(
- 'add-addr-to-blacklist=s' => \$opt{'add-addr-to-blacklist'},
- 'add-addr-to-whitelist=s' => \$opt{'add-addr-to-whitelist'},
- 'add-to-blacklist' => \$opt{'add-to-blacklist'},
- 'add-to-whitelist|W' => \$opt{'add-to-whitelist'},
+ 'add-addr-to-blocklist=s' => \$opt{'add-addr-to-blocklist'},
+ 'add-addr-to-welcomelist=s' => \$opt{'add-addr-to-welcomelist'},
+ 'add-addr-to-blacklist=s' => \$opt{'add-addr-to-blocklist'}, # removed in 4.1
+ 'add-addr-to-whitelist=s' => \$opt{'add-addr-to-welcomelist'}, # removed in 4.1
+ 'add-to-blocklist' => \$opt{'add-to-blocklist'},
+ 'add-to-welcomelist|W' => \$opt{'add-to-welcomelist'},
+ 'add-to-blacklist' => \$opt{'add-to-blocklist'}, # removed in 4.1
+ 'add-to-whitelist' => \$opt{'add-to-welcomelist'}, # removed in 4.1
'configpath|config-file|config-dir|c|C=s' => \$opt{'configpath'},
'create-prefs!' => \$opt{'create-prefs'},
'pre=s' => \@{$opt{'pre'}},
@@ -195,8 +199,10 @@ GetOptions(
'mbox' => sub { $opt{'format'} = 'mbox'; },
'mbx' => sub { $opt{'format'} = 'mbx'; },
'prefspath|prefs-file|p=s' => \$opt{'prefspath'},
- 'remove-addr-from-whitelist=s' => \$opt{'remove-addr-from-whitelist'},
- 'remove-from-whitelist|R' => \$opt{'remove-from-whitelist'},
+ 'remove-addr-from-welcomelist=s' => \$opt{'remove-addr-from-welcomelist'},
+ 'remove-from-welcomelist|R' => \$opt{'remove-from-welcomelist'},
+ 'remove-addr-from-whitelist=s' => \$opt{'remove-addr-from-welcomelist'}, # removed in 4.1
+ 'remove-from-whitelist' => \$opt{'remove-from-welcomelist'}, # removed in 4.1
'remove-markup|despamassassinify|d' => \$opt{'remove-markup'},
'report|r' => \$opt{'report'},
'revoke|k' => \$opt{'revoke'},
@@ -284,23 +290,23 @@ if ($opt{'lint'}) {
exit $res ? 1 : 0;
}
-if ($opt{'remove-addr-from-whitelist'} ||
- $opt{'add-addr-to-whitelist'} ||
- $opt{'add-addr-to-blacklist'})
+if ($opt{'remove-addr-from-welcomelist'} ||
+ $opt{'add-addr-to-welcomelist'} ||
+ $opt{'add-addr-to-blocklist'})
{
$spamtest->init(1);
- if ( $opt{'add-addr-to-whitelist'} ) {
- $spamtest->add_address_to_whitelist($opt{'add-addr-to-whitelist'}, 1);
+ if ( $opt{'add-addr-to-welcomelist'} ) {
+ $spamtest->add_address_to_welcomelist($opt{'add-addr-to-welcomelist'}, 1);
}
- elsif ( $opt{'remove-addr-from-whitelist'} ) {
- $spamtest->remove_address_from_whitelist($opt{'remove-addr-from-whitelist'}, 1);
+ elsif ( $opt{'remove-addr-from-welcomelist'} ) {
+ $spamtest->remove_address_from_welcomelist($opt{'remove-addr-from-welcomelist'}, 1);
}
- elsif ( $opt{'add-addr-to-blacklist'} ) {
- $spamtest->add_address_to_blacklist($opt{'add-addr-to-blacklist'}, 1);
+ elsif ( $opt{'add-addr-to-blocklist'} ) {
+ $spamtest->add_address_to_blocklist($opt{'add-addr-to-blocklist'}, 1);
}
else {
- die "spamassassin: oops! unhandled whitelist operation";
+ die "spamassassin: oops! unhandled welcomelist operation";
}
$spamtest->finish();
@@ -310,21 +316,21 @@ if ($opt{'remove-addr-from-whitelist'} |
exit(0);
}
-# if we're going to do white/black-listing, let's prep now...
-if ( $opt{'remove-from-whitelist'}
- or $opt{'add-to-whitelist'}
- or $opt{'add-to-blacklist'} )
+# if we're going to do welcome/block-listing, let's prep now...
+if ( $opt{'remove-from-welcomelist'}
+ or $opt{'add-to-welcomelist'}
+ or $opt{'add-to-blocklist'} )
{
- $doing_whitelist_operation = 1;
+ $doing_welcomelist_operation = 1;
$spamtest->init(1);
}
# if we're doing things in test mode, force disable long-term memory
-# functions like autowhitelist and bayes autolearn.
+# functions like autowelcomelist and bayes autolearn.
# XXX - feels like we need a plugin hook here so plugins can be made
# aware and take appropriate action.
if ($opt{'test-mode'}) {
- $spamtest->{'conf'}->{'use_auto_whitelist'} = 0;
+ $spamtest->{'conf'}->{'use_auto_welcomelist'} = 0;
$spamtest->{'conf'}->{'bayes_auto_learn'} = 0;
}
@@ -410,7 +416,7 @@ if (defined $tempfile) {
# Let folks know how many messages were handled, as long as the handling
# didn't produce output (ala: check, test, or remove_markup ...)
-if ( $opt{'report'} || $opt{'revoke'} || $doing_whitelist_operation ) {
+if ( $opt{'report'} || $opt{'revoke'} || $doing_welcomelist_operation ) {
print "$count message(s) examined.\n" or die "error writing: $!";
}
@@ -459,19 +465,19 @@ sub wanted {
$mail = $spamtest->parse($dataref);
$count++;
- # This is a short cut -- doing white/black-list? Do it and return quickly.
- if ($doing_whitelist_operation) {
- if ( $opt{'add-to-whitelist'} ) {
- $spamtest->add_all_addresses_to_whitelist($mail, 1);
+ # This is a short cut -- doing welcome/block-list? Do it and return quickly.
+ if ($doing_welcomelist_operation) {
+ if ( $opt{'add-to-welcomelist'} ) {
+ $spamtest->add_all_addresses_to_welcomelist($mail, 1);
}
- elsif ( $opt{'remove-from-whitelist'} ) {
- $spamtest->remove_all_addresses_from_whitelist($mail, 1);
+ elsif ( $opt{'remove-from-welcomelist'} ) {
+ $spamtest->remove_all_addresses_from_welcomelist($mail, 1);
}
- elsif ( $opt{'add-to-blacklist'} ) {
- $spamtest->add_all_addresses_to_blacklist($mail, 1);
+ elsif ( $opt{'add-to-blocklist'} ) {
+ $spamtest->add_all_addresses_to_blocklist($mail, 1);
}
else {
- warn "spamassassin: oops! unhandled whitelist operation";
+ warn "spamassassin: oops! unhandled welcomelist operation";
}
$mail->finish();
@@ -831,8 +837,8 @@ from the SpamAssassin distribution.
Mail::SpamAssassin::ArchiveIterator
find and process messages one at a time
- Mail::SpamAssassin::AutoWhitelist
- auto-whitelist handler for SpamAssassin
+ Mail::SpamAssassin::AutoWelcomelist
+ auto-welcomelist handler for SpamAssassin
Mail::SpamAssassin::Bayes
determine spammishness using a Bayesian classifier
@@ -883,7 +889,7 @@ from the SpamAssassin distribution.
look up URLs against DNS blocklists
Mail::SpamAssassin::SQLBasedAddrList
- SpamAssassin SQL Based Auto Whitelist
+ SpamAssassin SQL Based Auto Welcomelist
=head1 BUGS
Modified: spamassassin/branches/trunk-welcomelist/spamc/spamc.c
URL: http://svn.apache.org/viewvc/spamassassin/branches/trunk-welcomelist/spamc/spamc.c?rev=1899925&r1=1899924&r2=1899925&view=diff
==============================================================================
--- spamassassin/branches/trunk-welcomelist/spamc/spamc.c (original)
+++ spamassassin/branches/trunk-welcomelist/spamc/spamc.c Sun Apr 17 07:23:40 2022
@@ -776,7 +776,7 @@ get_output_fd(int *fd)
* If the program's caller didn't identify the user to run as, use the
* current user for this. Note that we're not talking about UNIX perm-
* issions, but giving SpamAssassin a username so it can do per-user
- * configuration (whitelists & the like).
+ * configuration (welcomelists & the like).
*
* Allocates memory for the username, returns EX_OK if successful.
*/
Modified: spamassassin/branches/trunk-welcomelist/spamd/README
URL: http://svn.apache.org/viewvc/spamassassin/branches/trunk-welcomelist/spamd/README?rev=1899925&r1=1899924&r2=1899925&view=diff
==============================================================================
--- spamassassin/branches/trunk-welcomelist/spamd/README (original)
+++ spamassassin/branches/trunk-welcomelist/spamd/README Sun Apr 17 07:23:40 2022
@@ -83,9 +83,9 @@ use mysql or LDAP for per-user configura
to run as root, and this remains fully functional.
If you do not need to let your users define their own rules, maintain
-their own whitelists, or have non-world-readable home and ~/.spamassassin
+their own welcomelists, or have non-world-readable home and ~/.spamassassin
directories, then just set spamd up to run with the "-u username" option.
-Since spamd can use auto-whitelisting, which requires it maintain a
+Since spamd can use auto-welcomelisting, which requires it maintain a
database of email addresses on-disk, you should use a non-"root" but
non-"nobody" user: "mailnull" or "mail" are good choices, or even create a
"spamd" user.
@@ -129,7 +129,7 @@ spamc, it is easily possible for malicio
spamc clients to make spamd:
(1.) read (and hence determine) the contents of other users configurations
- (2.) change the contents of other users configurations (whitelisting)
+ (2.) change the contents of other users configurations (welcomelisting)
(3.) grab CPU time as that user -- this is an issue on ulimit'd systems
If users do not have the opportunity to invoke spamc themselves, and
Modified: spamassassin/branches/trunk-welcomelist/spamd/spamd.raw
URL: http://svn.apache.org/viewvc/spamassassin/branches/trunk-welcomelist/spamd/spamd.raw?rev=1899925&r1=1899924&r2=1899925&view=diff
==============================================================================
--- spamassassin/branches/trunk-welcomelist/spamd/spamd.raw (original)
+++ spamassassin/branches/trunk-welcomelist/spamd/spamd.raw Sun Apr 17 07:23:40 2022
@@ -743,7 +743,7 @@ if ( defined $ENV{'HOME'} ) {
delete $ENV{'HOME'}; # we do not want to use this when running spamd
}
-# Do whitelist later in tmp dir. Side effect: this will be done as -u user.
+# Do welcomelist later in tmp dir. Side effect: this will be done as -u user.
# Initialize SSL options
Modified: spamassassin/branches/trunk-welcomelist/t/SATest.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/trunk-welcomelist/t/SATest.pm?rev=1899925&r1=1899924&r2=1899925&view=diff
==============================================================================
--- spamassassin/branches/trunk-welcomelist/t/SATest.pm (original)
+++ spamassassin/branches/trunk-welcomelist/t/SATest.pm Sun Apr 17 07:23:40 2022
@@ -197,7 +197,7 @@ sub sa_t_init {
$set_user_prefs = 0;
$default_cf_lines = "
bayes_path ./$userstate/bayes
- auto_whitelist_path ./$userstate/auto-whitelist
+ auto_whitelist_path ./$userstate/auto-welcomelist
";
read_config();
Modified: spamassassin/branches/trunk-welcomelist/t/all_modules.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/trunk-welcomelist/t/all_modules.t?rev=1899925&r1=1899924&r2=1899925&view=diff
==============================================================================
--- spamassassin/branches/trunk-welcomelist/t/all_modules.t (original)
+++ spamassassin/branches/trunk-welcomelist/t/all_modules.t Sun Apr 17 07:23:40 2022
@@ -22,7 +22,7 @@ tstpre ("
loadplugin Mail::SpamAssassin::Plugin::AutoLearnThreshold
loadplugin Mail::SpamAssassin::Plugin::TextCat
loadplugin Mail::SpamAssassin::Plugin::AccessDB
- loadplugin Mail::SpamAssassin::Plugin::WhiteListSubject
+ loadplugin Mail::SpamAssassin::Plugin::WelcomeListSubject
loadplugin Mail::SpamAssassin::Plugin::MIMEHeader
loadplugin Mail::SpamAssassin::Plugin::ReplaceTags
loadplugin Mail::SpamAssassin::Plugin::DKIM
Modified: spamassassin/branches/trunk-welcomelist/t/bayesbdb.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/trunk-welcomelist/t/bayesbdb.t?rev=1899925&r1=1899924&r2=1899925&view=diff
==============================================================================
--- spamassassin/branches/trunk-welcomelist/t/bayesbdb.t (original)
+++ spamassassin/branches/trunk-welcomelist/t/bayesbdb.t Sun Apr 17 07:23:40 2022
@@ -161,7 +161,7 @@ ok_all_patterns();
ok(salearnrun("--ham data/nice", \&check_examined));
ok_all_patterns();
-ok(salearnrun("--ham data/whitelists", \&check_examined));
+ok(salearnrun("--ham data/welcomelists", \&check_examined));
ok_all_patterns();
%patterns = ( 'non-token data: bayes db version' => 'db version' );
Modified: spamassassin/branches/trunk-welcomelist/t/bayesdbm.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/trunk-welcomelist/t/bayesdbm.t?rev=1899925&r1=1899924&r2=1899925&view=diff
==============================================================================
--- spamassassin/branches/trunk-welcomelist/t/bayesdbm.t (original)
+++ spamassassin/branches/trunk-welcomelist/t/bayesdbm.t Sun Apr 17 07:23:40 2022
@@ -181,7 +181,7 @@ ok_all_patterns();
ok(salearnrun("--ham data/nice", \&check_examined));
ok_all_patterns();
-ok(salearnrun("--ham data/whitelists", \&check_examined));
+ok(salearnrun("--ham data/welcomelists", \&check_examined));
ok_all_patterns();
%patterns = ( 'non-token data: bayes db version' => 'db version' );
Modified: spamassassin/branches/trunk-welcomelist/t/bayesdbm_flock.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/trunk-welcomelist/t/bayesdbm_flock.t?rev=1899925&r1=1899924&r2=1899925&view=diff
==============================================================================
--- spamassassin/branches/trunk-welcomelist/t/bayesdbm_flock.t (original)
+++ spamassassin/branches/trunk-welcomelist/t/bayesdbm_flock.t Sun Apr 17 07:23:40 2022
@@ -191,7 +191,7 @@ ok_all_patterns();
ok(salearnrun("--ham data/nice", \&check_examined));
ok_all_patterns();
-ok(salearnrun("--ham data/whitelists", \&check_examined));
+ok(salearnrun("--ham data/welcomelists", \&check_examined));
ok_all_patterns();
%patterns = ( 'non-token data: bayes db version' => 'db version' );
Modified: spamassassin/branches/trunk-welcomelist/t/bayessdbm.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/trunk-welcomelist/t/bayessdbm.t?rev=1899925&r1=1899924&r2=1899925&view=diff
==============================================================================
--- spamassassin/branches/trunk-welcomelist/t/bayessdbm.t (original)
+++ spamassassin/branches/trunk-welcomelist/t/bayessdbm.t Sun Apr 17 07:23:40 2022
@@ -186,7 +186,7 @@ ok_all_patterns();
ok(salearnrun("--ham data/nice", \&check_examined));
ok_all_patterns();
-ok(salearnrun("--ham data/whitelists", \&check_examined));
+ok(salearnrun("--ham data/welcomelists", \&check_examined));
ok_all_patterns();
%patterns = ( 'non-token data: bayes db version' => 'db version' );
Modified: spamassassin/branches/trunk-welcomelist/t/bayessdbm_seen_delete.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/trunk-welcomelist/t/bayessdbm_seen_delete.t?rev=1899925&r1=1899924&r2=1899925&view=diff
==============================================================================
--- spamassassin/branches/trunk-welcomelist/t/bayessdbm_seen_delete.t (original)
+++ spamassassin/branches/trunk-welcomelist/t/bayessdbm_seen_delete.t Sun Apr 17 07:23:40 2022
@@ -185,7 +185,7 @@ ok_all_patterns();
ok(salearnrun("--ham data/nice", \&check_examined));
ok_all_patterns();
-ok(salearnrun("--ham data/whitelists", \&check_examined));
+ok(salearnrun("--ham data/welcomelists", \&check_examined));
ok_all_patterns();
%patterns = ( 'non-token data: bayes db version' => 'db version' );
Modified: spamassassin/branches/trunk-welcomelist/t/bayessql.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/trunk-welcomelist/t/bayessql.t?rev=1899925&r1=1899924&r2=1899925&view=diff
==============================================================================
--- spamassassin/branches/trunk-welcomelist/t/bayessql.t (original)
+++ spamassassin/branches/trunk-welcomelist/t/bayessql.t Sun Apr 17 07:23:40 2022
@@ -345,7 +345,7 @@ ok_all_patterns();
ok(salearnrun("--ham data/nice", \&check_examined));
ok_all_patterns();
-ok(salearnrun("--ham data/whitelists", \&check_examined));
+ok(salearnrun("--ham data/welcomelists", \&check_examined));
ok_all_patterns();
%patterns = ( 'non-token data: bayes db version' => 'db version' );
Modified: spamassassin/branches/trunk-welcomelist/t/data/01_test_rules.pre
URL: http://svn.apache.org/viewvc/spamassassin/branches/trunk-welcomelist/t/data/01_test_rules.pre?rev=1899925&r1=1899924&r2=1899925&view=diff
==============================================================================
--- spamassassin/branches/trunk-welcomelist/t/data/01_test_rules.pre (original)
+++ spamassassin/branches/trunk-welcomelist/t/data/01_test_rules.pre Sun Apr 17 07:23:40 2022
@@ -17,7 +17,6 @@ loadplugin Mail::SpamAssassin::Plugin::H
loadplugin Mail::SpamAssassin::Plugin::FromNameSpoof
loadplugin Mail::SpamAssassin::Plugin::Phishing
loadplugin Mail::SpamAssassin::Plugin::OLEVBMacro
-loadplugin Mail::SpamAssassin::Plugin::RaciallyCharged
loadplugin Mail::SpamAssassin::Plugin::Esp
loadplugin Mail::SpamAssassin::Plugin::ExtractText
Modified: spamassassin/branches/trunk-welcomelist/t/debug.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/trunk-welcomelist/t/debug.t?rev=1899925&r1=1899924&r2=1899925&view=diff
==============================================================================
--- spamassassin/branches/trunk-welcomelist/t/debug.t (original)
+++ spamassassin/branches/trunk-welcomelist/t/debug.t Sun Apr 17 07:23:40 2022
@@ -11,12 +11,12 @@ plan tests => 3;
# list of known debug facilities
my %facility = map( ($_, 1),
- qw( accessdb archive-iterator async auto-whitelist bayes check config daemon
+ qw( accessdb archive-iterator async auto-welcomelist bayes check config daemon
dcc dkim askdns dns dnseval eval generic https_http_mismatch facility FreeMail
ident ignore info ldap learn locker log logger markup HashBL
message metadata mimeheader netset plugin prefork progress pyzor razor2
received-header replacetags reporter rules rules-all spamd spf textcat
- timing TxRep uri uridnsbl util pdfinfo asn geodb RaciallyCharged
+ timing TxRep uri uridnsbl util pdfinfo asn geodb
PHISHTAG resourcelimits https_http_mismatch ));
my $fh = IO::File->new_tmpfile();
Modified: spamassassin/branches/trunk-welcomelist/t/priorities.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/trunk-welcomelist/t/priorities.t?rev=1899925&r1=1899924&r2=1899925&view=diff
==============================================================================
--- spamassassin/branches/trunk-welcomelist/t/priorities.t (original)
+++ spamassassin/branches/trunk-welcomelist/t/priorities.t Sun Apr 17 07:23:40 2022
@@ -9,10 +9,10 @@ use Mail::SpamAssassin;
tstlocalrules (q{
- priority USER_IN_WHITELIST -1000
- priority USER_IN_DEF_WHITELIST -1000
+ priority USER_IN_WELCOMELIST -1000
+ priority USER_IN_DEF_WELCOMELIST -1000
priority USER_IN_ALL_SPAM_TO -1000
- priority SUBJECT_IN_WHITELIST -1000
+ priority SUBJECT_IN_WELCOMELIST -1000
priority ALL_TRUSTED -950
@@ -64,7 +64,7 @@ ok($sa);
my $conf = $sa->{conf};
sub assert_rule_pri;
-ok assert_rule_pri 'USER_IN_WHITELIST', -1000;
+ok assert_rule_pri 'USER_IN_WELCOMELIST', -1000;
ok assert_rule_pri 'SC_URIBL_SURBL', -530;
ok assert_rule_pri 'SC_URIBL_HASH', -510;
Modified: spamassassin/branches/trunk-welcomelist/t/spamd_welcomelist_leak.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/trunk-welcomelist/t/spamd_welcomelist_leak.t?rev=1899925&r1=1899924&r2=1899925&view=diff
==============================================================================
--- spamassassin/branches/trunk-welcomelist/t/spamd_welcomelist_leak.t (original)
+++ spamassassin/branches/trunk-welcomelist/t/spamd_welcomelist_leak.t Sun Apr 17 07:23:40 2022
@@ -48,7 +48,7 @@ clear_pattern_counters();
q{ 99 MYBODY }, 'MYBODY',
);
%anti_patterns = (
- q{-0.0 USER_IN_WELCOMELIST }, 'USER_IN_WELCOMELIST',
+ q{ 0 USER_IN_WELCOMELIST }, 'USER_IN_WELCOMELIST',
);
ok (spamcrun ("-u testuser2 < data/spam/001", \&patterns_run_cb));
checkfile ($spamd_stderr, \&patterns_run_cb);
Modified: spamassassin/branches/trunk-welcomelist/t/spamd_whitelist_leak.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/trunk-welcomelist/t/spamd_whitelist_leak.t?rev=1899925&r1=1899924&r2=1899925&view=diff
==============================================================================
--- spamassassin/branches/trunk-welcomelist/t/spamd_whitelist_leak.t (original)
+++ spamassassin/branches/trunk-welcomelist/t/spamd_whitelist_leak.t Sun Apr 17 07:23:40 2022
@@ -48,7 +48,7 @@ clear_pattern_counters();
q{ 99 MYBODY }, 'MYBODY',
);
%anti_patterns = (
- q{-100 USER_IN_WHITELIST }, 'USER_IN_WHITELIST',
+ q{ 0 USER_IN_WHITELIST }, 'USER_IN_WHITELIST',
);
ok (spamcrun ("-u testuser2 < data/spam/001", \&patterns_run_cb));
checkfile ($spamd_stderr, \&patterns_run_cb);
Added: spamassassin/branches/trunk-welcomelist/t/sql_based_welcomelist.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/trunk-welcomelist/t/sql_based_welcomelist.t?rev=1899925&view=auto
==============================================================================
--- spamassassin/branches/trunk-welcomelist/t/sql_based_welcomelist.t (added)
+++ spamassassin/branches/trunk-welcomelist/t/sql_based_welcomelist.t Sun Apr 17 07:23:40 2022
@@ -0,0 +1,120 @@
+#!/usr/bin/perl -T
+
+use lib '.'; use lib 't';
+use SATest;
+use Test::More;
+
+use constant HAS_DBI => eval { require DBI; };
+use constant HAS_DBD_SQLITE => eval { require DBD::SQLite; };
+
+use constant SQLITE => (HAS_DBI && HAS_DBD_SQLITE);
+use constant SQL => conf_bool('run_awl_sql_tests');
+
+plan skip_all => "run_awl_sql_tests not enabled or DBI/SQLite not found" unless (SQLITE || SQL);
+
+my $tests = 0;
+$tests += 23 if (SQLITE);
+$tests += 23 if (SQL);
+plan tests => $tests;
+
+diag "Note: Failure may be due to an incorrect config";
+
+sa_t_init("sql_based_welcomelist");
+
+if (SQLITE) {
+ my $dbh = DBI->connect("dbi:SQLite:dbname=$workdir/awl.db","","");
+ $dbh->do("
+ CREATE TABLE awl (
+ username varchar(100) NOT NULL default '',
+ email varchar(255) NOT NULL default '',
+ ip varchar(40) NOT NULL default '',
+ msgcount bigint NOT NULL default '0',
+ totscore float NOT NULL default '0',
+ signedby varchar(255) NOT NULL default '',
+ last_hit timestamp NOT NULL default CURRENT_TIMESTAMP,
+ PRIMARY KEY (username,email,signedby,ip)
+ );
+ ") or die "Failed to create $workdir/awl.db";
+
+ tstprefs ("
+ use_auto_welcomelist 1
+ auto_welcomelist_factory Mail::SpamAssassin::SQLBasedAddrList
+ user_awl_dsn dbi:SQLite:dbname=$workdir/awl.db
+ ");
+
+ run_awl();
+}
+
+if (SQL) {
+ my $dbconfig = '';
+ foreach my $setting (qw(
+ user_awl_dsn
+ user_awl_sql_username
+ user_awl_sql_password
+ user_awl_sql_table
+ )) {
+ my $val = conf($setting);
+ $dbconfig .= "$setting $val\n" if $val;
+ }
+
+ my $testuser = 'tstusr.'.$$.'.'.time();
+
+ tstprefs ("
+ use_auto_welcomelist 1
+ auto_welcomelist_factory Mail::SpamAssassin::SQLBasedAddrList
+ $dbconfig
+ user_awl_sql_override_username $testuser
+ ");
+
+ run_awl();
+}
+
+# ---------------------------------------------------------------------------
+sub run_awl {
+
+%is_nonspam_patterns = (
+ q{ Subject: Re: [SAtalk] auto-whitelisting}, 'subj',
+);
+%is_spam_patterns = (
+ q{Subject: 4000 Your Vacation Winning !}, 'subj',
+);
+%is_spam_patterns2 = (
+ q{ X-Spam-Status: Yes}, 'status',
+);
+
+%patterns = %is_nonspam_patterns;
+ok(sarun ("--remove-addr-from-welcomelist whitelist_test\@whitelist.spamassassin.taint.org", \&patterns_run_cb));
+
+# 3 times, to get into the welcomelist:
+%patterns = (%is_nonspam_patterns, (q{'144.137 scores 0, msgcount 0'} => 'scores'));
+ok(sarun ("-L -t -D auto-welcomelist < data/nice/002 2>&1", \&patterns_run_cb));
+ok_all_patterns();
+%patterns = (%is_nonspam_patterns, (q{'144.137 scores -2, msgcount 1'} => 'scores'));
+ok(sarun ("-L -t -D auto-welcomelist < data/nice/002 2>&1", \&patterns_run_cb));
+ok_all_patterns();
+%patterns = (%is_nonspam_patterns, (q{'144.137 scores -4, msgcount 2'} => 'scores'));
+ok(sarun ("-L -t -D auto-welcomelist < data/nice/002 2>&1", \&patterns_run_cb));
+ok_all_patterns();
+
+# Now check
+%patterns = (%is_nonspam_patterns, (q{'144.137 scores -6, msgcount 3'} => 'scores'));
+ok(sarun ("-L -t -D auto-welcomelist < data/nice/002 2>&1", \&patterns_run_cb));
+ok_all_patterns();
+
+%patterns = (%is_spam_patterns, (q{'144.137 scores -8, msgcount 4'} => 'scores'));;
+ok(sarun ("-L -t -D auto-welcomelist < data/spam/004 2>&1", \&patterns_run_cb));
+ok_all_patterns();
+
+# Should be raised after last spam
+%patterns = (%is_spam_patterns, (q{'144.137 scores 9.837, msgcount 5'} => 'scores'));;
+ok(sarun ("-L -t -D auto-welcomelist < data/spam/004 2>&1", \&patterns_run_cb));
+ok_all_patterns();
+
+%patterns = (%is_spam_patterns2, (q{'210.73 scores 0, msgcount 0'} => 'scores'));;
+ok(sarun ("-L -t -D auto-welcomelist < data/spam/007 2>&1", \&patterns_run_cb));
+ok_all_patterns();
+
+ok(sarun ("--remove-addr-from-welcomelist whitelist_test\@whitelist.spamassassin.taint.org", \&patterns_run_cb));
+
+}
+# ---------------------------------------------------------------------------
Propchange: spamassassin/branches/trunk-welcomelist/t/sql_based_welcomelist.t
------------------------------------------------------------------------------
svn:executable = *
Modified: spamassassin/branches/trunk-welcomelist/t/sql_based_whitelist.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/trunk-welcomelist/t/sql_based_whitelist.t?rev=1899925&r1=1899924&r2=1899925&view=diff
==============================================================================
--- spamassassin/branches/trunk-welcomelist/t/sql_based_whitelist.t (original)
+++ spamassassin/branches/trunk-welcomelist/t/sql_based_whitelist.t Sun Apr 17 07:23:40 2022
@@ -87,31 +87,31 @@ ok(sarun ("--remove-addr-from-whitelist
# 3 times, to get into the whitelist:
%patterns = (%is_nonspam_patterns, (q{'144.137 scores 0, msgcount 0'} => 'scores'));
-ok(sarun ("-L -t -D auto-whitelist < data/nice/002 2>&1", \&patterns_run_cb));
+ok(sarun ("-L -t -D auto-welcomelist < data/nice/002 2>&1", \&patterns_run_cb));
ok_all_patterns();
%patterns = (%is_nonspam_patterns, (q{'144.137 scores -2, msgcount 1'} => 'scores'));
-ok(sarun ("-L -t -D auto-whitelist < data/nice/002 2>&1", \&patterns_run_cb));
+ok(sarun ("-L -t -D auto-welcomelist < data/nice/002 2>&1", \&patterns_run_cb));
ok_all_patterns();
%patterns = (%is_nonspam_patterns, (q{'144.137 scores -4, msgcount 2'} => 'scores'));
-ok(sarun ("-L -t -D auto-whitelist < data/nice/002 2>&1", \&patterns_run_cb));
+ok(sarun ("-L -t -D auto-welcomelist < data/nice/002 2>&1", \&patterns_run_cb));
ok_all_patterns();
# Now check
%patterns = (%is_nonspam_patterns, (q{'144.137 scores -6, msgcount 3'} => 'scores'));
-ok(sarun ("-L -t -D auto-whitelist < data/nice/002 2>&1", \&patterns_run_cb));
+ok(sarun ("-L -t -D auto-welcomelist < data/nice/002 2>&1", \&patterns_run_cb));
ok_all_patterns();
%patterns = (%is_spam_patterns, (q{'144.137 scores -8, msgcount 4'} => 'scores'));;
-ok(sarun ("-L -t -D auto-whitelist < data/spam/004 2>&1", \&patterns_run_cb));
+ok(sarun ("-L -t -D auto-welcomelist < data/spam/004 2>&1", \&patterns_run_cb));
ok_all_patterns();
# Should be raised after last spam
%patterns = (%is_spam_patterns, (q{'144.137 scores 9.837, msgcount 5'} => 'scores'));;
-ok(sarun ("-L -t -D auto-whitelist < data/spam/004 2>&1", \&patterns_run_cb));
+ok(sarun ("-L -t -D auto-welcomelist < data/spam/004 2>&1", \&patterns_run_cb));
ok_all_patterns();
%patterns = (%is_spam_patterns2, (q{'210.73 scores 0, msgcount 0'} => 'scores'));;
-ok(sarun ("-L -t -D auto-whitelist < data/spam/007 2>&1", \&patterns_run_cb));
+ok(sarun ("-L -t -D auto-welcomelist < data/spam/007 2>&1", \&patterns_run_cb));
ok_all_patterns();
ok(sarun ("--remove-addr-from-whitelist whitelist_test\@whitelist.spamassassin.taint.org", \&patterns_run_cb));
Added: spamassassin/branches/trunk-welcomelist/t/welcomelist_addrs.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/trunk-welcomelist/t/welcomelist_addrs.t?rev=1899925&view=auto
==============================================================================
--- spamassassin/branches/trunk-welcomelist/t/welcomelist_addrs.t (added)
+++ spamassassin/branches/trunk-welcomelist/t/welcomelist_addrs.t Sun Apr 17 07:23:40 2022
@@ -0,0 +1,238 @@
+#!/usr/bin/perl -T
+
+use lib '.'; use lib 't';
+use SATest; sa_t_init("welcomelist_addrs");
+use IO::File;
+
+use constant HAS_DB_FILE => eval { require DB_File };
+
+use Test::More;
+plan skip_all => 'Long running tests disabled' unless conf_bool('run_long_tests');
+plan skip_all => 'Need DB_File for this test' unless HAS_DB_FILE;
+plan tests => 35;
+
+# ---------------------------------------------------------------------------
+
+%added_address_welcomelist_patterns = (
+ q{SpamAssassin auto-welcomelist: adding address to welcomelist:}, 'added address to welcomelist',
+);
+%added_address_blocklist_patterns = (
+ q{SpamAssassin auto-welcomelist: adding address to blocklist:}, 'added address to blocklist',
+);
+%removed_address_patterns = (
+ q{SpamAssassin auto-welcomelist: removing address:}, 'removed address',
+);
+%is_nonspam_patterns = (
+ q{X-Spam-Status: No}, 'spamno',
+);
+%is_spam_patterns = (
+ q{X-Spam-Status: Yes}, 'spamyes',
+);
+
+
+%patterns = %added_address_welcomelist_patterns;
+ok(sarun ("--add-addr-to-welcomelist whitelist_test\@whitelist.spamassassin.taint.org", \&patterns_run_cb));
+ok_all_patterns();
+%patterns = %is_nonspam_patterns;
+ok (sarun ("-L < data/nice/002", \&patterns_run_cb));
+ok_all_patterns();
+%patterns = %is_nonspam_patterns;
+sarun ("-L < data/spam/004", \&patterns_run_cb);
+ok_all_patterns();
+
+%patterns = %removed_address_patterns;
+ok(sarun ("--remove-addr-from-welcomelist whitelist_test\@whitelist.spamassassin.taint.org", \&patterns_run_cb));
+ok_all_patterns();
+%patterns = %is_spam_patterns;
+sarun ("-L < data/spam/004", \&patterns_run_cb);
+ok_all_patterns();
+
+%patterns = %added_address_blocklist_patterns;
+ok(sarun ("--add-addr-to-blocklist whitelist_test\@whitelist.spamassassin.taint.org", \&patterns_run_cb));
+ok_all_patterns();
+%patterns = %is_spam_patterns;
+sarun ("-L < data/nice/002", \&patterns_run_cb);
+ok_all_patterns();
+
+ok(sarun ("--remove-addr-from-welcomelist whitelist_test\@whitelist.spamassassin.taint.org", \&patterns_run_cb));
+
+
+# The following section tests the object oriented interface to adding/removing welcomelist
+# and blocklist entries. Primarily this is testing basic functionality and that the
+# "print" commands that are present in the command line interface are not being printed
+# when you call the methods directly. This is why we are manipulating STDOUT.
+
+open my $oldout, ">&STDOUT" || die "Cannot dup STDOUT";
+
+my $fh = IO::File->new_tmpfile();
+ok($fh);
+open(STDOUT, ">&=".fileno($fh)) || die "Cannot reopen STDOUT";
+select STDOUT; $| = 1;
+
+my $sa = create_saobj();
+
+$sa->init();
+
+$sa->add_address_to_welcomelist("whitelist_test\@whitelist.spamassassin.taint.org");
+
+seek($fh, 0, 0);
+
+my $error = do {
+ local $/;
+ <$fh>;
+};
+$fh->close();
+open STDOUT, ">&".fileno($oldout) || die "Cannot dupe \$oldout: $!";
+select STDOUT; $| = 1;
+
+#warn "# $error\n";
+ok($error !~ /SpamAssassin auto-welcomelist: /);
+
+%patterns = %is_nonspam_patterns;
+ok (sarun ("-L < data/nice/002", \&patterns_run_cb));
+ok_all_patterns();
+%patterns = %is_nonspam_patterns;
+sarun ("-L < data/spam/004", \&patterns_run_cb);
+ok_all_patterns();
+
+$fh = IO::File->new_tmpfile();
+ok($fh);
+open(STDOUT, ">&=".fileno($fh)) || die "Cannot reopen STDOUT";
+select STDOUT; $| = 1;
+
+$sa->remove_address_from_welcomelist("whitelist_test\@whitelist.spamassassin.taint.org");
+
+seek($fh, 0, 0);
+
+$error = do {
+ local $/;
+ <$fh>;
+};
+$fh->close();
+open STDOUT, ">&".fileno($oldout) || die "Cannot dupe \$oldout: $!";
+select STDOUT; $| = 1;
+
+#warn "# $error\n";
+ok($error !~ /SpamAssassin auto-welcomelist: /);
+
+%patterns = %is_spam_patterns;
+sarun ("-L < data/spam/004", \&patterns_run_cb);
+ok_all_patterns();
+
+$fh = IO::File->new_tmpfile();
+ok($fh);
+open(STDOUT, ">&=".fileno($fh)) || die "Cannot reopen STDOUT";
+select STDOUT; $| = 1;
+
+$sa->add_address_to_blocklist("whitelist_test\@whitelist.spamassassin.taint.org");
+
+seek($fh, 0, 0);
+
+$error = do {
+ local $/;
+ <$fh>;
+};
+$fh->close();
+open STDOUT, ">&".fileno($oldout) || die "Cannot dupe \$oldout: $!";
+select STDOUT; $| = 1;
+
+#warn "# $error\n";
+ok($error !~ /SpamAssassin auto-welcomelist: /);
+
+%patterns = %is_spam_patterns;
+sarun ("-L < data/nice/002", \&patterns_run_cb);
+ok_all_patterns();
+
+$sa->remove_address_from_welcomelist("whitelist_test\@whitelist.spamassassin.taint.org");
+
+# Now we can test the "all" methods
+
+open(MAIL,"< data/nice/002");
+
+my $raw_message = do {
+ local $/;
+ <MAIL>;
+};
+
+close(MAIL);
+ok($raw_message);
+
+my $mail = $sa->parse( $raw_message );
+
+$fh = IO::File->new_tmpfile();
+ok($fh);
+open(STDOUT, ">&=".fileno($fh)) || die "Cannot reopen STDOUT";
+select STDOUT; $| = 1;
+
+$sa->add_all_addresses_to_welcomelist($mail);
+
+seek($fh, 0, 0);
+
+$error = do {
+ local $/;
+ <$fh>;
+};
+$fh->close();
+open STDOUT, ">&".fileno($oldout) || die "Cannot dupe \$oldout: $!";
+select STDOUT; $| = 1;
+
+#warn "# $error\n";
+ok($error !~ /SpamAssassin auto-welcomelist: /);
+
+%patterns = %is_nonspam_patterns;
+ok (sarun ("-L < data/nice/002", \&patterns_run_cb));
+ok_all_patterns();
+%patterns = %is_nonspam_patterns;
+sarun ("-L < data/spam/004", \&patterns_run_cb);
+ok_all_patterns();
+
+$fh = IO::File->new_tmpfile();
+ok($fh);
+open(STDOUT, ">&=".fileno($fh)) || die "Cannot reopen STDOUT";
+select STDOUT; $| = 1;
+
+$sa->remove_all_addresses_from_welcomelist($mail);
+
+seek($fh, 0, 0);
+
+$error = do {
+ local $/;
+ <$fh>;
+};
+$fh->close();
+open STDOUT, ">&".fileno($oldout) || die "Cannot dupe \$oldout: $!";
+select STDOUT; $| = 1;
+
+#warn "# $error\n";
+ok($error !~ /SpamAssassin auto-welcomelist: /);
+
+%patterns = %is_spam_patterns;
+sarun ("-L < data/spam/004", \&patterns_run_cb);
+ok_all_patterns();
+
+$fh = IO::File->new_tmpfile();
+ok($fh);
+open(STDOUT, ">&=".fileno($fh)) || die "Cannot reopen STDOUT";
+select STDOUT; $| = 1;
+
+$sa->add_all_addresses_to_blocklist($mail);
+
+seek($fh, 0, 0);
+
+$error = do {
+ local $/;
+ <$fh>;
+};
+$fh->close();
+open STDOUT, ">&".fileno($oldout) || die "Cannot dupe \$oldout: $!";
+select STDOUT; $| = 1;
+
+#warn "# $error\n";
+ok($error !~ /SpamAssassin auto-welcomelist: /);
+
+%patterns = %is_spam_patterns;
+sarun ("-L < data/nice/002", \&patterns_run_cb);
+ok_all_patterns();
+
+$sa->remove_all_addresses_from_welcomelist($mail);
+
Propchange: spamassassin/branches/trunk-welcomelist/t/welcomelist_addrs.t
------------------------------------------------------------------------------
svn:executable = *
Modified: spamassassin/branches/trunk-welcomelist/t/welcomelist_from.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/trunk-welcomelist/t/welcomelist_from.t?rev=1899925&r1=1899924&r2=1899925&view=diff
==============================================================================
--- spamassassin/branches/trunk-welcomelist/t/welcomelist_from.t (original)
+++ spamassassin/branches/trunk-welcomelist/t/welcomelist_from.t Sun Apr 17 07:23:40 2022
@@ -16,22 +16,22 @@ tstprefs ("
welcomelist_from_rcvd foo\@example.com spamassassin.org
welcomelist_from_rcvd foo\@example.com example.com
welcomelist_from_rcvd bar\@example.com example.com
- whitelist_allows_relays bar\@example.com
+ welcomelist_allows_relays bar\@example.com
welcomelist_from baz\@example.com
welcomelist_from bam\@example.com
- unwhitelist_from bam\@example.com
+ unwelcomelist_from bam\@example.com
unwelcomelist_from_rcvd mumble\@example.com
");
-# tests 1 - 4 does welcomelist_from (previously whitelist_from) work?
+# tests 1 - 4 does welcomelist_from work?
%patterns = (
q{ USER_IN_WELCOMELIST }, 'w1'
);
%anti_patterns = (
- q{ FORGED_IN_WHITELIST }, 'a2',
- q{ USER_IN_DEF_WHITELIST }, 'a3',
- q{ FORGED_IN_DEF_WHITELIST }, 'a4'
+ q{ FORGED_IN_WELCOMELIST }, 'a2',
+ q{ USER_IN_DEF_WELCOMELIST }, 'a3',
+ q{ FORGED_IN_DEF_WELCOMELIST }, 'a4'
);
sarun ("-L -t < data/nice/008", \&patterns_run_cb);
ok_all_patterns();
@@ -45,13 +45,13 @@ sarun ("-L -t < data/nice/010", \&patter
ok_all_patterns();
%patterns = (
- q{ USER_IN_DEF_WHITELIST }, 'w5'
+ q{ USER_IN_DEF_WELCOMELIST }, 'w5'
);
%anti_patterns = (
- q{ USER_IN_WHITELIST }, 'a6',
- q{ FORGED_IN_WHITELIST }, 'a7',
- q{ FORGED_IN_DEF_WHITELIST }, 'a8'
+ q{ 0 USER_IN_WELCOMELIST }, 'a6',
+ q{ FORGED_IN_WELCOMELIST }, 'a7',
+ q{ FORGED_IN_DEF_WELCOMELIST }, 'a8'
);
# tests 13 - 16 does def_welcomelist_from_rcvd work?
@@ -65,17 +65,17 @@ ok_all_patterns();
%patterns = ();
%anti_patterns = (
- q{ USER_IN_WHITELIST }, 'a9',
- q{ FORGED_IN_WHITELIST }, 'a10',
- q{ USER_IN_DEF_WHITELIST }, 'a11',
- q{ FORGED_IN_DEF_WHITELIST }, 'a12'
+ q{ 0 USER_IN_WELCOMELIST }, 'a9',
+ q{ FORGED_IN_WELCOMELIST }, 'a10',
+ q{ USER_IN_DEF_WELCOMELIST }, 'a11',
+ q{ FORGED_IN_DEF_WELCOMELIST }, 'a12'
);
-# tests 21 - 24 does whitelist_allows_relays suppress the forged rule without
-# putting the address on the whitelist?
+# tests 21 - 24 does welcomelist_allows_relays suppress the forged rule without
+# putting the address on the welcomelist?
sarun ("-L -t < data/nice/013", \&patterns_run_cb);
ok_all_patterns();
-# tests 25 - 28 does unwhitelist_from work?
+# tests 25 - 28 does unwelcomelist_from work?
sarun ("-L -t < data/nice/014", \&patterns_run_cb);
ok_all_patterns();
Added: spamassassin/branches/trunk-welcomelist/t/welcomelist_subject.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/trunk-welcomelist/t/welcomelist_subject.t?rev=1899925&view=auto
==============================================================================
--- spamassassin/branches/trunk-welcomelist/t/welcomelist_subject.t (added)
+++ spamassassin/branches/trunk-welcomelist/t/welcomelist_subject.t Sun Apr 17 07:23:40 2022
@@ -0,0 +1,35 @@
+#!/usr/bin/perl -T
+
+use lib '.'; use lib 't';
+use SATest; sa_t_init("welcomelist_subject");
+use Test::More tests => 4;
+
+# ---------------------------------------------------------------------------
+
+%is_welcomelist_patterns = (
+ q{ SUBJECT_IN_WHITELIST }, 'welcomelist-subject'
+);
+
+%is_blocklist_patterns = (
+ q{ SUBJECT_IN_BLACKLIST }, 'blocklist-subject'
+);
+
+tstprefs ("
+ loadplugin Mail::SpamAssassin::Plugin::WhiteListSubject
+ use_bayes 0
+ use_auto_welcomelist 0
+ welcomelist_subject [HC Anno*]
+ blocklist_subject whitelist test
+");
+
+%patterns = %is_welcomelist_patterns;
+
+ok(sarun ("-L -t < data/nice/016", \&patterns_run_cb));
+ok_all_patterns();
+
+%patterns = %is_blocklist_patterns;
+
+# force us to blocklist a nice msg
+ok(sarun ("-L -t < data/nice/015", \&patterns_run_cb));
+ok_all_patterns();
+
Propchange: spamassassin/branches/trunk-welcomelist/t/welcomelist_subject.t
------------------------------------------------------------------------------
svn:executable = *
Modified: spamassassin/branches/trunk-welcomelist/t/whitelist_addrs.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/trunk-welcomelist/t/whitelist_addrs.t?rev=1899925&r1=1899924&r2=1899925&view=diff
==============================================================================
--- spamassassin/branches/trunk-welcomelist/t/whitelist_addrs.t (original)
+++ spamassassin/branches/trunk-welcomelist/t/whitelist_addrs.t Sun Apr 17 07:23:40 2022
@@ -14,13 +14,13 @@ plan tests => 35;
# ---------------------------------------------------------------------------
%added_address_whitelist_patterns = (
- q{SpamAssassin auto-whitelist: adding address to whitelist:}, 'added address to whitelist',
+ q{SpamAssassin auto-welcomelist: adding address to welcomelist:}, 'added address to welcomelist',
);
%added_address_blacklist_patterns = (
- q{SpamAssassin auto-whitelist: adding address to blacklist:}, 'added address to blacklist',
+ q{SpamAssassin auto-welcomelist: adding address to blocklist:}, 'added address to blocklist',
);
%removed_address_patterns = (
- q{SpamAssassin auto-whitelist: removing address:}, 'removed address',
+ q{SpamAssassin auto-welcomelist: removing address:}, 'removed address',
);
%is_nonspam_patterns = (
q{X-Spam-Status: No}, 'spamno',
@@ -86,7 +86,7 @@ open STDOUT, ">&".fileno($oldout) || die
select STDOUT; $| = 1;
#warn "# $error\n";
-ok($error !~ /SpamAssassin auto-whitelist: /);
+ok($error !~ /SpamAssassin auto-welcomelist: /);
%patterns = %is_nonspam_patterns;
ok (sarun ("-L < data/nice/002", \&patterns_run_cb));
@@ -113,7 +113,7 @@ open STDOUT, ">&".fileno($oldout) || die
select STDOUT; $| = 1;
#warn "# $error\n";
-ok($error !~ /SpamAssassin auto-whitelist: /);
+ok($error !~ /SpamAssassin auto-welcomelist: /);
%patterns = %is_spam_patterns;
sarun ("-L < data/spam/004", \&patterns_run_cb);
@@ -137,7 +137,7 @@ open STDOUT, ">&".fileno($oldout) || die
select STDOUT; $| = 1;
#warn "# $error\n";
-ok($error !~ /SpamAssassin auto-whitelist: /);
+ok($error !~ /SpamAssassin auto-welcomelist: /);
%patterns = %is_spam_patterns;
sarun ("-L < data/nice/002", \&patterns_run_cb);
@@ -177,7 +177,7 @@ open STDOUT, ">&".fileno($oldout) || die
select STDOUT; $| = 1;
#warn "# $error\n";
-ok($error !~ /SpamAssassin auto-whitelist: /);
+ok($error !~ /SpamAssassin auto-welcomelist: /);
%patterns = %is_nonspam_patterns;
ok (sarun ("-L < data/nice/002", \&patterns_run_cb));
@@ -204,7 +204,7 @@ open STDOUT, ">&".fileno($oldout) || die
select STDOUT; $| = 1;
#warn "# $error\n";
-ok($error !~ /SpamAssassin auto-whitelist: /);
+ok($error !~ /SpamAssassin auto-welcomelist: /);
%patterns = %is_spam_patterns;
sarun ("-L < data/spam/004", \&patterns_run_cb);
@@ -228,7 +228,7 @@ open STDOUT, ">&".fileno($oldout) || die
select STDOUT; $| = 1;
#warn "# $error\n";
-ok($error !~ /SpamAssassin auto-whitelist: /);
+ok($error !~ /SpamAssassin auto-welcomelist: /);
%patterns = %is_spam_patterns;
sarun ("-L < data/nice/002", \&patterns_run_cb);
Modified: spamassassin/branches/trunk-welcomelist/tools/convert_awl_dbm_to_sql
URL: http://svn.apache.org/viewvc/spamassassin/branches/trunk-welcomelist/tools/convert_awl_dbm_to_sql?rev=1899925&r1=1899924&r2=1899925&view=diff
==============================================================================
--- spamassassin/branches/trunk-welcomelist/tools/convert_awl_dbm_to_sql (original)
+++ spamassassin/branches/trunk-welcomelist/tools/convert_awl_dbm_to_sql Sun Apr 17 07:23:40 2022
@@ -1,7 +1,7 @@
#!/usr/bin/perl
# WARNING: This script is VERY rough and provided only as a template
-# for moving a DB based autowhitelist to a SQL based one. You should
+# for moving a DB based autowelcomelist to a SQL based one. You should
# do backups and that sort of thing before attempting to use this
# script.
@@ -17,7 +17,7 @@ my ( %h $k $v );
sub usage {
print "This program takes the following required arguments:\n";
- print "--username <username> - This is who's whitelist you are loading.\n";
+ print "--username <username> - This is who's welcomelist you are loading.\n";
print " It should match exactly what spassassin or\n";
print " spamd will be using.\n";
print "--dsn <dsn> - This is the database DSN. It should be in the form:\n";
@@ -26,9 +26,9 @@ sub usage {
print "--ok - Basically a sanity check that you understand how dangerous this script is.\n";
print "\n";
print "This program take the following optional arguments:\n";
- print "--dbautowhitelist <path> - path to the auto-whitelist you wish to\n";
+ print "--dbautowelcomelist <path> - path to the auto-welcomelist you wish to\n";
print " convert. Default is to use \n";
- print " \$ENV{HOME}/.spamassassin/auto-whitelist\n";
+ print " \$ENV{HOME}/.spamassassin/auto-welcomelist\n";
print "--sqlusername <username> - Needed if your DBI driver requires a username.\n";
print "--sqlpassword <password> - Needed if your DBI driver requires a password.\n";
print "\n\n";
@@ -45,7 +45,7 @@ my %opt;
GetOptions('dsn=s' => \$opt{'dsn'},
'sqlusername=s' => \$opt{'sqlusername'},
'sqlpassword=s' => \$opt{'sqlpassword'},
- 'dbautowhitelist=s' => \$opt{'dbautowhitelist'},
+ 'dbautowelcomelist=s' => \$opt{'dbautowelcomelist'},
'username=s' => \$opt{'username'},
'help' => \$opt{'help'},
'ok' => \$opt{'ok'},
@@ -65,11 +65,11 @@ if (!$opt{'username'} || !$opt{'dsn'}) {
}
my $db;
-if ($opt{'dbautowhitelist'}) {
- $db = $opt{'dbautowhitelist'};
+if ($opt{'dbautowelcomelist'}) {
+ $db = $opt{'dbautowelcomelist'};
}
else {
- $db = $ENV{HOME}."/.spamassassin/auto-whitelist";
+ $db = $ENV{HOME}."/.spamassassin/auto-welcomelist";
}
tie %h, "DB_File",$db, O_RDONLY,0600