svn commit: r1934409 - spamassassin/trunk/lib/Mail/SpamAssassin/Plugin

Author: fkento
Date: Tue May 19 18:09:32 2026
New Revision: 1934409

Log:
Redirectors: register eval rule `redir_url_valid` 

* Renamed sub and $pms flag from `redir_url_redir` to `redir_url_valid`. Nothing
  downstream could have been consuming the old name, since it was never registered
  as an eval rule.
   
* Added new eval rule `redir_url_valid` and POD documentation

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

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Redirectors.pm
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Redirectors.pm	Tue May 19 17:39:36 2026	(r1934408)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Redirectors.pm	Tue May 19 18:09:32 2026	(r1934409)
@@ -28,6 +28,9 @@ Redirectors - Check for redirected URLs
   body HAS_REDIR_URL          eval:redir_url()
   describe HAS_REDIR_URL      Message has one or more redirected URLs
 
+  body REDIR_URL_VALID        eval:redir_url_valid()
+  describe REDIR_URL_VALID    Message has a redirector that returned a valid redirection
+
   body REDIR_URL_CHAINED      eval:redir_url_chained()
   describe REDIR_URL_CHAINED  Message has redirected URL chained to other redirectors
 
@@ -111,6 +114,7 @@ sub new {
   # run at priority -15 so that redirected short uris can also be checked
   $self->register_method_priority ('check_dnsbl', -15);
   $self->register_eval_rule('redir_url', $Mail::SpamAssassin::Conf::TYPE_BODY_EVALS);
+  $self->register_eval_rule('redir_url_valid', $Mail::SpamAssassin::Conf::TYPE_BODY_EVALS);
   $self->register_eval_rule('redir_url_404', $Mail::SpamAssassin::Conf::TYPE_BODY_EVALS);
   $self->register_eval_rule('redir_url_code', $Mail::SpamAssassin::Conf::TYPE_BODY_EVALS);
   $self->register_eval_rule('redir_url_chained', $Mail::SpamAssassin::Conf::TYPE_BODY_EVALS);
@@ -779,13 +783,13 @@ sub redir_url {
   return $pms->{redir_url} ? 1 : 0;
 }
 
-sub redir_url_redir {
+sub redir_url_valid {
   my ($self, $pms) = @_;
 
   # Make sure checks are run
   $self->_check_redir($pms);
 
-  return $pms->{redir_url_redir} ? 1 : 0;
+  return $pms->{redir_url_valid} ? 1 : 0;
 }
 
 sub redir_url_404 {
@@ -1250,7 +1254,7 @@ sub _walk_redirects {
     }
 
     _add_redirect_uri($pms, $location, $src_info);
-    $pms->{redir_url_redir} = 1;
+    $pms->{redir_url_valid} = 1;
 
     return $self->_walk_redirects($location, $src_info, $pms, $ua, $depth + 1, $been_here);
   }
@@ -1366,7 +1370,7 @@ sub cache_get {
 
 # Version features
 sub has_redir_url { 1 }
-sub has_redir_url_redir { 1 }
+sub has_redir_url_valid { 1 }
 sub has_redir_url_404 { 1 }
 sub has_redir_url_chained { 1 }
 sub has_redir_url_chained_domain { 1 }