diff options
| author | Andrew Lewis <nerf@judo.za.org> | 2021-06-23 11:26:40 +0200 |
|---|---|---|
| committer | Andrew Lewis <nerf@judo.za.org> | 2021-06-23 11:26:40 +0200 |
| commit | 8d22202dc96475a497dfb68279e61d349314c340 (patch) | |
| tree | 996dce5624ee491f56043a1c390d36d316d09295 | |
| parent | e498305676c6975a12afdb4216697248f5eb3456 (diff) | |
| download | rspamd-8d22202dc96475a497dfb68279e61d349314c340.tar.gz rspamd-8d22202dc96475a497dfb68279e61d349314c340.zip | |
[Fix] Fix an edge case in BITCOIN_ADDR rule
- when using PCRE
- and different address types are present
| -rw-r--r-- | rules/bitcoin.lua | 5 | ||||
| -rw-r--r-- | test/functional/cases/001_merged/280_rules.robot | 6 | ||||
| -rw-r--r-- | test/functional/messages/btc4.eml | 26 |
3 files changed, 35 insertions, 2 deletions
diff --git a/rules/bitcoin.lua b/rules/bitcoin.lua index 56969536c..3cf97fcbe 100644 --- a/rules/bitcoin.lua +++ b/rules/bitcoin.lua @@ -180,7 +180,8 @@ local btc_bleach_re = [[/\b(?:(?:[a-zA-Z]\w+:)|(?:bc1))?[qpzry9x8gf2tvdw0s3jn54k config.regexp['BITCOIN_ADDR'] = { description = 'Message has a valid bitcoin wallet address', - re = string.format('(%s) || (%s)', normal_wallet_re, btc_bleach_re), + -- Use + operator to ensure that each expression is always evaluated + re = string.format('(%s) + (%s) > 0', normal_wallet_re, btc_bleach_re), re_conditions = { [normal_wallet_re] = function(task, txt, s, e) if e - s <= 2 then @@ -228,4 +229,4 @@ config.regexp['BITCOIN_ADDR'] = { score = 0.0, one_shot = true, group = 'scams', -}
\ No newline at end of file +} diff --git a/test/functional/cases/001_merged/280_rules.robot b/test/functional/cases/001_merged/280_rules.robot index 52ea1c86d..2ae2f7422 100644 --- a/test/functional/cases/001_merged/280_rules.robot +++ b/test/functional/cases/001_merged/280_rules.robot @@ -66,6 +66,12 @@ BITCOIN ADDR 3 ... Settings={symbols_enabled = [BITCOIN_ADDR]} Expect Symbol BITCOIN_ADDR +BITCOIN ADDR 4 + Scan File ${RSPAMD_TESTDIR}/messages/btc4.eml + ... Settings={symbols_enabled = [BITCOIN_ADDR]} + Expect Symbol With Exact Options BITCOIN_ADDR 1BvBMSEYstWetqTFn5Au4m4GFg7xJaNVN2 + ... bc1qar0srrr7xfkvy5l643lydnw9re59gtzzwf5mdq bitcoincash:qztslqhavnjcgth9zwu6dw0jjcfy4zahfy7vf0smwp + RCVD_COUNT_ONE Scan File ${RSPAMD_TESTDIR}/messages/btc.eml ... Settings={symbols_enabled = [RCVD_COUNT_ONE]} diff --git a/test/functional/messages/btc4.eml b/test/functional/messages/btc4.eml new file mode 100644 index 000000000..523ce592f --- /dev/null +++ b/test/functional/messages/btc4.eml @@ -0,0 +1,26 @@ +Received: by mail-lf1-f54.gulugulu.com with SMTP id j14so14439709lfg.9 + for <test@test.ru>; Mon, 27 Apr 2020 09:54:21 -0700 (PDT) +From: test@test.com +Date: Mon, 27 Apr 2020 19:54:10 +0300 +Message-ID: <CA+1S=h4aGimA6vSBJF=t1F+5z-Mua5+Cimf+NU_NDWJk8ZNOcw@mail.gmail.com> +Subject: Fwd: +To: <test@test.ru> +Content-Type: multipart/alternative; boundary="00000000000004de7805a4489190" + +--0000000000004bee6805a4484c02 +Content-Type: text/plain; charset="UTF-8" +Content-Transfer-Encoding: 8bit + +bc1qar0srrr7xfkvy5l643lydnw9re59gtzzwf5mdq +bitcoincash:qztslqhavnjcgth9zwu6dw0jjcfy4zahfy7vf0smwp +1BvBMSEYstWetqTFn5Au4m4GFg7xJaNVN2 + +--0000000000004bee6805a4484c02 +Content-Type: text/html; charset="UTF-8" +Content-Transfer-Encoding: 8bit + +bc1qar0srrr7xfkvy5l643lydnw9re59gtzzwf5mdq +bitcoincash:qztslqhavnjcgth9zwu6dw0jjcfy4zahfy7vf0smwp +1BvBMSEYstWetqTFn5Au4m4GFg7xJaNVN2 + +--0000000000004bee6805a4484c02-- |