svn commit: r1901228 - /spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DecodeShortURLs.pm

[he...@apache.org]

Author: hege
Date: Wed May 25 09:57:47 2022
New Revision: 1901228

URL: http://svn.apache.org/viewvc?rev=1901228&view=rev
Log:
Make sure checks are done in case of strange rule priorities vs check_dnsbl

Modified:
    spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DecodeShortURLs.pm

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DecodeShortURLs.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DecodeShortURLs.pm?rev=1901228&r1=1901227&r2=1901228&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DecodeShortURLs.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DecodeShortURLs.pm Wed May 25 09:57:47 2022
@@ -617,10 +617,8 @@ sub initialise_url_shortener_cache {
 sub short_url {
   my ($self, $pms) = @_;
 
-  # Run checks if check_dnsbl didn't
-  if ($self->{net_disabled}) {
-    $self->_check_short($pms);
-  }
+  # Make sure checks are run
+  $self->_check_short($pms);
 
   return $pms->{short_url};
 }
@@ -628,24 +626,36 @@ sub short_url {
 sub short_url_redir {
   my ($self, $pms) = @_;
 
+  # Make sure checks are run
+  $self->_check_short($pms);
+
   return $pms->{short_url_redir};
 }
 
 sub short_url_200 {
   my ($self, $pms) = @_;
 
+  # Make sure checks are run
+  $self->_check_short($pms);
+
   return $pms->{short_url_200};
 }
 
 sub short_url_404 {
   my ($self, $pms) = @_;
 
+  # Make sure checks are run
+  $self->_check_short($pms);
+
   return $pms->{short_url_404};
 }
 
 sub short_url_code {
   my ($self, $pms, undef, $code) = @_;
 
+  # Make sure checks are run
+  $self->_check_short($pms);
+
   return unless defined $code && $code =~ /^\d{3}$/;
   return $pms->{"short_url_$code"};
 }
@@ -653,18 +663,27 @@ sub short_url_code {
 sub short_url_chained {
   my ($self, $pms) = @_;
 
+  # Make sure checks are run
+  $self->_check_short($pms);
+
   return $pms->{short_url_chained};
 }
 
 sub short_url_maxchain {
   my ($self, $pms) = @_;
 
+  # Make sure checks are run
+  $self->_check_short($pms);
+
   return $pms->{short_url_maxchain};
 }
 
 sub short_url_loop {
   my ($self, $pms) = @_;
 
+  # Make sure checks are run
+  $self->_check_short($pms);
+
   return $pms->{short_url_loop};
 }