From d31e199ee38f6ec44d4badd9f559701983939078 Mon Sep 17 00:00:00 2001 From: Giovanni Bechis Date: Thu, 1 Feb 2024 09:56:00 +0100 Subject: [PATCH] Exacttarget improvements --- Esp-rbl.cf | 4 +++- Esp.pm | 7 +++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Esp-rbl.cf b/Esp-rbl.cf index 2722643..5b55b1a 100644 --- a/Esp-rbl.cf +++ b/Esp-rbl.cf @@ -320,7 +320,9 @@ if (version >= 4.000000) header __ESP_EXACTT_RBL eval:check_hashbl_tag('exacttarget.espbl.snb.it/A', 'raw', 'EXACTTARGET_ID', '^127\.') header __ESP_EXACTT_UID x-messageKey =~ /undelivered\+(?\d+)\+(?:\d+)\@pd25\.com/ header __ESP_EXACTT_URBL eval:check_hashbl_tag('exacttarget.espbl.snb.it/A', 'raw', 'EXACTTARGET_UID', '^127\.') - meta RBL_ESP_EXACTTARGET ( __ESP_EXACTT_CSA && __ESP_EXACTT_SFMC && ( __ESP_EXACTT_RBL || __ESP_EXACTT_URBL ) ) + header __ESP_EXACTT_RET EnvelopeFrom:addr =~ /bounce\-(?:\d+)_HTML\-(?:\d+)\-(?\d+)\-(?:\d+)\-(?:\d+)\@/ + header __ESP_EXACTT_RRBL eval:check_hashbl_tag('exacttarget.espbl.snb.it/A', 'raw', 'EXACTTARGET_RID', '^127\.') + meta RBL_ESP_EXACTTARGET ( __ESP_EXACTT_CSA && __ESP_EXACTT_SFMC && ( __ESP_EXACTT_RBL || __ESP_EXACTT_URBL || __ESP_EXACTT_RRBL ) ) describe RBL_ESP_EXACTTARGET Esp ExactTarget Id blacklist tflags RBL_ESP_EXACTTARGET net diff --git a/Esp.pm b/Esp.pm index 5b80e8e..ca451b6 100644 --- a/Esp.pm +++ b/Esp.pm @@ -819,9 +819,12 @@ sub esp_exacttarget_check { # x-messageKey: undelivered+984411+551293975@pd25.com $fid = $pms->get("x-messageKey", undef); return if not defined $fid; - if($fid =~ /(\d+)\-(?:\d+)\-(?:\d+)/) { + my $envfrom = $pms->get("Return-Path", undef); + if(defined $fid and $fid =~ /(\d+)\-(?:\d+)\-(?:\d+)/) { $uid = $1; - } elsif ($fid =~ /undelivered\+(\d+)\+(?:\d+)\@pd25\.com/) { + } elsif (defined $fid and $fid =~ /undelivered\+(\d+)\+(?:\d+)\@pd25\.com/) { + $uid = $1; + } elsif (defined $envfrom and $envfrom =~ /bounce\-(?:\d+)_HTML\-(?:\d+)\-(\d+)\-(?:\d+)\-(?:\d+)\@/) { $uid = $1; } return if not defined $uid;