You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by he...@apache.org on 2022/05/19 15:48:50 UTC
svn commit: r1901068 - /spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/URILocalBL.pm
Author: hege
Date: Thu May 19 15:48:50 2022
New Revision: 1901068
URL: http://svn.apache.org/viewvc?rev=1901068&view=rev
Log:
Better validation for rulenames
Modified:
spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/URILocalBL.pm
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/URILocalBL.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/URILocalBL.pm?rev=1901068&r1=1901067&r2=1901068&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/URILocalBL.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/URILocalBL.pm Thu May 19 15:48:50 2022
@@ -106,7 +106,7 @@ filtering might require a paid subscript
package Mail::SpamAssassin::Plugin::URILocalBL;
use Mail::SpamAssassin::Plugin;
-use Mail::SpamAssassin::Constants qw(:ip);
+use Mail::SpamAssassin::Constants qw(:ip :sa);
use Mail::SpamAssassin::Util qw(untaint_var idn_to_ascii);
use Mail::SpamAssassin::NetSet;
@@ -122,6 +122,7 @@ our @ISA = qw(Mail::SpamAssassin::Plugin
sub dbg { my $msg = shift; Mail::SpamAssassin::Plugin::dbg ("URILocalBL: $msg", @_); }
my $IP_ADDRESS = IP_ADDRESS;
+my $RULENAME_RE = RULENAME_RE;
# constructor
sub new {
@@ -154,7 +155,7 @@ sub set_config {
code => sub {
my ($self, $key, $value, $line) = @_;
- if ($value !~ /^(\S+)\s+(.+?)\s*$/) {
+ if ($value !~ /^(${RULENAME_RE})\s+(.+?)\s*$/) {
return $Mail::SpamAssassin::Conf::INVALID_VALUE;
}
my $name = $1;
@@ -196,7 +197,7 @@ sub set_config {
code => sub {
my ($self, $key, $value, $line) = @_;
- if ($value !~ /^(\S+)\s+(.+?)\s*$/) {
+ if ($value !~ /^(${RULENAME_RE})\s+(.+?)\s*$/) {
return $Mail::SpamAssassin::Conf::INVALID_VALUE;
}
my $name = $1;
@@ -238,7 +239,7 @@ sub set_config {
code => sub {
my ($self, $key, $value, $line) = @_;
- if ($value !~ /^(\S+)\s+(.+?)\s*$/) {
+ if ($value !~ /^(${RULENAME_RE})\s+(.+?)\s*$/) {
return $Mail::SpamAssassin::Conf::INVALID_VALUE;
}
my $name = $1;
@@ -272,7 +273,7 @@ sub set_config {
code => sub {
my ($self, $key, $value, $line) = @_;
- if ($value !~ /^(\S+)\s+(.+?)\s*$/) {
+ if ($value !~ /^(${RULENAME_RE})\s+(.+?)\s*$/) {
return $Mail::SpamAssassin::Conf::INVALID_VALUE;
}
my $name = $1;
@@ -299,7 +300,7 @@ sub set_config {
code => sub {
my ($self, $key, $value, $line) = @_;
- if ($value !~ /^(\S+)\s+(.+?)\s*$/) {
+ if ($value !~ /^(${RULENAME_RE})\s+(.+?)\s*$/) {
return $Mail::SpamAssassin::Conf::INVALID_VALUE;
}
my $name = $1;