svn commit: r1909622 - in /spamassassin/trunk/lib/Mail/SpamAssassin: Plugin/TxRep.pm SQLBasedAddrList.pm

[gb...@apache.org]

Author: gbechis
Date: Fri May  5 07:19:33 2023
New Revision: 1909622

URL: http://svn.apache.org/viewvc?rev=1909622&view=rev
Log:
better regexp, spotted by hege@, thanks

Modified:
    spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/TxRep.pm
    spamassassin/trunk/lib/Mail/SpamAssassin/SQLBasedAddrList.pm

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/TxRep.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/TxRep.pm?rev=1909622&r1=1909621&r2=1909622&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/TxRep.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/TxRep.pm Fri May  5 07:19:33 2023
@@ -1831,7 +1831,7 @@ sub pack_addr {
   if ( $self->{conf}->{txrep_welcomelist_out} &&
     defined $self->{pms}->{relays_internal} &&  @{$self->{pms}->{relays_internal}} &&
     (!defined $self->{pms}->{relays_external} || !@{$self->{pms}->{relays_external}})
-    and $addr =~ /\@\w+\./) {
+    and $addr =~ /(?:[^\s\@]+)\@(?:[^\s\@]+)/) {
       $origip = 'WELCOMELIST_OUT';
   }
   return $addr . "|ip=" . $origip;

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/SQLBasedAddrList.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/SQLBasedAddrList.pm?rev=1909622&r1=1909621&r2=1909622&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/SQLBasedAddrList.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/SQLBasedAddrList.pm Fri May  5 07:19:33 2023
@@ -204,7 +204,7 @@ sub get_addr_entry {
   my $sql;
   my $sth;
   my $rc;
-  if($self->{main}->{conf}->{txrep_welcomelist_out} and ($email =~ /\@\w+\./)) {
+  if($self->{main}->{conf}->{txrep_welcomelist_out} and ($email =~ /(?:[^\s\@]+)\@(?:[^\s\@]+)/)) {
     $sql = "SELECT msgcount, totscore FROM $self->{tablename} " .
             "WHERE username = ? AND email = ? AND ip = 'WELCOMELIST_OUT'";
     $sth = $self->{dbh}->prepare($sql);
@@ -329,7 +329,7 @@ sub add_score {
 
   { my @fields = qw(username email ip msgcount totscore);
     my @signedby;
-    if ($self->{_with_awl_signer} or (defined $signedby and $signedby =~ /^spf\-/) and not ($self->{main}->{conf}->{txrep_welcomelist_out} and ($email =~ /\@\w+\./)) ) {
+    if ($self->{_with_awl_signer} or (defined $signedby and $signedby =~ /^spf\-/) and not ($self->{main}->{conf}->{txrep_welcomelist_out} and ($email =~ /(?:[^\s\@]+)\@(?:[^\s\@]+)/)) ) {
       push(@fields, 'signedby');
       @signedby = !defined $signedby ? () : split(' ', lc $signedby);
       @signedby = ( '' )  if !@signedby;