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/23 12:05:02 UTC
svn commit: r1900213 [2/2] - in /spamassassin/branches/trunk-welcomelist: ./ lib/Mail/ lib/Mail/SpamAssassin/ lib/Mail/SpamAssassin/Message/ lib/Mail/SpamAssassin/Util/ rules/ rulesrc/scores/ t/
Modified: spamassassin/branches/trunk-welcomelist/rulesrc/scores/scores-set0
URL: http://svn.apache.org/viewvc/spamassassin/branches/trunk-welcomelist/rulesrc/scores/scores-set0?rev=1900213&r1=1900212&r2=1900213&view=diff
==============================================================================
--- spamassassin/branches/trunk-welcomelist/rulesrc/scores/scores-set0 (original)
+++ spamassassin/branches/trunk-welcomelist/rulesrc/scores/scores-set0 Sat Apr 23 12:05:02 2022
@@ -1,31 +1,31 @@
-# Using score set 0 logs for revision 1900099 from:
-# ham-darxus.r1900099.log ham-ena-week0.r1900099.log ham-ena-week1.r1900099.log ham-ena-week2.r1900099.log ham-ena-week3.r1900099.log ham-ena-week4.r1900099.log ham-giovanni-ham.r1900099.log ham-giovanni-spammy.r1900099.log ham-giovanni-spam.r1900099.log ham-hege.r1900099.log ham-llanga.r1900099.log ham-mmiroslaw-mails-ham.r1900099.log ham-mmiroslaw-mails-spam.r1900099.log ham-pds.r1900099.log ham-spamsponge.r1900099.log ham-thendrikx.r1900099.log spam-darxus.r1900099.log spam-ena-week0.r1900099.log spam-ena-week1.r1900099.log spam-ena-week2.r1900099.log spam-ena-week3.r1900099.log spam-ena-week4.r1900099.log spam-giovanni-ham.r1900099.log spam-giovanni-spammy.r1900099.log spam-giovanni-spam.r1900099.log spam-hege.r1900099.log spam-llanga.r1900099.log spam-mmiroslaw-mails-ham.r1900099.log spam-mmiroslaw-mails-spam.r1900099.log spam-pds.r1900099.log spam-spamsponge.r1900099.log spam-thendrikx.r1900099.log
+# Using score set 0 logs for revision 1900144 from:
+# ham-darxus.r1900144.log ham-ena-week0.r1900144.log ham-ena-week1.r1900144.log ham-ena-week2.r1900144.log ham-ena-week3.r1900144.log ham-ena-week4.r1900144.log ham-giovanni-ham.r1900144.log ham-giovanni-spammy.r1900144.log ham-giovanni-spam.r1900144.log ham-grenier.r1900144.log ham-hege.r1900144.log ham-jhardin.r1900144.log ham-llanga.r1900144.log ham-mmiroslaw-mails-ham.r1900144.log ham-mmiroslaw-mails-spam.r1900144.log ham-pds.r1900144.log ham-spamsponge.r1900144.log ham-thendrikx.r1900144.log spam-darxus.r1900144.log spam-ena-week0.r1900144.log spam-ena-week1.r1900144.log spam-ena-week2.r1900144.log spam-ena-week3.r1900144.log spam-ena-week4.r1900144.log spam-giovanni-ham.r1900144.log spam-giovanni-spammy.r1900144.log spam-giovanni-spam.r1900144.log spam-grenier.r1900144.log spam-hege.r1900144.log spam-jhardin.r1900144.log spam-llanga.r1900144.log spam-mmiroslaw-mails-ham.r1900144.log spam-mmiroslaw-mails-spam.r1900144.log spam-pds.r1900144.log spam-spamsponge.r1900144.log spam-
thendrikx.r1900144.log
score AC_BR_BONANZA 0.001
score AC_DIV_BONANZA 0.001
score AC_FROM_MANY_DOTS 2.999
score AC_HTML_NONSENSE_TAGS 1.999
score ADMITS_SPAM 3.799
-score ADVANCE_FEE_2_NEW_FRM_MNY 2.074
+score ADVANCE_FEE_2_NEW_FRM_MNY 0.001
score ADVANCE_FEE_2_NEW_MONEY 1.999
-score ADVANCE_FEE_3_NEW 3.499
-score ADVANCE_FEE_3_NEW_FRM_MNY 1.480
-score ADVANCE_FEE_3_NEW_MONEY 2.899
-score ADVANCE_FEE_4_NEW 1.804
+score ADVANCE_FEE_3_NEW 3.299
+score ADVANCE_FEE_3_NEW_FRM_MNY 1.511
+score ADVANCE_FEE_3_NEW_MONEY 2.999
+score ADVANCE_FEE_4_NEW 2.499
score ADVANCE_FEE_4_NEW_FRM_MNY 0.001
-score ADVANCE_FEE_4_NEW_MONEY 1.039
-score ADVANCE_FEE_5_NEW 2.399
-score ADVANCE_FEE_5_NEW_FRM_MNY 0.001 # force non-zero
+score ADVANCE_FEE_4_NEW_MONEY 0.486
+score ADVANCE_FEE_5_NEW 2.499
+score ADVANCE_FEE_5_NEW_FRM_MNY 0.001
score ADVANCE_FEE_5_NEW_MONEY 0.001
score AD_PREFS 0.001
score AMAZON_IMG_NOT_RCVD_AMZN 2.499
score APP_DEVELOPMENT_NORDNS 1.999
-score AXB_XMAILER_MIMEOLE_OL_024C2 0.001
-score AXB_XMAILER_MIMEOLE_OL_1ECD5 1.347
-score BIGNUM_EMAILS_FREEM 0.318
+score AXB_XMAILER_MIMEOLE_OL_024C2 0.001 # force non-zero
+score AXB_XMAILER_MIMEOLE_OL_1ECD5 2.282
+score BIGNUM_EMAILS_FREEM 1.255
score BIGNUM_EMAILS_MANY 2.999
-score BITCOIN_DEADLINE 2.176
-score BITCOIN_EXTORT_01 4.504
+score BITCOIN_DEADLINE 2.053
+score BITCOIN_EXTORT_01 4.714
score BITCOIN_IMGUR 3.499
score BITCOIN_MALF_HTML 3.499
score BITCOIN_SPAM_02 2.499
@@ -33,126 +33,126 @@ score BITCOIN_SPAM_03 2.4
score BITCOIN_SPAM_04 1.499
score BITCOIN_SPAM_09 1.499
score BITCOIN_XPRIO 2.499
-score BITCOIN_YOUR_INFO 2.999
+score BITCOIN_YOUR_INFO 3.000
score BODY_EMPTY 1.999
score BODY_SINGLE_URI 2.499
score BOGUS_MIME_VERSION 3.499
-score BOGUS_MSM_HDRS 1.420
-score CK_HELO_GENERIC 0.250
-score CONTENT_AFTER_HTML 2.352
+score BOGUS_MSM_HDRS 2.905
+score CK_HELO_GENERIC 0.249
+score CONTENT_AFTER_HTML 2.196
score CONTENT_AFTER_HTML_WEAK 1.499
score CTE_8BIT_MISMATCH 0.999
score DEAR_BENEFICIARY 0.001
-score DOS_RCVD_IP_TWICE_B 1.999
-score FACEBOOK_IMG_NOT_RCVD_FB 0.308
-score FAKE_REPLY_B 2.199
-score FILL_THIS_FORM 1.408
+score FACEBOOK_IMG_NOT_RCVD_FB 0.202
+score FAKE_REPLY_B 2.299
+score FILL_THIS_FORM 1.799
score FONT_INVIS_DIRECT 0.001
-score FONT_INVIS_HTML_NOHTML 3.000
-score FONT_INVIS_LONG_LINE 1.673
-score FONT_INVIS_MSGID 1.131
-score FONT_INVIS_NORDNS 0.776
-score FONT_INVIS_POSTEXTRAS 1.650
+score FONT_INVIS_HTML_NOHTML 2.999
+score FONT_INVIS_LONG_LINE 1.685
+score FONT_INVIS_MSGID 0.378
+score FONT_INVIS_NORDNS 1.048
+score FONT_INVIS_POSTEXTRAS 0.045
score FORM_FRAUD_5 0.001
score FOUND_YOU 3.249
-score FREEMAIL_FORGED_FROMDOMAIN 0.249
-score FROMSPACE 3.399
-score FROM_2_EMAILS_SHORT 1.593
+score FREEMAIL_FORGED_FROMDOMAIN 0.250
+score FROMSPACE 3.499
+score FROM_2_EMAILS_SHORT 1.401
score FROM_ADDR_WS 2.999
score FROM_MISSPACED 1.999
-score FROM_MISSP_DYNIP 0.188
+score FROM_MISSP_DYNIP 1.697
score FROM_MISSP_EH_MATCH 1.999
score FROM_MISSP_FREEMAIL 3.199
score FROM_MISSP_MSFT 0.001
score FROM_MISSP_PHISH 3.499
-score FROM_MISSP_TO_UNDISC 1.243
-score FROM_MISSP_USER 0.001
-score FROM_MULTI_NORDNS 1.229
+score FROM_MISSP_TO_UNDISC 0.845
+score FROM_MISSP_USER 0.001 # force non-zero
+score FROM_MULTI_NORDNS 1.301
score FROM_NTLD_REPLY_FREEMAIL 1.999
score FROM_SUSPICIOUS_NTLD 0.499
score FROM_SUSPICIOUS_NTLD_FP 1.999
-score FROM_UNBAL1 2.059
-score FROM_WSP_TRAIL 2.199
+score FROM_UNBAL1 2.399
+score FROM_WSP_TRAIL 2.399
score FSL_CTYPE_WIN1251 0.001
-score FSL_NEW_HELO_USER 0.001
-score FUZZY_AMAZON 2.199
-score FUZZY_CLICK_HERE 2.499
+score FSL_NEW_HELO_USER 0.001 # force non-zero
+score FUZZY_AMAZON 2.400
+score FUZZY_CLICK_HERE 2.699
score FUZZY_WALLET 3.199
score GB_FAKE_RF_SHORT 1.999
score GB_FREEMAIL_DISPTO 0.499
-score GB_FREEMAIL_DISPTO_NOTFREEM 0.500
+score GB_FREEMAIL_DISPTO_NOTFREEM 0.499
score GOOG_REDIR_HTML_ONLY 1.999
-score GOOG_REDIR_NORDNS 2.601
-score GOOG_STO_EMAIL_PHISH 2.552
-score GOOG_STO_HTML_PHISH 1.961
-score GOOG_STO_IMG_NOHTML 2.338
+score GOOG_REDIR_NORDNS 2.604
+score GOOG_STO_EMAIL_PHISH 2.520
+score GOOG_STO_HTML_PHISH 1.215
+score GOOG_STO_IMG_NOHTML 2.259
score GOOG_STO_NOIMG_HTML 2.999
score HAS_X_NO_RELAY 2.499
score HAS_X_OUTGOING_SPAM_STAT 1.999
score HDRS_LCASE_IMGONLY 0.099
score HDRS_MISSP 2.499
score HDR_ORDER_FTSDMCXX_DIRECT 1.999
-score HDR_ORDER_FTSDMCXX_NORDNS 2.971
+score HDR_ORDER_FTSDMCXX_NORDNS 1.876
score HEADER_FROM_DIFFERENT_DOMAINS 0.250
score HELO_NO_DOMAIN 0.001
-score HK_LOTTO 0.596
+score HK_LOTTO 0.929
score HK_NAME_FROM 0.999
score HK_NAME_MR_MRS 0.999
score HK_RANDOM_ENVFROM 0.999
-score HK_RANDOM_FROM 1.000
+score HK_RANDOM_FROM 0.999
score HK_RANDOM_REPLYTO 0.999
-score HK_SCAM 0.622
-score HK_WIN 0.099
-score HOSTED_IMG_DIRECT_MX 2.635
+score HK_SCAM 1.146
+score HK_WIN 0.001
+score HOSTED_IMG_DIRECT_MX 3.277
score HOSTED_IMG_FREEM 3.499
-score HOSTED_IMG_MULTI_PUB_01 2.999
-score HTML_ENTITY_ASCII 1.299
+score HOSTED_IMG_MULTI_PUB_01 3.000
+score HTML_ENTITY_ASCII 2.531
score HTML_FONT_TINY_NORDNS 1.999
score HTML_OFF_PAGE 2.999
-score HTML_TAG_BALANCE_CENTER 2.901
-score HTML_TEXT_INVISIBLE_STYLE 0.600
+score HTML_TAG_BALANCE_CENTER 3.799
+score HTML_TEXT_INVISIBLE_STYLE 0.602
score JH_SPAMMY_HEADERS 3.499
score LONGLN_LOW_CONTRAST 2.499
score LONG_HEX_URI 2.999
-score LONG_IMG_URI 1.690
-score LONG_INVISIBLE_TEXT 1.788
+score LONG_IMG_URI 1.679
+score LONG_INVISIBLE_TEXT 1.787
score LOTS_OF_MONEY 0.010
score LOTTO_AGENT 1.499
-score LOTTO_DEPT 0.001
+score LOTTO_DEPT 1.999
score MALWARE_NORDNS 0.001
-score MALW_ATTACH 2.400
-score MANY_SPAN_IN_TEXT 2.499
+score MALW_ATTACH 2.499
+score MANY_SPAN_IN_TEXT 2.599
score MILLION_HUNDRED 0.001
-score MILLION_USD 0.001
+score MILLION_USD 0.127
score MIMEOLE_DIRECT_TO_MX 1.999
score MIME_NO_TEXT 1.999
-score MIXED_AREA_CASE 1.572
-score MIXED_CENTER_CASE 2.500
+score MIXED_AREA_CASE 1.976
+score MIXED_CENTER_CASE 2.499
score MIXED_ES 2.599
-score MIXED_FONT_CASE 1.069
+score MIXED_FONT_CASE 0.173
score MIXED_HREF_CASE 1.999
-score MIXED_IMG_CASE 1.993
+score MIXED_IMG_CASE 1.806
score MONEY_12LTRDOM 0.099
-score MONEY_ATM_CARD 0.001 # force non-zero
-score MONEY_BARRISTER 0.999
+score MONEY_ATM_CARD 0.001
+score MONEY_BARRISTER 0.001
score MONEY_FORM 0.001
-score MONEY_FORM_SHORT 1.269
-score MONEY_FRAUD_3 0.001
-score MONEY_FRAUD_5 0.298
-score MONEY_FRAUD_8 0.656
-score MONEY_FREEMAIL_REPTO 2.349
+score MONEY_FORM_SHORT 0.859
+score MONEY_FRAUD_3 2.279
+score MONEY_FRAUD_5 1.439
+score MONEY_FRAUD_8 0.001
+score MONEY_FREEMAIL_REPTO 2.893
score MONEY_FROM_41 1.999
score MONEY_FROM_MISSP 0.001
-score MSMAIL_PRI_ABNORMAL 0.284
-score NAME_EMAIL_DIFF 3.399
-score NA_DOLLARS 0.896
-score NICE_REPLY_A -4.299
+score MSMAIL_PRI_ABNORMAL 0.525
+score NAME_EMAIL_DIFF 3.600
+score NA_DOLLARS 0.895
+score NICE_REPLY_A -0.542
+score NICE_REPLY_B -0.466
score NORDNS_LOW_CONTRAST 1.888
score NO_FM_NAME_IP_HOSTN 0.001
score NSL_RCVD_FROM_USER 0.001
-score NSL_RCVD_HELO_USER 0.152
-score OBFU_TEXT_ATTACH 1.400
-score ODD_FREEM_REPTO 2.999
+score NSL_RCVD_HELO_USER 1.349
+score OBFU_TEXT_ATTACH 1.599
+score ODD_FREEM_REPTO 3.000
score PDS_BTC_ID 0.499
score PDS_BTC_MSGID 0.999
score PDS_DBL_URL_TNB_RUNON 1.999
@@ -160,67 +160,68 @@ score PDS_HP_HELO_NORDNS 0.9
score PDS_OTHER_BAD_TLD 1.999
score PDS_PHPEXP_BOT 1.499
score PDS_PHP_EVAL 1.499
-score PDS_PRO_TLD 1.000
+score PDS_PRO_TLD 0.999
score PDS_TONAME_EQ_TOLOCAL_FREEM_FORGE 1.999
-score PHISH_ATTACH 2.299
+score PHISH_ATTACH 2.399
score PHP_ORIG_SCRIPT 2.499
score PHP_ORIG_SCRIPT_EVAL 2.999
score PHP_SCRIPT 2.499
score PP_MIME_FAKE_ASCII_TEXT 0.999
-score RAND_HEADER_LIST_SPOOF 2.999
+score RAND_HEADER_LIST_SPOOF 3.000
score RAND_MKTG_HEADER 1.999
-score RATWARE_NO_RDNS 0.845
-score RDNS_NUM_TLD_XM 1.554
+score RATWARE_NO_RDNS 1.243
+score RDNS_NUM_TLD_XM 2.676
score REPLYTO_EMPTY 2.152
score REPTO_419_FRAUD_GM 2.999
score SCC_CANSPAM_2 2.999
-score SCC_ISEMM_LID_1 1.994
-score SCC_SPAMMER_ADDR_2 1.814
-score SCRIPT_GIBBERISH 2.799
-score SENDGRID_REDIR 1.286
-score SERGIO_SUBJECT_VIAGRA01 3.897
-score SHOPIFY_IMG_NOT_RCVD_SFY 1.547
+score SCC_ISEMM_LID_1 2.351
+score SCC_SPAMMER_ADDR_2 2.594
+score SCRIPT_GIBBERISH 2.899
+score SENDGRID_REDIR 1.386
+score SERGIO_SUBJECT_VIAGRA01 3.440
+score SHOPIFY_IMG_NOT_RCVD_SFY 2.035
score SHORTENER_SHORT_IMG 0.001
score SHORT_SHORTNER 1.999
-score STATIC_XPRIO_OLE 0.155
-score SUBJ_ATTENTION 0.499
-score SUSP_UTF8_WORD_FROM 2.000
+score STATIC_XPRIO_OLE 0.002
+score SUBJ_ATTENTION 0.500
+score SUSP_UTF8_WORD_FROM 1.999
score SUSP_UTF8_WORD_SUBJ 1.999
-score THIS_AD 1.599
-score THIS_IS_ADV_SUSP_NTLD 0.062
-score TO_NAME_SUBJ_NO_RDNS 2.810
-score TO_NO_BRKTS_FROM_MSSP 2.499
+score THIS_AD 1.699
+score THIS_IS_ADV_SUSP_NTLD 1.142
+score TO_NAME_SUBJ_NO_RDNS 2.734
+score TO_NO_BRKTS_FROM_MSSP 2.500
score TO_NO_BRKTS_HTML_IMG 1.999
-score TO_NO_BRKTS_HTML_ONLY 2.000
+score TO_NO_BRKTS_HTML_ONLY 1.999
score TO_NO_BRKTS_NORDNS_HTML 1.999
-score TO_NO_BRKTS_PCNT 2.499
-score TRANSFORM_LIFE 2.499
+score TO_NO_BRKTS_PCNT 1.048
+score TRANSFORM_LIFE 2.500
score TVD_PH_7 2.699
score TVD_PH_BODY_META 2.999
-score TVD_RCVD_SPACE_BRACKET 1.568
+score TVD_RCVD_SPACE_BRACKET 1.456
score UNDISC_FREEM 3.699
-score UNDISC_MONEY 3.251
+score UNDISC_MONEY 3.700
score UNICODE_OBFU_ASC 2.499
score UNSUB_GOOG_FORM 2.499
+score URI_DOTEDU 1.261
score URI_FIREBASEAPP 2.999
-score URI_GOOGLE_PROXY 2.899
+score URI_GOOGLE_PROXY 2.799
score URI_GOOG_STO_SPAMMY 2.999
-score URI_IN_URI_10 3.600
-score URI_OBFU_DOM 2.299
+score URI_IN_URI_10 3.599
+score URI_OBFU_DOM 2.399
score URI_PHISH 3.999
score URI_PHP_REDIR 3.499
score URI_TRY_3LD 1.999
score URI_WPADMIN 2.699
score URI_WP_HACKED_2 2.499
-score US_DOLLARS_3 0.771
-score VFY_ACCT_NORDNS 2.673
-score WORD_INVIS 1.606
+score US_DOLLARS_3 0.079
+score VFY_ACCT_NORDNS 2.656
+score WORD_INVIS 2.371
score WORD_INVIS_MANY 2.999
-score XFER_LOTSA_MONEY 0.760
+score XFER_LOTSA_MONEY 0.890
score XM_LIGHT_HEAVY 2.499
score XM_RANDOM 2.499
-score XM_RECPTID 3.000
-score YOU_INHERIT 2.599
+score XM_RECPTID 2.999
+score YOU_INHERIT 2.699
score AC_POST_EXTRAS 1.000
score AC_SPAMMY_URI_PATTERNS1 1.000
score AC_SPAMMY_URI_PATTERNS10 1.000
@@ -236,7 +237,6 @@ score ADVANCE_FEE_2_NEW_FORM 1.0
score ALIBABA_IMG_NOT_RCVD_ALI 1.000
score APP_DEVELOPMENT_FREEM 1.000
score BEBEE_IMG_NOT_RCVD_BB 1.000
-score BILLION_OVERLAP 0.001 # force non-zero
score BITCOIN_BOMB 1.000
score BITCOIN_EXTORT_02 1.000
score BITCOIN_MALWARE 1.000
@@ -317,7 +317,6 @@ score NEWEGG_IMG_NOT_RCVD_NEGG 1.0
score NEW_PRODUCTS 1.000
score OBFU_BITCOIN 1.000
score PDS_BTC_NTLD 1.000
-score PDS_FROM_2_EMAILS 1.000
score PDS_PHP_RUNTIME_FUNC 1.000
score PHISH_AZURE_CLOUDAPP 3.500
score PHISH_FBASEAPP 1.000
@@ -371,7 +370,6 @@ score URI_ADOBESPARK 1.0
score URI_AZURE_CLOUDAPP 1.000
score URI_DASHGOVEDU 1.000
score URI_DATA 1.000
-score URI_DOTEDU 1.000
score URI_DOTEDU_ENTITY 1.000
score URI_HEX_IP 1.000
score URI_IMG_WP_REDIR 1.000
Modified: spamassassin/branches/trunk-welcomelist/rulesrc/scores/scores-set1
URL: http://svn.apache.org/viewvc/spamassassin/branches/trunk-welcomelist/rulesrc/scores/scores-set1?rev=1900213&r1=1900212&r2=1900213&view=diff
==============================================================================
--- spamassassin/branches/trunk-welcomelist/rulesrc/scores/scores-set1 (original)
+++ spamassassin/branches/trunk-welcomelist/rulesrc/scores/scores-set1 Sat Apr 23 12:05:02 2022
@@ -6,249 +6,248 @@ score AC_DIV_BONANZA 0.0
score AC_FROM_MANY_DOTS 2.996
score AC_HTML_NONSENSE_TAGS 1.997
score ADMITS_SPAM 3.595
-score ADVANCE_FEE_2_NEW_FRM_MNY 2.423
+score ADVANCE_FEE_2_NEW_FRM_MNY 2.461
score ADVANCE_FEE_2_NEW_MONEY 1.997
-score ADVANCE_FEE_3_NEW 3.104
-score ADVANCE_FEE_3_NEW_FRM_MNY 0.027
+score ADVANCE_FEE_3_NEW 3.128
+score ADVANCE_FEE_3_NEW_FRM_MNY 2.559
score ADVANCE_FEE_3_NEW_MONEY 2.896
score ADVANCE_FEE_4_NEW 2.397
score ADVANCE_FEE_4_NEW_FRM_MNY 0.001
-score ADVANCE_FEE_4_NEW_MONEY 0.440
-score ADVANCE_FEE_5_NEW 2.393
-score ADVANCE_FEE_5_NEW_FRM_MNY 0.001
-score ADVANCE_FEE_5_NEW_MONEY 3.020
-score AD_PREFS 0.426
+score ADVANCE_FEE_4_NEW_MONEY 0.576
+score ADVANCE_FEE_5_NEW 2.064
+score ADVANCE_FEE_5_NEW_FRM_MNY 0.001 # force non-zero
+score ADVANCE_FEE_5_NEW_MONEY 3.096
+score AD_PREFS 0.091
score AMAZON_IMG_NOT_RCVD_AMZN 2.497
-score APP_DEVELOPMENT_NORDNS 1.722
+score APP_DEVELOPMENT_NORDNS 0.225
score AXB_XMAILER_MIMEOLE_OL_024C2 0.001
-score AXB_XMAILER_MIMEOLE_OL_1ECD5 1.779
+score AXB_XMAILER_MIMEOLE_OL_1ECD5 0.781
score BIGNUM_EMAILS_FREEM 2.996
score BIGNUM_EMAILS_MANY 2.996
-score BILLION_OVERLAP -0.442
-score BITCOIN_DEADLINE 2.501
-score BITCOIN_EXTORT_01 4.788
-score BITCOIN_MALF_HTML 2.973
-score BITCOIN_MALWARE 1.195
-score BITCOIN_OBFU_SUBJ 0.639
+score BITCOIN_DEADLINE 2.380
+score BITCOIN_EXTORT_01 4.999
+score BITCOIN_MALF_HTML 2.470
+score BITCOIN_MALWARE 1.154
+score BITCOIN_OBFU_SUBJ 0.946
score BITCOIN_SPAM_02 2.497
score BITCOIN_SPAM_04 1.499
-score BITCOIN_SPAM_05 1.765
+score BITCOIN_SPAM_05 1.847
score BITCOIN_SPAM_09 1.498
score BITCOIN_XPRIO 2.497
-score BITCOIN_YOUR_INFO 2.747
-score BODY_EMPTY 0.392
-score BODY_SINGLE_URI 0.667
+score BITCOIN_YOUR_INFO 2.761
+score BODY_EMPTY 1.892
+score BODY_SINGLE_URI 0.676
score BODY_URI_ONLY 2.996
-score BOGUS_MIME_VERSION 3.270
-score BOGUS_MSM_HDRS 1.838
-score CANT_SEE_AD 1.192
-score CK_HELO_GENERIC 0.001
+score BOGUS_MIME_VERSION 3.265
+score BOGUS_MSM_HDRS 2.552
+score CANT_SEE_AD 0.744
+score CK_HELO_GENERIC 0.046
score CONTENT_AFTER_HTML 2.497
score CONTENT_AFTER_HTML_WEAK 1.498
score CTE_8BIT_MISMATCH 0.001 # force non-zero
score DEAR_BENEFICIARY 0.001
-score DKIMWL_BL 2.997
-score DKIMWL_WL_HIGH -0.572
-score DKIMWL_WL_MED -0.001 # force non-zero
-score DKIMWL_WL_MEDHI -0.860
-score DOS_RCVD_IP_TWICE_B 1.997
-score END_FUTURE_EMAILS 2.187
-score FAKE_REPLY_B 0.519
-score FILL_THIS_FORM 0.070
+score DKIMWL_BL 2.996
+score DKIMWL_WL_HIGH -0.575
+score DKIMWL_WL_MED -0.001
+score DKIMWL_WL_MEDHI -0.812
+score END_FUTURE_EMAILS 2.189
+score FAKE_REPLY_B 1.263
+score FILL_THIS_FORM 0.075
score FONT_INVIS_DIRECT 0.001
score FONT_INVIS_HTML_NOHTML 2.996
-score FONT_INVIS_LONG_LINE 1.089
-score FONT_INVIS_MSGID 1.332
-score FONT_INVIS_NORDNS 0.659
-score FORGED_SPF_HELO 0.125
-score FORM_FRAUD 0.993
-score FORM_FRAUD_3 1.378
+score FONT_INVIS_LONG_LINE 1.094
+score FONT_INVIS_MSGID 1.106
+score FONT_INVIS_NORDNS 1.957
+score FORGED_SPF_HELO 0.131
+score FORM_FRAUD 0.999
+score FORM_FRAUD_3 0.331
score FORM_FRAUD_5 0.001
score FOUND_YOU 3.246
score FREEMAIL_FORGED_FROMDOMAIN 0.248
score FROMSPACE 3.396
-score FROM_2_EMAILS_SHORT 0.269
+score FROM_2_EMAILS_SHORT 1.592
score FROM_ADDR_WS 2.996
score FROM_FMBLA_NEWDOM 1.498
score FROM_FMBLA_NEWDOM14 0.998
score FROM_FMBLA_NEWDOM28 0.798
-score FROM_GOV_DKIM_AU -0.307
-score FROM_MISSPACED 1.169
-score FROM_MISSP_DYNIP 1.545
+score FROM_GOV_DKIM_AU -0.329
+score FROM_MISSPACED 1.171
+score FROM_MISSP_DYNIP 2.399
score FROM_MISSP_EH_MATCH 0.001
score FROM_MISSP_FREEMAIL 0.001
score FROM_MISSP_MSFT 0.001
-score FROM_MISSP_PHISH 2.003
+score FROM_MISSP_PHISH 1.181
score FROM_MISSP_REPLYTO 2.497
score FROM_MISSP_SPF_FAIL 1.997
-score FROM_MISSP_TO_UNDISC 0.505
+score FROM_MISSP_TO_UNDISC 2.008
score FROM_MISSP_USER 0.001
-score FROM_MULTI_NORDNS 1.001
+score FROM_MULTI_NORDNS 1.002
score FROM_PAYPAL_SPOOF 1.597
-score FROM_SUSPICIOUS_NTLD 0.499
-score FROM_SUSPICIOUS_NTLD_FP 0.001
+score FROM_SUSPICIOUS_NTLD 0.498
+score FROM_SUSPICIOUS_NTLD_FP 0.001 # force non-zero
score FROM_UNBAL1 2.297
-score FROM_WSP_TRAIL 1.320
-score FSL_BULK_SIG 1.412
+score FROM_WSP_TRAIL 2.297
+score FSL_BULK_SIG 1.368
score FSL_CTYPE_WIN1251 0.001
score FSL_NEW_HELO_USER 0.001
-score FUZZY_AMAZON 2.132
+score FUZZY_AMAZON 2.210
score FUZZY_CLICK_HERE 2.297
-score FUZZY_WALLET 1.227
-score GB_BITCOIN_CP 1.046
+score FUZZY_WALLET 1.236
+score GB_BITCOIN_CP 1.910
score GB_FAKE_RF_SHORT 1.997
score GB_FREEMAIL_DISPTO 0.498
score GB_FREEMAIL_DISPTO_NOTFREEM 0.498
score GOOG_REDIR_HTML_ONLY 1.997
-score GOOG_REDIR_NORDNS 3.120
-score GOOG_STO_EMAIL_PHISH 2.335
-score GOOG_STO_HTML_PHISH 0.401
-score GOOG_STO_IMG_NOHTML 1.889
+score GOOG_REDIR_NORDNS 3.125
+score GOOG_STO_EMAIL_PHISH 2.106
+score GOOG_STO_HTML_PHISH 1.659
+score GOOG_STO_IMG_NOHTML 2.097
score GOOG_STO_NOIMG_HTML 2.996
-score HAS_X_NO_RELAY 2.324
-score HAS_X_OUTGOING_SPAM_STAT 0.409
+score HAS_X_NO_RELAY 2.271
+score HAS_X_OUTGOING_SPAM_STAT 0.415
score HDRS_LCASE_IMGONLY 0.098
-score HDRS_MISSP 2.325
-score HDR_ORDER_FTSDMCXX_DIRECT 0.294
-score HDR_ORDER_FTSDMCXX_NORDNS 3.434
+score HDRS_MISSP 2.319
+score HDR_ORDER_FTSDMCXX_DIRECT 0.549
+score HDR_ORDER_FTSDMCXX_NORDNS 3.361
score HEADER_FROM_DIFFERENT_DOMAINS 0.248
score HELO_NO_DOMAIN 0.001
-score HK_LOTTO 0.458
+score HK_LOTTO 0.527
score HK_NAME_FROM 0.998
score HK_NAME_MR_MRS 0.998
score HK_RANDOM_ENVFROM 0.998
score HK_RANDOM_FROM 0.998
score HK_RANDOM_REPLYTO 0.998
-score HK_SCAM 1.941
-score HK_WIN 0.176
-score HOSTED_IMG_DIRECT_MX 1.489
-score HOSTED_IMG_FREEM 2.425
-score HOSTED_IMG_MULTI_PUB_01 2.996
-score HTML_ENTITY_ASCII 1.741
-score HTML_FONT_TINY_NORDNS 1.598
-score HTML_OFF_PAGE 2.047
-score HTML_SINGLET_MANY 1.606
-score HTML_TAG_BALANCE_CENTER 2.403
-score HTML_TEXT_INVISIBLE_FONT 1.000
-score HTML_TEXT_INVISIBLE_STYLE 2.415
-score IMG_ONLY_FM_DOM_INFO 0.288
+score HK_SCAM 1.633
+score HK_WIN 0.001
+score HOSTED_IMG_DIRECT_MX 1.194
+score HOSTED_IMG_FREEM 2.424
+score HOSTED_IMG_MULTI_PUB_01 2.997
+score HTML_ENTITY_ASCII 1.701
+score HTML_FONT_TINY_NORDNS 1.631
+score HTML_OFF_PAGE 1.889
+score HTML_SINGLET_MANY 1.600
+score HTML_TAG_BALANCE_CENTER 2.394
+score HTML_TEXT_INVISIBLE_FONT 1.338
+score HTML_TEXT_INVISIBLE_STYLE 2.420
+score IMG_ONLY_FM_DOM_INFO 0.001
score JH_SPAMMY_HEADERS 3.496
-score KHOP_HELO_FCRDNS 0.024
+score KHOP_HELO_FCRDNS 0.069
score LONGLN_LOW_CONTRAST 2.497
score LONG_HEX_URI 0.001
-score LONG_IMG_URI 0.929
-score LONG_INVISIBLE_TEXT 1.853
+score LONG_IMG_URI 0.935
+score LONG_INVISIBLE_TEXT 1.849
score LOTS_OF_MONEY 0.010
-score LOTTO_AGENT 0.791
-score LOTTO_DEPT 0.533
+score LOTTO_AGENT 0.389
+score LOTTO_DEPT 0.001
score MALWARE_NORDNS 0.001
score MALW_ATTACH 2.397
-score MANY_SPAN_IN_TEXT 1.130
-score MILLION_HUNDRED 0.768
+score MANY_SPAN_IN_TEXT 1.127
+score MILLION_HUNDRED 0.896
score MILLION_USD 0.001
score MIMEOLE_DIRECT_TO_MX 1.997
-score MIXED_AREA_CASE 1.286
-score MIXED_CENTER_CASE 1.116
-score MIXED_ES 1.087
-score MIXED_FONT_CASE 1.655
-score MIXED_HREF_CASE 1.999
-score MIXED_IMG_CASE 2.710
+score MIXED_AREA_CASE 0.522
+score MIXED_CENTER_CASE 0.877
+score MIXED_ES 1.082
+score MIXED_FONT_CASE 2.297
+score MIXED_HREF_CASE 1.463
+score MIXED_IMG_CASE 1.325
score MONEY_ATM_CARD 0.001
-score MONEY_FORM 0.001
+score MONEY_FORM 0.001 # force non-zero
score MONEY_FORM_SHORT 0.001
-score MONEY_FRAUD_3 2.111
-score MONEY_FRAUD_5 0.492
-score MONEY_FRAUD_8 0.001
+score MONEY_FRAUD_3 2.254
+score MONEY_FRAUD_5 0.364
+score MONEY_FRAUD_8 0.001 # force non-zero
score MONEY_FREEMAIL_REPTO 0.001
-score MONEY_FROM_41 1.327
+score MONEY_FROM_41 1.958
score MONEY_FROM_MISSP 0.001
-score NAME_EMAIL_DIFF 3.397
+score NAME_EMAIL_DIFF 3.395
score NA_DOLLARS 1.498
-score NICE_REPLY_A -1.165
-score NORDNS_LOW_CONTRAST 0.767
+score NICE_REPLY_A -1.857
+score NICE_REPLY_B -0.001
+score NORDNS_LOW_CONTRAST 0.742
score NO_FM_NAME_IP_HOSTN 0.001
-score NSL_RCVD_FROM_USER 0.001
-score NSL_RCVD_HELO_USER 1.733
+score NSL_RCVD_FROM_USER 0.001 # force non-zero
+score NSL_RCVD_HELO_USER 1.382
score OBFU_TEXT_ATTACH 1.697
-score ODD_FREEM_REPTO 2.899
+score ODD_FREEM_REPTO 2.996
score PDS_BTC_ID 0.498
-score PDS_BTC_MSGID 0.407
-score PDS_BTC_NTLD 0.653
+score PDS_BTC_MSGID 0.790
+score PDS_BTC_NTLD 1.331
score PDS_DBL_URL_TNB_RUNON 1.997
score PDS_HP_HELO_NORDNS 0.998
-score PDS_OTHER_BAD_TLD 1.997
+score PDS_OTHER_BAD_TLD 1.998
score PDS_PHPEXP_BOT 1.498
score PDS_PHP_EVAL 1.498
score PDS_PRO_TLD 0.998
score PDS_TONAME_EQ_TOLOCAL_FREEM_FORGE 1.997
score PHISH_ATTACH 2.297
-score PHP_ORIG_SCRIPT 2.038
+score PHP_ORIG_SCRIPT 2.042
score PHP_ORIG_SCRIPT_EVAL 2.996
score PHP_SCRIPT 2.497
score PP_MIME_FAKE_ASCII_TEXT 0.001
-score RAND_HEADER_LIST_SPOOF 2.755
-score RAND_MKTG_HEADER 1.499
+score RAND_HEADER_LIST_SPOOF 2.893
+score RAND_MKTG_HEADER 1.501
score RATWARE_NO_RDNS 2.996
-score RCVD_IN_MSPIKE_H2 -0.001
-score RDNS_NUM_TLD_XM 1.500
+score RCVD_IN_MSPIKE_H2 -0.001 # force non-zero
+score RDNS_NUM_TLD_XM 0.539
score REPLYTO_EMPTY 2.696
score REPTO_419_FRAUD_GM 2.996
-score SCC_CANSPAM_2 1.702
-score SCC_ISEMM_LID_1 1.721
-score SCC_SPAMMER_ADDR_2 1.690
+score SCC_CANSPAM_2 2.358
+score SCC_ISEMM_LID_1 1.344
+score SCC_SPAMMER_ADDR_2 1.244
score SCRIPT_GIBBERISH 2.696
score SENDGRID_REDIR 0.001
-score SERGIO_SUBJECT_VIAGRA01 2.719
+score SERGIO_SUBJECT_VIAGRA01 3.586
score SHOPIFY_IMG_NOT_RCVD_SFY 2.497
-score SHORTENER_SHORT_IMG 1.433
+score SHORTENER_SHORT_IMG 1.437
score SHORT_SHORTNER 1.997
score SPOOFED_FREEMAIL 1.997
score SPOOFED_FREEMAIL_NO_RDNS 0.001
score SPOOFED_FREEM_REPTO 2.497
-score SPOOF_GMAIL_MID 0.565
+score SPOOF_GMAIL_MID 0.600
score STATIC_XPRIO_OLE 0.001
score SUBJ_ATTENTION 0.498
-score SUSP_UTF8_WORD_FROM 1.650
+score SUSP_UTF8_WORD_FROM 0.448
score SUSP_UTF8_WORD_SUBJ 1.997
score THIS_AD 1.264
-score TO_EQ_FM_DOM_SPF_FAIL 0.001
+score TO_EQ_FM_DOM_SPF_FAIL 0.001 # force non-zero
score TO_EQ_FM_SPF_FAIL 0.001
-score TO_NAME_SUBJ_NO_RDNS 1.321
+score TO_NAME_SUBJ_NO_RDNS 2.121
score TO_NO_BRKTS_FROM_MSSP 2.497
score TO_NO_BRKTS_HTML_IMG 0.777
-score TO_NO_BRKTS_HTML_ONLY 1.998
+score TO_NO_BRKTS_HTML_ONLY 1.997
score TO_NO_BRKTS_MSFT 0.001
-score TO_NO_BRKTS_NORDNS_HTML 1.198
+score TO_NO_BRKTS_NORDNS_HTML 1.202
score TO_NO_BRKTS_PCNT 2.497
score TRANSFORM_LIFE 2.497
-score TVD_PH_BODY_META 2.054
-score TVD_SPACE_ENCODED 0.001
-score TVD_SPACE_RATIO_MINFP 0.272
+score TVD_PH_BODY_META 2.364
+score TVD_SPACE_ENCODED 0.001 # force non-zero
+score TVD_SPACE_RATIO_MINFP 0.285
score UNDISC_FREEM 3.595
-score UNDISC_MONEY 2.234
-score UNICODE_OBFU_ASC 2.497
+score UNDISC_MONEY 2.236
+score UNICODE_OBFU_ASC 2.498
score UNSUB_GOOG_FORM 2.497
score URI_FIREBASEAPP 2.996
-score URI_GOOGLE_PROXY 2.796
-score URI_GOOG_STO_SPAMMY 2.682
+score URI_GOOGLE_PROXY 2.797
+score URI_GOOG_STO_SPAMMY 0.600
score URI_IN_URI_10 2.874
score URI_OBFU_DOM 2.297
-score URI_ONLY_MSGID_MALF 1.190
-score URI_PHISH 3.782
-score URI_PHP_REDIR 3.144
-score URI_TRY_3LD 1.997
+score URI_ONLY_MSGID_MALF 0.314
+score URI_PHISH 3.788
+score URI_PHP_REDIR 3.100
+score URI_TRY_3LD 1.998
score URI_WPADMIN 2.696
score URI_WP_HACKED 3.496
-score URI_WP_HACKED_2 1.032
-score VFY_ACCT_NORDNS 2.813
-score WORD_INVIS 0.601
-score WORD_INVIS_MANY 2.123
-score XFER_LOTSA_MONEY 0.193
+score URI_WP_HACKED_2 0.995
+score VFY_ACCT_NORDNS 2.999
+score WORD_INVIS 0.788
+score WORD_INVIS_MANY 2.417
+score XFER_LOTSA_MONEY 0.001
score XM_LIGHT_HEAVY 2.497
score XM_RANDOM 2.497
-score XM_RECPTID 2.996
-score XPRIO 2.113
-score YOU_INHERIT 1.454
+score XM_RECPTID 2.997
+score XPRIO 1.324
+score YOU_INHERIT 1.407
score AC_POST_EXTRAS 1.000
score AC_SPAMMY_URI_PATTERNS1 1.000
score AC_SPAMMY_URI_PATTERNS10 1.000
Modified: spamassassin/branches/trunk-welcomelist/rulesrc/scores/scores-set2
URL: http://svn.apache.org/viewvc/spamassassin/branches/trunk-welcomelist/rulesrc/scores/scores-set2?rev=1900213&r1=1900212&r2=1900213&view=diff
==============================================================================
--- spamassassin/branches/trunk-welcomelist/rulesrc/scores/scores-set2 (original)
+++ spamassassin/branches/trunk-welcomelist/rulesrc/scores/scores-set2 Sat Apr 23 12:05:02 2022
@@ -1,31 +1,31 @@
-# Using score set 0 logs for revision 1900099 from:
-# ham-darxus.r1900099.log ham-ena-week0.r1900099.log ham-ena-week1.r1900099.log ham-ena-week2.r1900099.log ham-ena-week3.r1900099.log ham-ena-week4.r1900099.log ham-giovanni-ham.r1900099.log ham-giovanni-spammy.r1900099.log ham-giovanni-spam.r1900099.log ham-hege.r1900099.log ham-llanga.r1900099.log ham-mmiroslaw-mails-ham.r1900099.log ham-mmiroslaw-mails-spam.r1900099.log ham-pds.r1900099.log ham-spamsponge.r1900099.log ham-thendrikx.r1900099.log spam-darxus.r1900099.log spam-ena-week0.r1900099.log spam-ena-week1.r1900099.log spam-ena-week2.r1900099.log spam-ena-week3.r1900099.log spam-ena-week4.r1900099.log spam-giovanni-ham.r1900099.log spam-giovanni-spammy.r1900099.log spam-giovanni-spam.r1900099.log spam-hege.r1900099.log spam-llanga.r1900099.log spam-mmiroslaw-mails-ham.r1900099.log spam-mmiroslaw-mails-spam.r1900099.log spam-pds.r1900099.log spam-spamsponge.r1900099.log spam-thendrikx.r1900099.log
+# Using score set 0 logs for revision 1900144 from:
+# ham-darxus.r1900144.log ham-ena-week0.r1900144.log ham-ena-week1.r1900144.log ham-ena-week2.r1900144.log ham-ena-week3.r1900144.log ham-ena-week4.r1900144.log ham-giovanni-ham.r1900144.log ham-giovanni-spammy.r1900144.log ham-giovanni-spam.r1900144.log ham-grenier.r1900144.log ham-hege.r1900144.log ham-jhardin.r1900144.log ham-llanga.r1900144.log ham-mmiroslaw-mails-ham.r1900144.log ham-mmiroslaw-mails-spam.r1900144.log ham-pds.r1900144.log ham-spamsponge.r1900144.log ham-thendrikx.r1900144.log spam-darxus.r1900144.log spam-ena-week0.r1900144.log spam-ena-week1.r1900144.log spam-ena-week2.r1900144.log spam-ena-week3.r1900144.log spam-ena-week4.r1900144.log spam-giovanni-ham.r1900144.log spam-giovanni-spammy.r1900144.log spam-giovanni-spam.r1900144.log spam-grenier.r1900144.log spam-hege.r1900144.log spam-jhardin.r1900144.log spam-llanga.r1900144.log spam-mmiroslaw-mails-ham.r1900144.log spam-mmiroslaw-mails-spam.r1900144.log spam-pds.r1900144.log spam-spamsponge.r1900144.log spam-
thendrikx.r1900144.log
score AC_BR_BONANZA 0.001
score AC_DIV_BONANZA 0.001
score AC_FROM_MANY_DOTS 2.999
score AC_HTML_NONSENSE_TAGS 1.999
score ADMITS_SPAM 3.799
-score ADVANCE_FEE_2_NEW_FRM_MNY 2.074
+score ADVANCE_FEE_2_NEW_FRM_MNY 0.001
score ADVANCE_FEE_2_NEW_MONEY 1.999
-score ADVANCE_FEE_3_NEW 3.499
-score ADVANCE_FEE_3_NEW_FRM_MNY 1.480
-score ADVANCE_FEE_3_NEW_MONEY 2.899
-score ADVANCE_FEE_4_NEW 1.804
+score ADVANCE_FEE_3_NEW 3.299
+score ADVANCE_FEE_3_NEW_FRM_MNY 1.511
+score ADVANCE_FEE_3_NEW_MONEY 2.999
+score ADVANCE_FEE_4_NEW 2.499
score ADVANCE_FEE_4_NEW_FRM_MNY 0.001
-score ADVANCE_FEE_4_NEW_MONEY 1.039
-score ADVANCE_FEE_5_NEW 2.399
-score ADVANCE_FEE_5_NEW_FRM_MNY 0.001 # force non-zero
+score ADVANCE_FEE_4_NEW_MONEY 0.486
+score ADVANCE_FEE_5_NEW 2.499
+score ADVANCE_FEE_5_NEW_FRM_MNY 0.001
score ADVANCE_FEE_5_NEW_MONEY 0.001
score AD_PREFS 0.001
score AMAZON_IMG_NOT_RCVD_AMZN 2.499
score APP_DEVELOPMENT_NORDNS 1.999
-score AXB_XMAILER_MIMEOLE_OL_024C2 0.001
-score AXB_XMAILER_MIMEOLE_OL_1ECD5 1.347
-score BIGNUM_EMAILS_FREEM 0.318
+score AXB_XMAILER_MIMEOLE_OL_024C2 0.001 # force non-zero
+score AXB_XMAILER_MIMEOLE_OL_1ECD5 2.282
+score BIGNUM_EMAILS_FREEM 1.255
score BIGNUM_EMAILS_MANY 2.999
-score BITCOIN_DEADLINE 2.176
-score BITCOIN_EXTORT_01 4.504
+score BITCOIN_DEADLINE 2.053
+score BITCOIN_EXTORT_01 4.714
score BITCOIN_IMGUR 3.499
score BITCOIN_MALF_HTML 3.499
score BITCOIN_SPAM_02 2.499
@@ -33,126 +33,126 @@ score BITCOIN_SPAM_03 2.4
score BITCOIN_SPAM_04 1.499
score BITCOIN_SPAM_09 1.499
score BITCOIN_XPRIO 2.499
-score BITCOIN_YOUR_INFO 2.999
+score BITCOIN_YOUR_INFO 3.000
score BODY_EMPTY 1.999
score BODY_SINGLE_URI 2.499
score BOGUS_MIME_VERSION 3.499
-score BOGUS_MSM_HDRS 1.420
-score CK_HELO_GENERIC 0.250
-score CONTENT_AFTER_HTML 2.352
+score BOGUS_MSM_HDRS 2.905
+score CK_HELO_GENERIC 0.249
+score CONTENT_AFTER_HTML 2.196
score CONTENT_AFTER_HTML_WEAK 1.499
score CTE_8BIT_MISMATCH 0.999
score DEAR_BENEFICIARY 0.001
-score DOS_RCVD_IP_TWICE_B 1.999
-score FACEBOOK_IMG_NOT_RCVD_FB 0.308
-score FAKE_REPLY_B 2.199
-score FILL_THIS_FORM 1.408
+score FACEBOOK_IMG_NOT_RCVD_FB 0.202
+score FAKE_REPLY_B 2.299
+score FILL_THIS_FORM 1.799
score FONT_INVIS_DIRECT 0.001
-score FONT_INVIS_HTML_NOHTML 3.000
-score FONT_INVIS_LONG_LINE 1.673
-score FONT_INVIS_MSGID 1.131
-score FONT_INVIS_NORDNS 0.776
-score FONT_INVIS_POSTEXTRAS 1.650
+score FONT_INVIS_HTML_NOHTML 2.999
+score FONT_INVIS_LONG_LINE 1.685
+score FONT_INVIS_MSGID 0.378
+score FONT_INVIS_NORDNS 1.048
+score FONT_INVIS_POSTEXTRAS 0.045
score FORM_FRAUD_5 0.001
score FOUND_YOU 3.249
-score FREEMAIL_FORGED_FROMDOMAIN 0.249
-score FROMSPACE 3.399
-score FROM_2_EMAILS_SHORT 1.593
+score FREEMAIL_FORGED_FROMDOMAIN 0.250
+score FROMSPACE 3.499
+score FROM_2_EMAILS_SHORT 1.401
score FROM_ADDR_WS 2.999
score FROM_MISSPACED 1.999
-score FROM_MISSP_DYNIP 0.188
+score FROM_MISSP_DYNIP 1.697
score FROM_MISSP_EH_MATCH 1.999
score FROM_MISSP_FREEMAIL 3.199
score FROM_MISSP_MSFT 0.001
score FROM_MISSP_PHISH 3.499
-score FROM_MISSP_TO_UNDISC 1.243
-score FROM_MISSP_USER 0.001
-score FROM_MULTI_NORDNS 1.229
+score FROM_MISSP_TO_UNDISC 0.845
+score FROM_MISSP_USER 0.001 # force non-zero
+score FROM_MULTI_NORDNS 1.301
score FROM_NTLD_REPLY_FREEMAIL 1.999
score FROM_SUSPICIOUS_NTLD 0.499
score FROM_SUSPICIOUS_NTLD_FP 1.999
-score FROM_UNBAL1 2.059
-score FROM_WSP_TRAIL 2.199
+score FROM_UNBAL1 2.399
+score FROM_WSP_TRAIL 2.399
score FSL_CTYPE_WIN1251 0.001
-score FSL_NEW_HELO_USER 0.001
-score FUZZY_AMAZON 2.199
-score FUZZY_CLICK_HERE 2.499
+score FSL_NEW_HELO_USER 0.001 # force non-zero
+score FUZZY_AMAZON 2.400
+score FUZZY_CLICK_HERE 2.699
score FUZZY_WALLET 3.199
score GB_FAKE_RF_SHORT 1.999
score GB_FREEMAIL_DISPTO 0.499
-score GB_FREEMAIL_DISPTO_NOTFREEM 0.500
+score GB_FREEMAIL_DISPTO_NOTFREEM 0.499
score GOOG_REDIR_HTML_ONLY 1.999
-score GOOG_REDIR_NORDNS 2.601
-score GOOG_STO_EMAIL_PHISH 2.552
-score GOOG_STO_HTML_PHISH 1.961
-score GOOG_STO_IMG_NOHTML 2.338
+score GOOG_REDIR_NORDNS 2.604
+score GOOG_STO_EMAIL_PHISH 2.520
+score GOOG_STO_HTML_PHISH 1.215
+score GOOG_STO_IMG_NOHTML 2.259
score GOOG_STO_NOIMG_HTML 2.999
score HAS_X_NO_RELAY 2.499
score HAS_X_OUTGOING_SPAM_STAT 1.999
score HDRS_LCASE_IMGONLY 0.099
score HDRS_MISSP 2.499
score HDR_ORDER_FTSDMCXX_DIRECT 1.999
-score HDR_ORDER_FTSDMCXX_NORDNS 2.971
+score HDR_ORDER_FTSDMCXX_NORDNS 1.876
score HEADER_FROM_DIFFERENT_DOMAINS 0.250
score HELO_NO_DOMAIN 0.001
-score HK_LOTTO 0.596
+score HK_LOTTO 0.929
score HK_NAME_FROM 0.999
score HK_NAME_MR_MRS 0.999
score HK_RANDOM_ENVFROM 0.999
-score HK_RANDOM_FROM 1.000
+score HK_RANDOM_FROM 0.999
score HK_RANDOM_REPLYTO 0.999
-score HK_SCAM 0.622
-score HK_WIN 0.099
-score HOSTED_IMG_DIRECT_MX 2.635
+score HK_SCAM 1.146
+score HK_WIN 0.001
+score HOSTED_IMG_DIRECT_MX 3.277
score HOSTED_IMG_FREEM 3.499
-score HOSTED_IMG_MULTI_PUB_01 2.999
-score HTML_ENTITY_ASCII 1.299
+score HOSTED_IMG_MULTI_PUB_01 3.000
+score HTML_ENTITY_ASCII 2.531
score HTML_FONT_TINY_NORDNS 1.999
score HTML_OFF_PAGE 2.999
-score HTML_TAG_BALANCE_CENTER 2.901
-score HTML_TEXT_INVISIBLE_STYLE 0.600
+score HTML_TAG_BALANCE_CENTER 3.799
+score HTML_TEXT_INVISIBLE_STYLE 0.602
score JH_SPAMMY_HEADERS 3.499
score LONGLN_LOW_CONTRAST 2.499
score LONG_HEX_URI 2.999
-score LONG_IMG_URI 1.690
-score LONG_INVISIBLE_TEXT 1.788
+score LONG_IMG_URI 1.679
+score LONG_INVISIBLE_TEXT 1.787
score LOTS_OF_MONEY 0.010
score LOTTO_AGENT 1.499
-score LOTTO_DEPT 0.001
+score LOTTO_DEPT 1.999
score MALWARE_NORDNS 0.001
-score MALW_ATTACH 2.400
-score MANY_SPAN_IN_TEXT 2.499
+score MALW_ATTACH 2.499
+score MANY_SPAN_IN_TEXT 2.599
score MILLION_HUNDRED 0.001
-score MILLION_USD 0.001
+score MILLION_USD 0.127
score MIMEOLE_DIRECT_TO_MX 1.999
score MIME_NO_TEXT 1.999
-score MIXED_AREA_CASE 1.572
-score MIXED_CENTER_CASE 2.500
+score MIXED_AREA_CASE 1.976
+score MIXED_CENTER_CASE 2.499
score MIXED_ES 2.599
-score MIXED_FONT_CASE 1.069
+score MIXED_FONT_CASE 0.173
score MIXED_HREF_CASE 1.999
-score MIXED_IMG_CASE 1.993
+score MIXED_IMG_CASE 1.806
score MONEY_12LTRDOM 0.099
-score MONEY_ATM_CARD 0.001 # force non-zero
-score MONEY_BARRISTER 0.999
+score MONEY_ATM_CARD 0.001
+score MONEY_BARRISTER 0.001
score MONEY_FORM 0.001
-score MONEY_FORM_SHORT 1.269
-score MONEY_FRAUD_3 0.001
-score MONEY_FRAUD_5 0.298
-score MONEY_FRAUD_8 0.656
-score MONEY_FREEMAIL_REPTO 2.349
+score MONEY_FORM_SHORT 0.859
+score MONEY_FRAUD_3 2.279
+score MONEY_FRAUD_5 1.439
+score MONEY_FRAUD_8 0.001
+score MONEY_FREEMAIL_REPTO 2.893
score MONEY_FROM_41 1.999
score MONEY_FROM_MISSP 0.001
-score MSMAIL_PRI_ABNORMAL 0.284
-score NAME_EMAIL_DIFF 3.399
-score NA_DOLLARS 0.896
-score NICE_REPLY_A -4.299
+score MSMAIL_PRI_ABNORMAL 0.525
+score NAME_EMAIL_DIFF 3.600
+score NA_DOLLARS 0.895
+score NICE_REPLY_A -0.542
+score NICE_REPLY_B -0.466
score NORDNS_LOW_CONTRAST 1.888
score NO_FM_NAME_IP_HOSTN 0.001
score NSL_RCVD_FROM_USER 0.001
-score NSL_RCVD_HELO_USER 0.152
-score OBFU_TEXT_ATTACH 1.400
-score ODD_FREEM_REPTO 2.999
+score NSL_RCVD_HELO_USER 1.349
+score OBFU_TEXT_ATTACH 1.599
+score ODD_FREEM_REPTO 3.000
score PDS_BTC_ID 0.499
score PDS_BTC_MSGID 0.999
score PDS_DBL_URL_TNB_RUNON 1.999
@@ -160,67 +160,68 @@ score PDS_HP_HELO_NORDNS 0.9
score PDS_OTHER_BAD_TLD 1.999
score PDS_PHPEXP_BOT 1.499
score PDS_PHP_EVAL 1.499
-score PDS_PRO_TLD 1.000
+score PDS_PRO_TLD 0.999
score PDS_TONAME_EQ_TOLOCAL_FREEM_FORGE 1.999
-score PHISH_ATTACH 2.299
+score PHISH_ATTACH 2.399
score PHP_ORIG_SCRIPT 2.499
score PHP_ORIG_SCRIPT_EVAL 2.999
score PHP_SCRIPT 2.499
score PP_MIME_FAKE_ASCII_TEXT 0.999
-score RAND_HEADER_LIST_SPOOF 2.999
+score RAND_HEADER_LIST_SPOOF 3.000
score RAND_MKTG_HEADER 1.999
-score RATWARE_NO_RDNS 0.845
-score RDNS_NUM_TLD_XM 1.554
+score RATWARE_NO_RDNS 1.243
+score RDNS_NUM_TLD_XM 2.676
score REPLYTO_EMPTY 2.152
score REPTO_419_FRAUD_GM 2.999
score SCC_CANSPAM_2 2.999
-score SCC_ISEMM_LID_1 1.994
-score SCC_SPAMMER_ADDR_2 1.814
-score SCRIPT_GIBBERISH 2.799
-score SENDGRID_REDIR 1.286
-score SERGIO_SUBJECT_VIAGRA01 3.897
-score SHOPIFY_IMG_NOT_RCVD_SFY 1.547
+score SCC_ISEMM_LID_1 2.351
+score SCC_SPAMMER_ADDR_2 2.594
+score SCRIPT_GIBBERISH 2.899
+score SENDGRID_REDIR 1.386
+score SERGIO_SUBJECT_VIAGRA01 3.440
+score SHOPIFY_IMG_NOT_RCVD_SFY 2.035
score SHORTENER_SHORT_IMG 0.001
score SHORT_SHORTNER 1.999
-score STATIC_XPRIO_OLE 0.155
-score SUBJ_ATTENTION 0.499
-score SUSP_UTF8_WORD_FROM 2.000
+score STATIC_XPRIO_OLE 0.002
+score SUBJ_ATTENTION 0.500
+score SUSP_UTF8_WORD_FROM 1.999
score SUSP_UTF8_WORD_SUBJ 1.999
-score THIS_AD 1.599
-score THIS_IS_ADV_SUSP_NTLD 0.062
-score TO_NAME_SUBJ_NO_RDNS 2.810
-score TO_NO_BRKTS_FROM_MSSP 2.499
+score THIS_AD 1.699
+score THIS_IS_ADV_SUSP_NTLD 1.142
+score TO_NAME_SUBJ_NO_RDNS 2.734
+score TO_NO_BRKTS_FROM_MSSP 2.500
score TO_NO_BRKTS_HTML_IMG 1.999
-score TO_NO_BRKTS_HTML_ONLY 2.000
+score TO_NO_BRKTS_HTML_ONLY 1.999
score TO_NO_BRKTS_NORDNS_HTML 1.999
-score TO_NO_BRKTS_PCNT 2.499
-score TRANSFORM_LIFE 2.499
+score TO_NO_BRKTS_PCNT 1.048
+score TRANSFORM_LIFE 2.500
score TVD_PH_7 2.699
score TVD_PH_BODY_META 2.999
-score TVD_RCVD_SPACE_BRACKET 1.568
+score TVD_RCVD_SPACE_BRACKET 1.456
score UNDISC_FREEM 3.699
-score UNDISC_MONEY 3.251
+score UNDISC_MONEY 3.700
score UNICODE_OBFU_ASC 2.499
score UNSUB_GOOG_FORM 2.499
+score URI_DOTEDU 1.261
score URI_FIREBASEAPP 2.999
-score URI_GOOGLE_PROXY 2.899
+score URI_GOOGLE_PROXY 2.799
score URI_GOOG_STO_SPAMMY 2.999
-score URI_IN_URI_10 3.600
-score URI_OBFU_DOM 2.299
+score URI_IN_URI_10 3.599
+score URI_OBFU_DOM 2.399
score URI_PHISH 3.999
score URI_PHP_REDIR 3.499
score URI_TRY_3LD 1.999
score URI_WPADMIN 2.699
score URI_WP_HACKED_2 2.499
-score US_DOLLARS_3 0.771
-score VFY_ACCT_NORDNS 2.673
-score WORD_INVIS 1.606
+score US_DOLLARS_3 0.079
+score VFY_ACCT_NORDNS 2.656
+score WORD_INVIS 2.371
score WORD_INVIS_MANY 2.999
-score XFER_LOTSA_MONEY 0.760
+score XFER_LOTSA_MONEY 0.890
score XM_LIGHT_HEAVY 2.499
score XM_RANDOM 2.499
-score XM_RECPTID 3.000
-score YOU_INHERIT 2.599
+score XM_RECPTID 2.999
+score YOU_INHERIT 2.699
score AC_POST_EXTRAS 1.000
score AC_SPAMMY_URI_PATTERNS1 1.000
score AC_SPAMMY_URI_PATTERNS10 1.000
@@ -236,7 +237,6 @@ score ADVANCE_FEE_2_NEW_FORM 1.0
score ALIBABA_IMG_NOT_RCVD_ALI 1.000
score APP_DEVELOPMENT_FREEM 1.000
score BEBEE_IMG_NOT_RCVD_BB 1.000
-score BILLION_OVERLAP 0.001 # force non-zero
score BITCOIN_BOMB 1.000
score BITCOIN_EXTORT_02 1.000
score BITCOIN_MALWARE 1.000
@@ -317,7 +317,6 @@ score NEWEGG_IMG_NOT_RCVD_NEGG 1.0
score NEW_PRODUCTS 1.000
score OBFU_BITCOIN 1.000
score PDS_BTC_NTLD 1.000
-score PDS_FROM_2_EMAILS 1.000
score PDS_PHP_RUNTIME_FUNC 1.000
score PHISH_AZURE_CLOUDAPP 3.500
score PHISH_FBASEAPP 1.000
@@ -371,7 +370,6 @@ score URI_ADOBESPARK 1.0
score URI_AZURE_CLOUDAPP 1.000
score URI_DASHGOVEDU 1.000
score URI_DATA 1.000
-score URI_DOTEDU 1.000
score URI_DOTEDU_ENTITY 1.000
score URI_HEX_IP 1.000
score URI_IMG_WP_REDIR 1.000
Modified: spamassassin/branches/trunk-welcomelist/rulesrc/scores/scores-set3
URL: http://svn.apache.org/viewvc/spamassassin/branches/trunk-welcomelist/rulesrc/scores/scores-set3?rev=1900213&r1=1900212&r2=1900213&view=diff
==============================================================================
--- spamassassin/branches/trunk-welcomelist/rulesrc/scores/scores-set3 (original)
+++ spamassassin/branches/trunk-welcomelist/rulesrc/scores/scores-set3 Sat Apr 23 12:05:02 2022
@@ -6,249 +6,248 @@ score AC_DIV_BONANZA 0.0
score AC_FROM_MANY_DOTS 2.996
score AC_HTML_NONSENSE_TAGS 1.997
score ADMITS_SPAM 3.595
-score ADVANCE_FEE_2_NEW_FRM_MNY 2.423
+score ADVANCE_FEE_2_NEW_FRM_MNY 2.461
score ADVANCE_FEE_2_NEW_MONEY 1.997
-score ADVANCE_FEE_3_NEW 3.104
-score ADVANCE_FEE_3_NEW_FRM_MNY 0.027
+score ADVANCE_FEE_3_NEW 3.128
+score ADVANCE_FEE_3_NEW_FRM_MNY 2.559
score ADVANCE_FEE_3_NEW_MONEY 2.896
score ADVANCE_FEE_4_NEW 2.397
score ADVANCE_FEE_4_NEW_FRM_MNY 0.001
-score ADVANCE_FEE_4_NEW_MONEY 0.440
-score ADVANCE_FEE_5_NEW 2.393
-score ADVANCE_FEE_5_NEW_FRM_MNY 0.001
-score ADVANCE_FEE_5_NEW_MONEY 3.020
-score AD_PREFS 0.426
+score ADVANCE_FEE_4_NEW_MONEY 0.576
+score ADVANCE_FEE_5_NEW 2.064
+score ADVANCE_FEE_5_NEW_FRM_MNY 0.001 # force non-zero
+score ADVANCE_FEE_5_NEW_MONEY 3.096
+score AD_PREFS 0.091
score AMAZON_IMG_NOT_RCVD_AMZN 2.497
-score APP_DEVELOPMENT_NORDNS 1.722
+score APP_DEVELOPMENT_NORDNS 0.225
score AXB_XMAILER_MIMEOLE_OL_024C2 0.001
-score AXB_XMAILER_MIMEOLE_OL_1ECD5 1.779
+score AXB_XMAILER_MIMEOLE_OL_1ECD5 0.781
score BIGNUM_EMAILS_FREEM 2.996
score BIGNUM_EMAILS_MANY 2.996
-score BILLION_OVERLAP -0.442
-score BITCOIN_DEADLINE 2.501
-score BITCOIN_EXTORT_01 4.788
-score BITCOIN_MALF_HTML 2.973
-score BITCOIN_MALWARE 1.195
-score BITCOIN_OBFU_SUBJ 0.639
+score BITCOIN_DEADLINE 2.380
+score BITCOIN_EXTORT_01 4.999
+score BITCOIN_MALF_HTML 2.470
+score BITCOIN_MALWARE 1.154
+score BITCOIN_OBFU_SUBJ 0.946
score BITCOIN_SPAM_02 2.497
score BITCOIN_SPAM_04 1.499
-score BITCOIN_SPAM_05 1.765
+score BITCOIN_SPAM_05 1.847
score BITCOIN_SPAM_09 1.498
score BITCOIN_XPRIO 2.497
-score BITCOIN_YOUR_INFO 2.747
-score BODY_EMPTY 0.392
-score BODY_SINGLE_URI 0.667
+score BITCOIN_YOUR_INFO 2.761
+score BODY_EMPTY 1.892
+score BODY_SINGLE_URI 0.676
score BODY_URI_ONLY 2.996
-score BOGUS_MIME_VERSION 3.270
-score BOGUS_MSM_HDRS 1.838
-score CANT_SEE_AD 1.192
-score CK_HELO_GENERIC 0.001
+score BOGUS_MIME_VERSION 3.265
+score BOGUS_MSM_HDRS 2.552
+score CANT_SEE_AD 0.744
+score CK_HELO_GENERIC 0.046
score CONTENT_AFTER_HTML 2.497
score CONTENT_AFTER_HTML_WEAK 1.498
score CTE_8BIT_MISMATCH 0.001 # force non-zero
score DEAR_BENEFICIARY 0.001
-score DKIMWL_BL 2.997
-score DKIMWL_WL_HIGH -0.572
-score DKIMWL_WL_MED -0.001 # force non-zero
-score DKIMWL_WL_MEDHI -0.860
-score DOS_RCVD_IP_TWICE_B 1.997
-score END_FUTURE_EMAILS 2.187
-score FAKE_REPLY_B 0.519
-score FILL_THIS_FORM 0.070
+score DKIMWL_BL 2.996
+score DKIMWL_WL_HIGH -0.575
+score DKIMWL_WL_MED -0.001
+score DKIMWL_WL_MEDHI -0.812
+score END_FUTURE_EMAILS 2.189
+score FAKE_REPLY_B 1.263
+score FILL_THIS_FORM 0.075
score FONT_INVIS_DIRECT 0.001
score FONT_INVIS_HTML_NOHTML 2.996
-score FONT_INVIS_LONG_LINE 1.089
-score FONT_INVIS_MSGID 1.332
-score FONT_INVIS_NORDNS 0.659
-score FORGED_SPF_HELO 0.125
-score FORM_FRAUD 0.993
-score FORM_FRAUD_3 1.378
+score FONT_INVIS_LONG_LINE 1.094
+score FONT_INVIS_MSGID 1.106
+score FONT_INVIS_NORDNS 1.957
+score FORGED_SPF_HELO 0.131
+score FORM_FRAUD 0.999
+score FORM_FRAUD_3 0.331
score FORM_FRAUD_5 0.001
score FOUND_YOU 3.246
score FREEMAIL_FORGED_FROMDOMAIN 0.248
score FROMSPACE 3.396
-score FROM_2_EMAILS_SHORT 0.269
+score FROM_2_EMAILS_SHORT 1.592
score FROM_ADDR_WS 2.996
score FROM_FMBLA_NEWDOM 1.498
score FROM_FMBLA_NEWDOM14 0.998
score FROM_FMBLA_NEWDOM28 0.798
-score FROM_GOV_DKIM_AU -0.307
-score FROM_MISSPACED 1.169
-score FROM_MISSP_DYNIP 1.545
+score FROM_GOV_DKIM_AU -0.329
+score FROM_MISSPACED 1.171
+score FROM_MISSP_DYNIP 2.399
score FROM_MISSP_EH_MATCH 0.001
score FROM_MISSP_FREEMAIL 0.001
score FROM_MISSP_MSFT 0.001
-score FROM_MISSP_PHISH 2.003
+score FROM_MISSP_PHISH 1.181
score FROM_MISSP_REPLYTO 2.497
score FROM_MISSP_SPF_FAIL 1.997
-score FROM_MISSP_TO_UNDISC 0.505
+score FROM_MISSP_TO_UNDISC 2.008
score FROM_MISSP_USER 0.001
-score FROM_MULTI_NORDNS 1.001
+score FROM_MULTI_NORDNS 1.002
score FROM_PAYPAL_SPOOF 1.597
-score FROM_SUSPICIOUS_NTLD 0.499
-score FROM_SUSPICIOUS_NTLD_FP 0.001
+score FROM_SUSPICIOUS_NTLD 0.498
+score FROM_SUSPICIOUS_NTLD_FP 0.001 # force non-zero
score FROM_UNBAL1 2.297
-score FROM_WSP_TRAIL 1.320
-score FSL_BULK_SIG 1.412
+score FROM_WSP_TRAIL 2.297
+score FSL_BULK_SIG 1.368
score FSL_CTYPE_WIN1251 0.001
score FSL_NEW_HELO_USER 0.001
-score FUZZY_AMAZON 2.132
+score FUZZY_AMAZON 2.210
score FUZZY_CLICK_HERE 2.297
-score FUZZY_WALLET 1.227
-score GB_BITCOIN_CP 1.046
+score FUZZY_WALLET 1.236
+score GB_BITCOIN_CP 1.910
score GB_FAKE_RF_SHORT 1.997
score GB_FREEMAIL_DISPTO 0.498
score GB_FREEMAIL_DISPTO_NOTFREEM 0.498
score GOOG_REDIR_HTML_ONLY 1.997
-score GOOG_REDIR_NORDNS 3.120
-score GOOG_STO_EMAIL_PHISH 2.335
-score GOOG_STO_HTML_PHISH 0.401
-score GOOG_STO_IMG_NOHTML 1.889
+score GOOG_REDIR_NORDNS 3.125
+score GOOG_STO_EMAIL_PHISH 2.106
+score GOOG_STO_HTML_PHISH 1.659
+score GOOG_STO_IMG_NOHTML 2.097
score GOOG_STO_NOIMG_HTML 2.996
-score HAS_X_NO_RELAY 2.324
-score HAS_X_OUTGOING_SPAM_STAT 0.409
+score HAS_X_NO_RELAY 2.271
+score HAS_X_OUTGOING_SPAM_STAT 0.415
score HDRS_LCASE_IMGONLY 0.098
-score HDRS_MISSP 2.325
-score HDR_ORDER_FTSDMCXX_DIRECT 0.294
-score HDR_ORDER_FTSDMCXX_NORDNS 3.434
+score HDRS_MISSP 2.319
+score HDR_ORDER_FTSDMCXX_DIRECT 0.549
+score HDR_ORDER_FTSDMCXX_NORDNS 3.361
score HEADER_FROM_DIFFERENT_DOMAINS 0.248
score HELO_NO_DOMAIN 0.001
-score HK_LOTTO 0.458
+score HK_LOTTO 0.527
score HK_NAME_FROM 0.998
score HK_NAME_MR_MRS 0.998
score HK_RANDOM_ENVFROM 0.998
score HK_RANDOM_FROM 0.998
score HK_RANDOM_REPLYTO 0.998
-score HK_SCAM 1.941
-score HK_WIN 0.176
-score HOSTED_IMG_DIRECT_MX 1.489
-score HOSTED_IMG_FREEM 2.425
-score HOSTED_IMG_MULTI_PUB_01 2.996
-score HTML_ENTITY_ASCII 1.741
-score HTML_FONT_TINY_NORDNS 1.598
-score HTML_OFF_PAGE 2.047
-score HTML_SINGLET_MANY 1.606
-score HTML_TAG_BALANCE_CENTER 2.403
-score HTML_TEXT_INVISIBLE_FONT 1.000
-score HTML_TEXT_INVISIBLE_STYLE 2.415
-score IMG_ONLY_FM_DOM_INFO 0.288
+score HK_SCAM 1.633
+score HK_WIN 0.001
+score HOSTED_IMG_DIRECT_MX 1.194
+score HOSTED_IMG_FREEM 2.424
+score HOSTED_IMG_MULTI_PUB_01 2.997
+score HTML_ENTITY_ASCII 1.701
+score HTML_FONT_TINY_NORDNS 1.631
+score HTML_OFF_PAGE 1.889
+score HTML_SINGLET_MANY 1.600
+score HTML_TAG_BALANCE_CENTER 2.394
+score HTML_TEXT_INVISIBLE_FONT 1.338
+score HTML_TEXT_INVISIBLE_STYLE 2.420
+score IMG_ONLY_FM_DOM_INFO 0.001
score JH_SPAMMY_HEADERS 3.496
-score KHOP_HELO_FCRDNS 0.024
+score KHOP_HELO_FCRDNS 0.069
score LONGLN_LOW_CONTRAST 2.497
score LONG_HEX_URI 0.001
-score LONG_IMG_URI 0.929
-score LONG_INVISIBLE_TEXT 1.853
+score LONG_IMG_URI 0.935
+score LONG_INVISIBLE_TEXT 1.849
score LOTS_OF_MONEY 0.010
-score LOTTO_AGENT 0.791
-score LOTTO_DEPT 0.533
+score LOTTO_AGENT 0.389
+score LOTTO_DEPT 0.001
score MALWARE_NORDNS 0.001
score MALW_ATTACH 2.397
-score MANY_SPAN_IN_TEXT 1.130
-score MILLION_HUNDRED 0.768
+score MANY_SPAN_IN_TEXT 1.127
+score MILLION_HUNDRED 0.896
score MILLION_USD 0.001
score MIMEOLE_DIRECT_TO_MX 1.997
-score MIXED_AREA_CASE 1.286
-score MIXED_CENTER_CASE 1.116
-score MIXED_ES 1.087
-score MIXED_FONT_CASE 1.655
-score MIXED_HREF_CASE 1.999
-score MIXED_IMG_CASE 2.710
+score MIXED_AREA_CASE 0.522
+score MIXED_CENTER_CASE 0.877
+score MIXED_ES 1.082
+score MIXED_FONT_CASE 2.297
+score MIXED_HREF_CASE 1.463
+score MIXED_IMG_CASE 1.325
score MONEY_ATM_CARD 0.001
-score MONEY_FORM 0.001
+score MONEY_FORM 0.001 # force non-zero
score MONEY_FORM_SHORT 0.001
-score MONEY_FRAUD_3 2.111
-score MONEY_FRAUD_5 0.492
-score MONEY_FRAUD_8 0.001
+score MONEY_FRAUD_3 2.254
+score MONEY_FRAUD_5 0.364
+score MONEY_FRAUD_8 0.001 # force non-zero
score MONEY_FREEMAIL_REPTO 0.001
-score MONEY_FROM_41 1.327
+score MONEY_FROM_41 1.958
score MONEY_FROM_MISSP 0.001
-score NAME_EMAIL_DIFF 3.397
+score NAME_EMAIL_DIFF 3.395
score NA_DOLLARS 1.498
-score NICE_REPLY_A -1.165
-score NORDNS_LOW_CONTRAST 0.767
+score NICE_REPLY_A -1.857
+score NICE_REPLY_B -0.001
+score NORDNS_LOW_CONTRAST 0.742
score NO_FM_NAME_IP_HOSTN 0.001
-score NSL_RCVD_FROM_USER 0.001
-score NSL_RCVD_HELO_USER 1.733
+score NSL_RCVD_FROM_USER 0.001 # force non-zero
+score NSL_RCVD_HELO_USER 1.382
score OBFU_TEXT_ATTACH 1.697
-score ODD_FREEM_REPTO 2.899
+score ODD_FREEM_REPTO 2.996
score PDS_BTC_ID 0.498
-score PDS_BTC_MSGID 0.407
-score PDS_BTC_NTLD 0.653
+score PDS_BTC_MSGID 0.790
+score PDS_BTC_NTLD 1.331
score PDS_DBL_URL_TNB_RUNON 1.997
score PDS_HP_HELO_NORDNS 0.998
-score PDS_OTHER_BAD_TLD 1.997
+score PDS_OTHER_BAD_TLD 1.998
score PDS_PHPEXP_BOT 1.498
score PDS_PHP_EVAL 1.498
score PDS_PRO_TLD 0.998
score PDS_TONAME_EQ_TOLOCAL_FREEM_FORGE 1.997
score PHISH_ATTACH 2.297
-score PHP_ORIG_SCRIPT 2.038
+score PHP_ORIG_SCRIPT 2.042
score PHP_ORIG_SCRIPT_EVAL 2.996
score PHP_SCRIPT 2.497
score PP_MIME_FAKE_ASCII_TEXT 0.001
-score RAND_HEADER_LIST_SPOOF 2.755
-score RAND_MKTG_HEADER 1.499
+score RAND_HEADER_LIST_SPOOF 2.893
+score RAND_MKTG_HEADER 1.501
score RATWARE_NO_RDNS 2.996
-score RCVD_IN_MSPIKE_H2 -0.001
-score RDNS_NUM_TLD_XM 1.500
+score RCVD_IN_MSPIKE_H2 -0.001 # force non-zero
+score RDNS_NUM_TLD_XM 0.539
score REPLYTO_EMPTY 2.696
score REPTO_419_FRAUD_GM 2.996
-score SCC_CANSPAM_2 1.702
-score SCC_ISEMM_LID_1 1.721
-score SCC_SPAMMER_ADDR_2 1.690
+score SCC_CANSPAM_2 2.358
+score SCC_ISEMM_LID_1 1.344
+score SCC_SPAMMER_ADDR_2 1.244
score SCRIPT_GIBBERISH 2.696
score SENDGRID_REDIR 0.001
-score SERGIO_SUBJECT_VIAGRA01 2.719
+score SERGIO_SUBJECT_VIAGRA01 3.586
score SHOPIFY_IMG_NOT_RCVD_SFY 2.497
-score SHORTENER_SHORT_IMG 1.433
+score SHORTENER_SHORT_IMG 1.437
score SHORT_SHORTNER 1.997
score SPOOFED_FREEMAIL 1.997
score SPOOFED_FREEMAIL_NO_RDNS 0.001
score SPOOFED_FREEM_REPTO 2.497
-score SPOOF_GMAIL_MID 0.565
+score SPOOF_GMAIL_MID 0.600
score STATIC_XPRIO_OLE 0.001
score SUBJ_ATTENTION 0.498
-score SUSP_UTF8_WORD_FROM 1.650
+score SUSP_UTF8_WORD_FROM 0.448
score SUSP_UTF8_WORD_SUBJ 1.997
score THIS_AD 1.264
-score TO_EQ_FM_DOM_SPF_FAIL 0.001
+score TO_EQ_FM_DOM_SPF_FAIL 0.001 # force non-zero
score TO_EQ_FM_SPF_FAIL 0.001
-score TO_NAME_SUBJ_NO_RDNS 1.321
+score TO_NAME_SUBJ_NO_RDNS 2.121
score TO_NO_BRKTS_FROM_MSSP 2.497
score TO_NO_BRKTS_HTML_IMG 0.777
-score TO_NO_BRKTS_HTML_ONLY 1.998
+score TO_NO_BRKTS_HTML_ONLY 1.997
score TO_NO_BRKTS_MSFT 0.001
-score TO_NO_BRKTS_NORDNS_HTML 1.198
+score TO_NO_BRKTS_NORDNS_HTML 1.202
score TO_NO_BRKTS_PCNT 2.497
score TRANSFORM_LIFE 2.497
-score TVD_PH_BODY_META 2.054
-score TVD_SPACE_ENCODED 0.001
-score TVD_SPACE_RATIO_MINFP 0.272
+score TVD_PH_BODY_META 2.364
+score TVD_SPACE_ENCODED 0.001 # force non-zero
+score TVD_SPACE_RATIO_MINFP 0.285
score UNDISC_FREEM 3.595
-score UNDISC_MONEY 2.234
-score UNICODE_OBFU_ASC 2.497
+score UNDISC_MONEY 2.236
+score UNICODE_OBFU_ASC 2.498
score UNSUB_GOOG_FORM 2.497
score URI_FIREBASEAPP 2.996
-score URI_GOOGLE_PROXY 2.796
-score URI_GOOG_STO_SPAMMY 2.682
+score URI_GOOGLE_PROXY 2.797
+score URI_GOOG_STO_SPAMMY 0.600
score URI_IN_URI_10 2.874
score URI_OBFU_DOM 2.297
-score URI_ONLY_MSGID_MALF 1.190
-score URI_PHISH 3.782
-score URI_PHP_REDIR 3.144
-score URI_TRY_3LD 1.997
+score URI_ONLY_MSGID_MALF 0.314
+score URI_PHISH 3.788
+score URI_PHP_REDIR 3.100
+score URI_TRY_3LD 1.998
score URI_WPADMIN 2.696
score URI_WP_HACKED 3.496
-score URI_WP_HACKED_2 1.032
-score VFY_ACCT_NORDNS 2.813
-score WORD_INVIS 0.601
-score WORD_INVIS_MANY 2.123
-score XFER_LOTSA_MONEY 0.193
+score URI_WP_HACKED_2 0.995
+score VFY_ACCT_NORDNS 2.999
+score WORD_INVIS 0.788
+score WORD_INVIS_MANY 2.417
+score XFER_LOTSA_MONEY 0.001
score XM_LIGHT_HEAVY 2.497
score XM_RANDOM 2.497
-score XM_RECPTID 2.996
-score XPRIO 2.113
-score YOU_INHERIT 1.454
+score XM_RECPTID 2.997
+score XPRIO 1.324
+score YOU_INHERIT 1.407
score AC_POST_EXTRAS 1.000
score AC_SPAMMY_URI_PATTERNS1 1.000
score AC_SPAMMY_URI_PATTERNS10 1.000
Modified: spamassassin/branches/trunk-welcomelist/rulesrc/scores/stats-set0
URL: http://svn.apache.org/viewvc/spamassassin/branches/trunk-welcomelist/rulesrc/scores/stats-set0?rev=1900213&r1=1900212&r2=1900213&view=diff
==============================================================================
--- spamassassin/branches/trunk-welcomelist/rulesrc/scores/stats-set0 (original)
+++ spamassassin/branches/trunk-welcomelist/rulesrc/scores/stats-set0 Sat Apr 23 12:05:02 2022
@@ -1,40 +1,40 @@
##### WITH NEW RULES AND SCORES #####
# SUMMARY for threshold 5.0:
-# Correctly non-spam: 181884 49.294% (99.679% of non-spam corpus)
-# Correctly spam: 110539 29.958% (59.268% of spam corpus)
-# False positives: 585 0.159% (0.321% of nonspam, 17937 weighted)
-# False negatives: 75969 20.589% (40.732% of spam, 118444 weighted)
-# Average score for spam: 8.4 nonspam: 0.3
-# Average for false-pos: 6.0 false-neg: 1.6
-# TOTAL: 368977 100.00%
+# Correctly non-spam: 201636 51.715% (99.689% of non-spam corpus)
+# Correctly spam: 110119 28.243% (58.689% of spam corpus)
+# False positives: 630 0.162% (0.311% of nonspam, 17670 weighted)
+# False negatives: 77513 19.880% (41.311% of spam, 119841 weighted)
+# Average score for spam: 8.3 nonspam: 0.5
+# Average for false-pos: 6.0 false-neg: 1.5
+# TOTAL: 389898 100.00%
Reading scores from "tmprules"...
Reading per-message hit stat logs and scores...
# SUMMARY for threshold 5.0:
-# Correctly non-spam: 22843 99.67%
-# Correctly spam: 13900 59.38%
-# False positives: 76 0.33%
-# False negatives: 9510 40.62%
-# TCR(l=50): 1.758828 SpamRecall: 59.376% SpamPrec: 99.456%
+# Correctly non-spam: 25219 99.72%
+# Correctly spam: 13895 59.03%
+# False positives: 70 0.28%
+# False negatives: 9644 40.97%
+# TCR(l=50): 1.790855 SpamRecall: 59.030% SpamPrec: 99.499%
##### WITHOUT NEW RULES AND SCORES #####
Reading scores from "../rules-base"...
Reading per-message hit stat logs and scores...
# SUMMARY for threshold 5.0:
-# Correctly non-spam: 177947 97.52%
-# Correctly spam: 87092 46.70%
-# False positives: 4522 2.48%
-# False negatives: 99416 53.30%
-# TCR(l=50): 0.572961 SpamRecall: 46.696% SpamPrec: 95.064%
+# Correctly non-spam: 197386 97.59%
+# Correctly spam: 87874 46.83%
+# False positives: 4880 2.41%
+# False negatives: 99758 53.17%
+# TCR(l=50): 0.545826 SpamRecall: 46.833% SpamPrec: 94.739%
Reading scores from "../rules-base"...
Reading per-message hit stat logs and scores...
# SUMMARY for threshold 5.0:
-# Correctly non-spam: 22330 97.43%
-# Correctly spam: 10937 46.72%
-# False positives: 589 2.57%
-# False negatives: 12473 53.28%
-# TCR(l=50): 0.558405 SpamRecall: 46.719% SpamPrec: 94.890%
+# Correctly non-spam: 24692 97.64%
+# Correctly spam: 11076 47.05%
+# False positives: 597 2.36%
+# False negatives: 12463 52.95%
+# TCR(l=50): 0.556307 SpamRecall: 47.054% SpamPrec: 94.886%
Modified: spamassassin/branches/trunk-welcomelist/rulesrc/scores/stats-set1
URL: http://svn.apache.org/viewvc/spamassassin/branches/trunk-welcomelist/rulesrc/scores/stats-set1?rev=1900213&r1=1900212&r2=1900213&view=diff
==============================================================================
--- spamassassin/branches/trunk-welcomelist/rulesrc/scores/stats-set1 (original)
+++ spamassassin/branches/trunk-welcomelist/rulesrc/scores/stats-set1 Sat Apr 23 12:05:02 2022
@@ -1,12 +1,12 @@
##### WITH NEW RULES AND SCORES #####
# SUMMARY for threshold 5.0:
-# Correctly non-spam: 162988 48.772% (99.669% of non-spam corpus)
-# Correctly spam: 149681 44.790% (87.712% of spam corpus)
-# False positives: 542 0.162% (0.331% of nonspam, 34724 weighted)
-# False negatives: 20970 6.275% (12.288% of spam, 54129 weighted)
-# Average score for spam: 13.7 nonspam: -0.9
-# Average for false-pos: 6.1 false-neg: 2.6
+# Correctly non-spam: 162989 48.773% (99.669% of non-spam corpus)
+# Correctly spam: 149605 44.768% (87.667% of spam corpus)
+# False positives: 541 0.162% (0.331% of nonspam, 34858 weighted)
+# False negatives: 21046 6.298% (12.333% of spam, 53342 weighted)
+# Average score for spam: 13.8 nonspam: -1.0
+# Average for false-pos: 6.2 false-neg: 2.5
# TOTAL: 334181 100.00%
Reading scores from "tmprules"...
@@ -14,10 +14,10 @@ Reading per-message hit stat logs and sc
# SUMMARY for threshold 5.0:
# Correctly non-spam: 20542 99.66%
-# Correctly spam: 18931 88.09%
+# Correctly spam: 18927 88.07%
# False positives: 70 0.34%
-# False negatives: 2559 11.91%
-# TCR(l=50): 3.546790 SpamRecall: 88.092% SpamPrec: 99.632%
+# False negatives: 2563 11.93%
+# TCR(l=50): 3.544450 SpamRecall: 88.074% SpamPrec: 99.632%
##### WITHOUT NEW RULES AND SCORES #####
Reading scores from "../rules-base"...
Modified: spamassassin/branches/trunk-welcomelist/sa-update.raw
URL: http://svn.apache.org/viewvc/spamassassin/branches/trunk-welcomelist/sa-update.raw?rev=1900213&r1=1900212&r2=1900213&view=diff
==============================================================================
--- spamassassin/branches/trunk-welcomelist/sa-update.raw (original)
+++ spamassassin/branches/trunk-welcomelist/sa-update.raw Sat Apr 23 12:05:02 2022
@@ -86,7 +86,6 @@ BEGIN { # see c
# These are the non-standard required modules
use Net::DNS;
-use HTTP::Date qw(time2str);
use Archive::Tar 1.23;
use IO::Zlib 1.04;
use Mail::SpamAssassin::Logger qw(:DEFAULT info log_message);
@@ -1534,7 +1533,11 @@ sub http_get_lwp {
$request->url($url);
if (defined $ims) {
- my $str = time2str($ims);
+ my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday) = gmtime($ims);
+ my $str = sprintf("%s, %02d %s %04d %02d:%02d:%02d GMT",
+ qw(Sun Mon Tue Wed Thu Fri Sat)[$wday], $mday,
+ qw(Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec)[$mon],
+ $year + 1900, $hour, $min, $sec);
$request->header('If-Modified-Since', $str);
dbg("http: IMS GET request, $url, $str");
}
Modified: spamassassin/branches/trunk-welcomelist/t/header_utf8.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/trunk-welcomelist/t/header_utf8.t?rev=1900213&r1=1900212&r2=1900213&view=diff
==============================================================================
--- spamassassin/branches/trunk-welcomelist/t/header_utf8.t [UTF-8] (original)
+++ spamassassin/branches/trunk-welcomelist/t/header_utf8.t [UTF-8] Sat Apr 23 12:05:02 2022
@@ -8,21 +8,21 @@ use lib '.'; use lib 't';
use SATest; sa_t_init("header_utf8.t");
use constant HAS_EMAIL_ADDRESS_XS => eval { require Email::Address::XS; };
+use constant HAS_LIBIDN => eval { require Net::LibIDN; };
+use constant HAS_LIBIDN2 => eval { require Net::LibIDN2; };
-my $have_libidn;
-BEGIN {
- eval { require Net::LibIDN } and do { $have_libidn = 1 };
+if (!HAS_EMAIL_ADDRESS_XS) {
+ warn "Email::Address::XS is not installed, tests will be lacking\n";
}
-
-if (!$have_libidn) {
- warn "Net::LibIDN is not installed, tests will be lacking\n";
+if (!HAS_LIBIDN && !HAS_LIBIDN2) {
+ warn "Net::LibIDN or Net::LibIDN2 is not installed, tests will be lacking\n";
}
use Test::More;
plan skip_all => "Test requires Perl 5.8" unless $] > 5.008; # TODO: SA already doesn't support anything below 5.8.1
my $tests = 156;
-$tests = 305 if (HAS_EMAIL_ADDRESS_XS);
+$tests = 305 if (HAS_EMAIL_ADDRESS_XS || (!HAS_EMAIL_ADDRESS_XS && HAS_LIBIDN && HAS_LIBIDN2));
plan tests => $tests;
# ---------------------------------------------------------------------------
@@ -125,7 +125,7 @@ my $myrules = <<'END';
lang zh describe LT_ANY_CHARS 字符被包含在消息报头部分
END
-if (!$have_libidn) {
+if (!HAS_LIBIDN && !HAS_LIBIDN2) {
# temporary fudge to prevent a test failing
# until the Net::LibIDN becomes a mandatory module
$myrules =~ s{^(\s*header LT_AUTH_DOM\s+X-AuthorDomain =~)\s*(/.*/)$}
@@ -134,19 +134,35 @@ if (!$have_libidn) {
-###
-### Test internal and Email::Address::XS parsers
-###
-
-for (1 .. 2) { ## parser loop
-
-if ($_ == 2 && !HAS_EMAIL_ADDRESS_XS) {
- warn "Not running Email::Address::XS tests, module missing\n";
- next;
+## Test 1 with internal parser, any libidn
+$ENV{'SA_HEADER_ADDRESS_PARSER'} = 1;
+if (HAS_LIBIDN) {
+ $ENV{'SA_LIBIDN'} = 1;
+ $libidn_done++;
+} elsif (HAS_LIBIDN2) {
+ $ENV{'SA_LIBIDN'} = 2;
+ $libidn2_done++;
+}
+run_tests();
+## Test 2 with Email::Address::XS
+if (HAS_EMAIL_ADDRESS_XS) {
+ $ENV{'SA_HEADER_ADDRESS_PARSER'} = 2;
+ if (HAS_LIBIDN2 && !defined $libidn2_done) {
+ $ENV{'SA_LIBIDN'} = 2;
+ $libidn2_done++;
+ }
+ run_tests();
+} else {
+ ## .. or Test 2 with internal parser, libidn2
+ if (HAS_LIBIDN2 && !defined $libidn2_done) {
+ $ENV{'SA_LIBIDN'} = 2;
+ run_tests();
+ }
}
-$ENV{'SA_HEADER_ADDRESS_PARSER'} = $_;
+sub run_tests {
+
$ENV{PERL_BADLANG} = 0; # suppresses Perl warning about failed locale setting
# see Mail::SpamAssassin::Conf::Parser::parse(), also Bug 6992
$ENV{LANGUAGE} = $ENV{LANG} = 'fr_CH.UTF-8';
@@ -232,5 +248,5 @@ sarun ("-L < data/nice/unicode2", \&patt
ok_all_patterns();
-} ## end parser loop
+} ## run_tests
Modified: spamassassin/branches/trunk-welcomelist/t/idn_dots.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/trunk-welcomelist/t/idn_dots.t?rev=1900213&r1=1900212&r2=1900213&view=diff
==============================================================================
--- spamassassin/branches/trunk-welcomelist/t/idn_dots.t (original)
+++ spamassassin/branches/trunk-welcomelist/t/idn_dots.t Sat Apr 23 12:05:02 2022
@@ -9,44 +9,63 @@ use Test::More;
use Mail::SpamAssassin;
use vars qw(%patterns %anti_patterns);
-use constant HAS_LIBIDN => eval { require Net::LibIDN };
-plan skip_all => "module Net::LibIDN not available, internationalized domain names with U-labels will not be recognized!" unless HAS_LIBIDN;
-plan tests => 6;
-
-# initialize SpamAssassin
-my $sa = create_saobj({dont_copy_prefs => 1});
-$sa->init(0); # parse rules
+use constant HAS_LIBIDN => eval { require Net::LibIDN; };
+use constant HAS_LIBIDN2 => eval { require Net::LibIDN2; };
+
+plan skip_all => "module Net::LibIDN or Net::LibIDN2 not available, internationalized domain names with U-labels will not be recognized!"
+ unless HAS_LIBIDN||HAS_LIBIDN2;
+plan tests => 6 * ((HAS_LIBIDN||0) + (HAS_LIBIDN2||0));
# load tests and write mail
%patterns = ();
%anti_patterns = ();
my $message = write_mail();
+my $uris;
-my $mail = $sa->parse($message);
-my $msg = Mail::SpamAssassin::PerMsgStatus->new($sa, $mail);
+if (HAS_LIBIDN) {
+ $ENV{'SA_LIBIDN'} = 1;
+ check_sa();
+}
+if (HAS_LIBIDN2) {
+ $ENV{'SA_LIBIDN'} = 2;
+ check_sa();
+}
-my $uris = join("\n", $msg->get_uri_list(), "");
+sub check_sa {
+ # initialize SpamAssassin
+ my $sa = create_saobj({dont_copy_prefs => 1});
+ $sa->init(0); # parse rules
+ my $mail = $sa->parse($message);
+ my $msg = Mail::SpamAssassin::PerMsgStatus->new($sa, $mail);
+ $uris = join("\n", $msg->get_uri_list(), "");
+ $msg->finish();
+ $mail->finish();
+ $sa->finish();
+ check_patterns();
+}
-# run patterns and anti-patterns
-my $failures = 0;
-for my $pattern (keys %patterns) {
- if (!ok($uris =~ /${pattern}/m)) {
- warn "failure: did not find /$pattern/\n";
- $failures++;
- #} else {
- # warn "OK: did find /$pattern/\n";
+sub check_patterns {
+ # run patterns and anti-patterns
+ my $failures = 0;
+ for my $pattern (keys %patterns) {
+ if (!ok($uris =~ /${pattern}/m)) {
+ warn "failure: did not find /$pattern/\n";
+ $failures++;
+ #} else {
+ # warn "OK: did find /$pattern/\n";
+ }
}
-}
-for my $anti_pattern (keys %anti_patterns) {
- if (!ok($uris !~ /${anti_pattern}/m)) {
- warn "failure: did find /$anti_pattern/\n";
- $failures++;
+ for my $anti_pattern (keys %anti_patterns) {
+ if (!ok($uris !~ /${anti_pattern}/m)) {
+ warn "failure: did find /$anti_pattern/\n";
+ $failures++;
+ }
}
-}
-if ($failures) {
- print "URIs in email from get_uri_list:\n$uris";
+ if ($failures) {
+ print "URIs in email from get_uri_list:\n$uris";
+ }
}
# function to write test email
Modified: spamassassin/branches/trunk-welcomelist/t/uri.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/trunk-welcomelist/t/uri.t?rev=1900213&r1=1900212&r2=1900213&view=diff
==============================================================================
--- spamassassin/branches/trunk-welcomelist/t/uri.t (original)
+++ spamassassin/branches/trunk-welcomelist/t/uri.t Sat Apr 23 12:05:02 2022
@@ -1,17 +1,16 @@
#!/usr/bin/perl -w -T
-my $have_libidn;
-BEGIN {
- eval { require Net::LibIDN } and do { $have_libidn = 1 };
-}
-
use strict;
use Test::More;
use lib '.'; use lib 't';
use SATest; sa_t_init("uri");
-my $tests = 103;
-$tests += 5 if $have_libidn;
+use constant HAS_LIBIDN => eval { require Net::LibIDN; };
+use constant HAS_LIBIDN2 => eval { require Net::LibIDN2; };
+
+my $tests = 104;
+$tests += 6 if (HAS_LIBIDN);
+$tests += 6 if (HAS_LIBIDN2);
plan tests => $tests;
@@ -108,14 +107,32 @@ ok(try_domains('http://foo..bar@example.
ok(try_domains('bar..example.com', undef));
ok(try_domains('http://example..com', undef));
-if ($have_libidn) {
- ok(try_domains('Cinéma.ca', 'xn--cinma-dsa.ca'));
- ok(try_domains('marcaespaña.es', 'xn--marcaespaa-19a.es'));
- ok(try_domains('äkäslompolo.fi', 'xn--kslompolo-u2ab.fi'));
- ok(try_domains('foo.xn--fiqs8s', 'foo.xn--fiqs8s'));
+sub try_libidn {
+ ok(try_domains("Cin\x{E9}ma.ca", 'xn--cinma-dsa.ca'));
+ ok(try_domains("marcaespa\x{F1}a.es", 'xn--marcaespaa-19a.es'));
+ ok(try_domains("\xe4k\xe4slompolo.fi", 'xn--kslompolo-u2ab.fi'));
+ ok(try_domains("\x{C3}\x{A4}k\x{C3}\x{A4}slompolo.fi", 'xn--kslompolo-u2ab.fi'));
+ ok(try_domains("foo.xn--fiqs8s", 'foo.xn--fiqs8s'));
ok(try_domains("foo\x2e\xe9\xa6\x99\xe6\xb8\xaf", 'foo.xn--j6w193g'));
}
+if (HAS_LIBIDN) {
+ $Mail::SpamAssassin::Util::have_libidn = 1;
+ $Mail::SpamAssassin::Util::have_libidn2 = 0;
+ try_libidn();
+}
+if (HAS_LIBIDN2) {
+ $Mail::SpamAssassin::Util::have_libidn = 0;
+ $Mail::SpamAssassin::Util::have_libidn2 = 1;
+ try_libidn();
+}
+
+# Without LibIDN, should not produce results,
+# as is_fqdn_valid() will fail
+$Mail::SpamAssassin::Util::have_libidn = 0;
+$Mail::SpamAssassin::Util::have_libidn2 = 0;
+ok(try_domains("Cin\x{E9}ma.ca", undef));
+
##############################################
sub array_cmp {