Author: gbechis
Date: Tue Apr 23 13:12:44 2024
New Revision: 1917281
URL: http://svn.apache.org/viewvc?rev=1917281&view=rev
Log:
correctly handle dns queries in RCVD_IN_VALIDITY_*_BLOCKED rules.
From Validity Inc.
Modified:
spamassassin/trunk/rules/20_dnsbl_tests.cf
spamassassin/trunk/rules/25_uribl.cf
spamassassin/trunk/rules/50_scores.cf
spamassassin/trunk/rulesrc/10_force_active.cf
Modified: spamassassin/trunk/rules/20_dnsbl_tests.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rules/20_dnsbl_tests.cf?rev=1917281&r1=1917280&r2=1917281&view=diff
==============================================================================
--- spamassassin/trunk/rules/20_dnsbl_tests.cf (original)
+++ spamassassin/trunk/rules/20_dnsbl_tests.cf Tue Apr 23 13:12:44 2024
@@ -208,27 +208,48 @@ reuse RCVD_IN_IADB_VOUCHED
# Certified:
# https://www.validity.com/resource-center/fact-sheet-certification/
# (replaces RCVD_IN_BSP_TRUSTED, RCVD_IN_BSP_OTHER, RCVD_IN_SSC_TRUSTED_COI, RCVD_IN_RP_CERTIFIED)
-header RCVD_IN_VALIDITY_CERTIFIED eval:check_rbl_txt('ssc-firsttrusted', 'sa-trusted.bondedsender.org.')
+header RCVD_IN_VALIDITY_CERTIFIED eval:check_rbl('ssc-firsttrusted', 'sa-trusted.bondedsender.org.', '^127\.0\.0\.')
describe RCVD_IN_VALIDITY_CERTIFIED Sender in Validity Certification - Contact certification@validity.com
tflags RCVD_IN_VALIDITY_CERTIFIED net nice publish
reuse RCVD_IN_VALIDITY_CERTIFIED RCVD_IN_RP_CERTIFIED
+header RCVD_IN_VALIDITY_CERTIFIED_BLOCKED eval:check_rbl('ssc-firsttrusted', 'sa-trusted.bondedsender.org.', '127.255.255.255')
+describe RCVD_IN_VALIDITY_CERTIFIED_BLOCKED ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information.
+tflags RCVD_IN_VALIDITY_CERTIFIED_BLOCKED net publish
+reuse RCVD_IN_VALIDITY_CERTIFIED_BLOCKED RCVD_IN_VALIDITY_CERTIFIED_BLOCKED
+
# Safe:
# https://www.validity.com/resource-center/fact-sheet-certification/
# (replaces HABEAS_ACCREDITED_COI, HABEAS_ACCREDITED_SOI, HABEAS_CHECKED, RCVD_IN_RP_SAFE)
-header RCVD_IN_VALIDITY_SAFE eval:check_rbl_txt('ssc-firsttrusted','sa-accredit.habeas.com.')
+header RCVD_IN_VALIDITY_SAFE eval:check_rbl('ssc-firsttrusted', 'sa-accredit.habeas.com.', '^127\.0\.0\.')
describe RCVD_IN_VALIDITY_SAFE Sender in Validity Safe - Contact certification@validity.com
tflags RCVD_IN_VALIDITY_SAFE net nice publish
reuse RCVD_IN_VALIDITY_SAFE RCVD_IN_RP_SAFE
+header RCVD_IN_VALIDITY_SAFE_BLOCKED eval:check_rbl('ssc-firsttrusted', 'sa-accredit.habeas.com.', '127.255.255.255')
+describe RCVD_IN_VALIDITY_SAFE_BLOCKED ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information.
+tflags RCVD_IN_VALIDITY_SAFE_BLOCKED net publish
+reuse RCVD_IN_VALIDITY_SAFE_BLOCKED RCVD_IN_VALIDITY_SAFE_BLOCKED
+
# Validity RPBL (née Return Path Reputation Network Blacklist - RNBL):
# https://www.senderscore.org/blocklistlookup/
# (replaces RCVD_IN_RP_RNBL)
-header RCVD_IN_VALIDITY_RPBL eval:check_rbl('rnbl-lastexternal','bl.score.senderscore.com.')
+header RCVD_IN_VALIDITY_RPBL eval:check_rbl('rnbl-lastexternal', 'bl.score.senderscore.com.', '^127\.0\.0\.')
describe RCVD_IN_VALIDITY_RPBL Relay in Validity RPBL, https://senderscore.org/blocklistlookup/
tflags RCVD_IN_VALIDITY_RPBL net publish
reuse RCVD_IN_VALIDITY_RPBL RCVD_IN_RP_RNBL
+header RCVD_IN_VALIDITY_RPBL_BLOCKED eval:check_rbl('rnbl-lastexternal', 'bl.score.senderscore.com.', '127.255.255.255')
+describe RCVD_IN_VALIDITY_RPBL_BLOCKED ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information.
+tflags RCVD_IN_VALIDITY_RPBL_BLOCKED net publish
+reuse RCVD_IN_VALIDITY_RPBL_BLOCKED RCVD_IN_VALIDITY_RPBL_BLOCKED
+
+if can(Mail::SpamAssassin::Conf::feature_dns_block_rule)
+dns_block_rule RCVD_IN_VALIDITY_CERTIFIED_BLOCKED sa-trusted.bondedsender.org
+dns_block_rule RCVD_IN_VALIDITY_SAFE_BLOCKED sa-accredit.habeas.com
+dns_block_rule RCVD_IN_VALIDITY_RPBL_BLOCKED bl.score.senderscore.com
+endif
+
endif
#These are old and useless - The zones are no longer supported by SpamHaus 2018-12-12
Modified: spamassassin/trunk/rules/25_uribl.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rules/25_uribl.cf?rev=1917281&r1=1917280&r2=1917281&view=diff
==============================================================================
--- spamassassin/trunk/rules/25_uribl.cf (original)
+++ spamassassin/trunk/rules/25_uribl.cf Tue Apr 23 13:12:44 2024
@@ -257,33 +257,6 @@ dns_block_rule URIBL_BLOCKED multi.uribl
endif
###########################################################################
-## Validity
-
-urirhssub VALIDITY_BLOCKED_CERTIFIED sa-trusted.bondedsender.org. A 127.255.255.255
-body VALIDITY_BLOCKED_CERTIFIED eval:check_uridnsbl('VALIDITY_BLOCKED_CERTIFIED')
-describe VALIDITY_BLOCKED_CERTIFIED ADMINISTRATOR NOTICE: The query to Validity was blocked. https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information.
-tflags VALIDITY_BLOCKED_CERTIFIED net noautolearn
-reuse VALIDITY_BLOCKED_CERTIFIED
-
-urirhssub VALIDITY_BLOCKED_RPBL bl.score.senderscore.com. A 127.255.255.255
-body VALIDITY_BLOCKED_RPBL eval:check_uridnsbl('VALIDITY_BLOCKED_RPBL')
-describe VALIDITY_BLOCKED_RPBL ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information.
-tflags VALIDITY_BLOCKED_RPBL net noautolearn
-reuse VALIDITY_BLOCKED_RPBL
-
-urirhssub VALIDITY_BLOCKED_SAFE sa-accredit.habeas.com. A 127.255.255.255
-body VALIDITY_BLOCKED_SAFE eval:check_uridnsbl('VALIDITY_BLOCKED_SAFE')
-describe VALIDITY_BLOCKED_SAFE ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information.
-tflags VALIDITY_BLOCKED_SAFE net noautolearn
-reuse VALIDITY_BLOCKED_SAFE
-
-if can(Mail::SpamAssassin::Conf::feature_dns_block_rule)
-dns_block_rule VALIDITY_BLOCKED_CERTIFIED sa-trusted.bondedsender.org
-dns_block_rule VALIDITY_BLOCKED_RPBL bl.score.senderscore.com
-dns_block_rule VALIDITY_BLOCKED_SAFE sa-accredit.habeas.com
-endif
-
-###########################################################################
## DOMAINS TO SKIP (KNOWN GOOD)
# Linting
Modified: spamassassin/trunk/rules/50_scores.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rules/50_scores.cf?rev=1917281&r1=1917280&r2=1917281&view=diff
==============================================================================
--- spamassassin/trunk/rules/50_scores.cf (original)
+++ spamassassin/trunk/rules/50_scores.cf Tue Apr 23 13:12:44 2024
@@ -285,6 +285,7 @@ score RCVD_FORGED_WROTE2 0 # n=0 n=1 n=2
#score RCVD_IN_BRBL_LASTEXT 0 1.644 0 1.449 # n=0 n=2
score RCVD_IN_PSBL 0 2.700 0 2.700 # n=0 n=2
score RCVD_IN_VALIDITY_RPBL 0 1.284 0 1.310 # n=0 n=2
+score RCVD_IN_VALIDITY_RPBL_BLOCKED 0 0.001 0 0.001
score RCVD_MAIL_COM 0 # n=0 n=1 n=2 n=3
score RDNS_DYNAMIC 2.639 0.363 1.663 0.982
score RDNS_LOCALHOST 3.700 0.969 2.345 0.001
@@ -528,7 +529,9 @@ score RCVD_IN_ZEN_BLOCKED 0 0.001 0 0.00
# CERTIFIED is a subset of SAFE, thus the score is cumulative.
# -2 + -3 = -5 points for CERTIFIED
score RCVD_IN_VALIDITY_CERTIFIED 0.0 -3.0 0.0 -3.0
+score RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0 0.001 0 0.001
score RCVD_IN_VALIDITY_SAFE 0.0 -2.0 0.0 -2.0
+score RCVD_IN_VALIDITY_SAFE_BLOCKED 0 0.001 0 0.001
# DNSWL is a commercial service that requires payment for servers over 100K queries daily.
# Unfortunately, they will return true answers for DNS servers they consider abusive so
@@ -838,9 +841,6 @@ score URIBL_ZEN_BLOCKED_OPENDNS 0 0.001
score URIBL_ZEN_BLOCKED 0 0.001 0 0.001
score URIBL_DBL_BLOCKED_OPENDNS 0 0.001 0 0.001
score URIBL_DBL_BLOCKED 0 0.001 0 0.001
-score VALIDITY_BLOCKED_CERTIFIED 0 0.001 0 0.001
-score VALIDITY_BLOCKED_RPBL 0 0.001 0 0.001
-score VALIDITY_BLOCKED_SAFE 0 0.001 0 0.001
endif # Mail::SpamAssassin::Plugin::URIDNSBL
# ReplaceTags
Modified: spamassassin/trunk/rulesrc/10_force_active.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rulesrc/10_force_active.cf?rev=1917281&r1=1917280&r2=1917281&view=diff
==============================================================================
--- spamassassin/trunk/rulesrc/10_force_active.cf (original)
+++ spamassassin/trunk/rulesrc/10_force_active.cf Tue Apr 23 13:12:44 2024
@@ -477,8 +477,11 @@ publish RCVD_IN_MAPS_RSS
publish RCVD_IN_PBL
publish RCVD_IN_PSBL
publish RCVD_IN_VALIDITY_CERTIFIED
+publish RCVD_IN_VALIDITY_CERTIFIED_BLOCKED
publish RCVD_IN_VALIDITY_RPBL
+publish RCVD_IN_VALIDITY_RPBL_BLOCKED
publish RCVD_IN_VALIDITY_SAFE
+publish RCVD_IN_VALIDITY_SAFE_BLOCKED
publish RCVD_IN_SBL
publish RCVD_IN_SORBS_BLOCK
publish RCVD_IN_SORBS_DUL
@@ -653,9 +656,6 @@ publish USER_IN_WHITELIST
publish USER_IN_WELCOMELIST
publish USER_IN_WHITELIST_TO
publish USER_IN_WELCOMELIST_TO
-publish VALIDITY_BLOCKED_CERTIFIED
-publish VALIDITY_BLOCKED_RPBL
-publish VALIDITY_BLOCKED_SAFE
publish VANITY
publish VBOUNCE_MESSAGE
publish VIA_GAP_GRA
Date: Tue Apr 23 13:12:44 2024
New Revision: 1917281
URL: http://svn.apache.org/viewvc?rev=1917281&view=rev
Log:
correctly handle dns queries in RCVD_IN_VALIDITY_*_BLOCKED rules.
From Validity Inc.
Modified:
spamassassin/trunk/rules/20_dnsbl_tests.cf
spamassassin/trunk/rules/25_uribl.cf
spamassassin/trunk/rules/50_scores.cf
spamassassin/trunk/rulesrc/10_force_active.cf
Modified: spamassassin/trunk/rules/20_dnsbl_tests.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rules/20_dnsbl_tests.cf?rev=1917281&r1=1917280&r2=1917281&view=diff
==============================================================================
--- spamassassin/trunk/rules/20_dnsbl_tests.cf (original)
+++ spamassassin/trunk/rules/20_dnsbl_tests.cf Tue Apr 23 13:12:44 2024
@@ -208,27 +208,48 @@ reuse RCVD_IN_IADB_VOUCHED
# Certified:
# https://www.validity.com/resource-center/fact-sheet-certification/
# (replaces RCVD_IN_BSP_TRUSTED, RCVD_IN_BSP_OTHER, RCVD_IN_SSC_TRUSTED_COI, RCVD_IN_RP_CERTIFIED)
-header RCVD_IN_VALIDITY_CERTIFIED eval:check_rbl_txt('ssc-firsttrusted', 'sa-trusted.bondedsender.org.')
+header RCVD_IN_VALIDITY_CERTIFIED eval:check_rbl('ssc-firsttrusted', 'sa-trusted.bondedsender.org.', '^127\.0\.0\.')
describe RCVD_IN_VALIDITY_CERTIFIED Sender in Validity Certification - Contact certification@validity.com
tflags RCVD_IN_VALIDITY_CERTIFIED net nice publish
reuse RCVD_IN_VALIDITY_CERTIFIED RCVD_IN_RP_CERTIFIED
+header RCVD_IN_VALIDITY_CERTIFIED_BLOCKED eval:check_rbl('ssc-firsttrusted', 'sa-trusted.bondedsender.org.', '127.255.255.255')
+describe RCVD_IN_VALIDITY_CERTIFIED_BLOCKED ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information.
+tflags RCVD_IN_VALIDITY_CERTIFIED_BLOCKED net publish
+reuse RCVD_IN_VALIDITY_CERTIFIED_BLOCKED RCVD_IN_VALIDITY_CERTIFIED_BLOCKED
+
# Safe:
# https://www.validity.com/resource-center/fact-sheet-certification/
# (replaces HABEAS_ACCREDITED_COI, HABEAS_ACCREDITED_SOI, HABEAS_CHECKED, RCVD_IN_RP_SAFE)
-header RCVD_IN_VALIDITY_SAFE eval:check_rbl_txt('ssc-firsttrusted','sa-accredit.habeas.com.')
+header RCVD_IN_VALIDITY_SAFE eval:check_rbl('ssc-firsttrusted', 'sa-accredit.habeas.com.', '^127\.0\.0\.')
describe RCVD_IN_VALIDITY_SAFE Sender in Validity Safe - Contact certification@validity.com
tflags RCVD_IN_VALIDITY_SAFE net nice publish
reuse RCVD_IN_VALIDITY_SAFE RCVD_IN_RP_SAFE
+header RCVD_IN_VALIDITY_SAFE_BLOCKED eval:check_rbl('ssc-firsttrusted', 'sa-accredit.habeas.com.', '127.255.255.255')
+describe RCVD_IN_VALIDITY_SAFE_BLOCKED ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information.
+tflags RCVD_IN_VALIDITY_SAFE_BLOCKED net publish
+reuse RCVD_IN_VALIDITY_SAFE_BLOCKED RCVD_IN_VALIDITY_SAFE_BLOCKED
+
# Validity RPBL (née Return Path Reputation Network Blacklist - RNBL):
# https://www.senderscore.org/blocklistlookup/
# (replaces RCVD_IN_RP_RNBL)
-header RCVD_IN_VALIDITY_RPBL eval:check_rbl('rnbl-lastexternal','bl.score.senderscore.com.')
+header RCVD_IN_VALIDITY_RPBL eval:check_rbl('rnbl-lastexternal', 'bl.score.senderscore.com.', '^127\.0\.0\.')
describe RCVD_IN_VALIDITY_RPBL Relay in Validity RPBL, https://senderscore.org/blocklistlookup/
tflags RCVD_IN_VALIDITY_RPBL net publish
reuse RCVD_IN_VALIDITY_RPBL RCVD_IN_RP_RNBL
+header RCVD_IN_VALIDITY_RPBL_BLOCKED eval:check_rbl('rnbl-lastexternal', 'bl.score.senderscore.com.', '127.255.255.255')
+describe RCVD_IN_VALIDITY_RPBL_BLOCKED ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information.
+tflags RCVD_IN_VALIDITY_RPBL_BLOCKED net publish
+reuse RCVD_IN_VALIDITY_RPBL_BLOCKED RCVD_IN_VALIDITY_RPBL_BLOCKED
+
+if can(Mail::SpamAssassin::Conf::feature_dns_block_rule)
+dns_block_rule RCVD_IN_VALIDITY_CERTIFIED_BLOCKED sa-trusted.bondedsender.org
+dns_block_rule RCVD_IN_VALIDITY_SAFE_BLOCKED sa-accredit.habeas.com
+dns_block_rule RCVD_IN_VALIDITY_RPBL_BLOCKED bl.score.senderscore.com
+endif
+
endif
#These are old and useless - The zones are no longer supported by SpamHaus 2018-12-12
Modified: spamassassin/trunk/rules/25_uribl.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rules/25_uribl.cf?rev=1917281&r1=1917280&r2=1917281&view=diff
==============================================================================
--- spamassassin/trunk/rules/25_uribl.cf (original)
+++ spamassassin/trunk/rules/25_uribl.cf Tue Apr 23 13:12:44 2024
@@ -257,33 +257,6 @@ dns_block_rule URIBL_BLOCKED multi.uribl
endif
###########################################################################
-## Validity
-
-urirhssub VALIDITY_BLOCKED_CERTIFIED sa-trusted.bondedsender.org. A 127.255.255.255
-body VALIDITY_BLOCKED_CERTIFIED eval:check_uridnsbl('VALIDITY_BLOCKED_CERTIFIED')
-describe VALIDITY_BLOCKED_CERTIFIED ADMINISTRATOR NOTICE: The query to Validity was blocked. https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information.
-tflags VALIDITY_BLOCKED_CERTIFIED net noautolearn
-reuse VALIDITY_BLOCKED_CERTIFIED
-
-urirhssub VALIDITY_BLOCKED_RPBL bl.score.senderscore.com. A 127.255.255.255
-body VALIDITY_BLOCKED_RPBL eval:check_uridnsbl('VALIDITY_BLOCKED_RPBL')
-describe VALIDITY_BLOCKED_RPBL ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information.
-tflags VALIDITY_BLOCKED_RPBL net noautolearn
-reuse VALIDITY_BLOCKED_RPBL
-
-urirhssub VALIDITY_BLOCKED_SAFE sa-accredit.habeas.com. A 127.255.255.255
-body VALIDITY_BLOCKED_SAFE eval:check_uridnsbl('VALIDITY_BLOCKED_SAFE')
-describe VALIDITY_BLOCKED_SAFE ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information.
-tflags VALIDITY_BLOCKED_SAFE net noautolearn
-reuse VALIDITY_BLOCKED_SAFE
-
-if can(Mail::SpamAssassin::Conf::feature_dns_block_rule)
-dns_block_rule VALIDITY_BLOCKED_CERTIFIED sa-trusted.bondedsender.org
-dns_block_rule VALIDITY_BLOCKED_RPBL bl.score.senderscore.com
-dns_block_rule VALIDITY_BLOCKED_SAFE sa-accredit.habeas.com
-endif
-
-###########################################################################
## DOMAINS TO SKIP (KNOWN GOOD)
# Linting
Modified: spamassassin/trunk/rules/50_scores.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rules/50_scores.cf?rev=1917281&r1=1917280&r2=1917281&view=diff
==============================================================================
--- spamassassin/trunk/rules/50_scores.cf (original)
+++ spamassassin/trunk/rules/50_scores.cf Tue Apr 23 13:12:44 2024
@@ -285,6 +285,7 @@ score RCVD_FORGED_WROTE2 0 # n=0 n=1 n=2
#score RCVD_IN_BRBL_LASTEXT 0 1.644 0 1.449 # n=0 n=2
score RCVD_IN_PSBL 0 2.700 0 2.700 # n=0 n=2
score RCVD_IN_VALIDITY_RPBL 0 1.284 0 1.310 # n=0 n=2
+score RCVD_IN_VALIDITY_RPBL_BLOCKED 0 0.001 0 0.001
score RCVD_MAIL_COM 0 # n=0 n=1 n=2 n=3
score RDNS_DYNAMIC 2.639 0.363 1.663 0.982
score RDNS_LOCALHOST 3.700 0.969 2.345 0.001
@@ -528,7 +529,9 @@ score RCVD_IN_ZEN_BLOCKED 0 0.001 0 0.00
# CERTIFIED is a subset of SAFE, thus the score is cumulative.
# -2 + -3 = -5 points for CERTIFIED
score RCVD_IN_VALIDITY_CERTIFIED 0.0 -3.0 0.0 -3.0
+score RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0 0.001 0 0.001
score RCVD_IN_VALIDITY_SAFE 0.0 -2.0 0.0 -2.0
+score RCVD_IN_VALIDITY_SAFE_BLOCKED 0 0.001 0 0.001
# DNSWL is a commercial service that requires payment for servers over 100K queries daily.
# Unfortunately, they will return true answers for DNS servers they consider abusive so
@@ -838,9 +841,6 @@ score URIBL_ZEN_BLOCKED_OPENDNS 0 0.001
score URIBL_ZEN_BLOCKED 0 0.001 0 0.001
score URIBL_DBL_BLOCKED_OPENDNS 0 0.001 0 0.001
score URIBL_DBL_BLOCKED 0 0.001 0 0.001
-score VALIDITY_BLOCKED_CERTIFIED 0 0.001 0 0.001
-score VALIDITY_BLOCKED_RPBL 0 0.001 0 0.001
-score VALIDITY_BLOCKED_SAFE 0 0.001 0 0.001
endif # Mail::SpamAssassin::Plugin::URIDNSBL
# ReplaceTags
Modified: spamassassin/trunk/rulesrc/10_force_active.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rulesrc/10_force_active.cf?rev=1917281&r1=1917280&r2=1917281&view=diff
==============================================================================
--- spamassassin/trunk/rulesrc/10_force_active.cf (original)
+++ spamassassin/trunk/rulesrc/10_force_active.cf Tue Apr 23 13:12:44 2024
@@ -477,8 +477,11 @@ publish RCVD_IN_MAPS_RSS
publish RCVD_IN_PBL
publish RCVD_IN_PSBL
publish RCVD_IN_VALIDITY_CERTIFIED
+publish RCVD_IN_VALIDITY_CERTIFIED_BLOCKED
publish RCVD_IN_VALIDITY_RPBL
+publish RCVD_IN_VALIDITY_RPBL_BLOCKED
publish RCVD_IN_VALIDITY_SAFE
+publish RCVD_IN_VALIDITY_SAFE_BLOCKED
publish RCVD_IN_SBL
publish RCVD_IN_SORBS_BLOCK
publish RCVD_IN_SORBS_DUL
@@ -653,9 +656,6 @@ publish USER_IN_WHITELIST
publish USER_IN_WELCOMELIST
publish USER_IN_WHITELIST_TO
publish USER_IN_WELCOMELIST_TO
-publish VALIDITY_BLOCKED_CERTIFIED
-publish VALIDITY_BLOCKED_RPBL
-publish VALIDITY_BLOCKED_SAFE
publish VANITY
publish VBOUNCE_MESSAGE
publish VIA_GAP_GRA