svn commit: r575915 - in /spamassassin/trunk/lib/Mail/SpamAssassin: BayesStore/DBM.pm Conf/Parser.pm Plugin/Check.pm Util.pm

[mm...@apache.org]

Author: mmartinec
Date: Sat Sep 15 06:13:34 2007
New Revision: 575915

URL: http://svn.apache.org/viewvc?rev=575915&view=rev
Log:
Conf::Parser.pm: explicitly specify module name when calling
sub untaint_var from anonymous subroutines which may be invoked
in a context of modules;  Util.pm: do not export subs local_tz,
base64_decode and untaint_var by default, but use @EXPORT_OK
and leave the decision to the importing module.

Modified:
    spamassassin/trunk/lib/Mail/SpamAssassin/BayesStore/DBM.pm
    spamassassin/trunk/lib/Mail/SpamAssassin/Conf/Parser.pm
    spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Check.pm
    spamassassin/trunk/lib/Mail/SpamAssassin/Util.pm

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/BayesStore/DBM.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/BayesStore/DBM.pm?rev=575915&r1=575914&r2=575915&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/BayesStore/DBM.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/BayesStore/DBM.pm Sat Sep 15 06:13:34 2007
@@ -24,7 +24,7 @@
 use re 'taint';
 
 use Mail::SpamAssassin;
-use Mail::SpamAssassin::Util;
+use Mail::SpamAssassin::Util qw(untaint_var);
 use Mail::SpamAssassin::BayesStore;
 use Mail::SpamAssassin::Logger;
 use Digest::SHA1 qw(sha1);

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Conf/Parser.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Conf/Parser.pm?rev=575915&r1=575914&r2=575915&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Conf/Parser.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Conf/Parser.pm Sat Sep 15 06:13:34 2007
@@ -124,7 +124,6 @@
 use Mail::SpamAssassin::Conf;
 use Mail::SpamAssassin::Constants qw(:sa);
 use Mail::SpamAssassin::Logger;
-use Mail::SpamAssassin::Util qw(untaint_var);
 
 use strict;
 use warnings;
@@ -271,7 +270,7 @@
     $value = '' unless defined($value);
 
 #   # Do a better job untainting this info ...
-#   # $value = untaint_var($value);
+#   # $value = Mail::SpamAssassin::Util::untaint_var($value);
 #   Do NOT blindly untaint now, do it carefully later when semantics is known!
 
     my $parse_error;       # undef by default, may be overridden
@@ -485,7 +484,7 @@
   my $bad = 0;
   foreach my $token (@tokens) {
     if ($token =~ /^\W+|[+-]?\d+(?:\.\d+)?$/) {
-      $eval .= untaint_var($token) . " ";
+      $eval .= Mail::SpamAssassin::Util::untaint_var($token) . " ";
     }
     elsif ($token eq 'plugin') {
       # replace with method call
@@ -495,7 +494,7 @@
       $eval .= $Mail::SpamAssassin::VERSION." ";
     }
     elsif ($token =~ /^\w[\w\:]+$/) { # class name
-      $eval .= '"' . untaint_var($token) . '" ';
+      $eval .= '"' . Mail::SpamAssassin::Util::untaint_var($token) . '" ';
     }
     else {
       $bad++;
@@ -614,7 +613,7 @@
     return $Mail::SpamAssassin::Conf::INVALID_VALUE;
   }
   # it is safe to untaint now that we now the syntax is a valid number
-  $conf->{$key} = untaint_var($value) + 0.0;
+  $conf->{$key} = Mail::SpamAssassin::Util::untaint_var($value) + 0.0;
 }
 
 sub set_bool_value {
@@ -833,7 +832,7 @@
     next unless exists $conf->{tests}->{$token};
 
     # add and recurse
-    push(@{$deps}, untaint_var($token));
+    push(@{$deps}, Mail::SpamAssassin::Util::untaint_var($token));
     $self->_meta_deps_recurse($conf, $toprule, $token, $deps, $alreadydone);
   }
 }
@@ -1092,7 +1091,7 @@
   my ($self, $name, $rule) = @_;
 
   my $meta = '';
-  $rule = untaint_var($rule);  # must be careful below
+  $rule = Mail::SpamAssassin::Util::untaint_var($rule); # must be careful below
 
   # Lex the rule into tokens using a rather simple RE method ...
   my $lexer = ARITH_EXPRESSION_LEXER;

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Check.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Check.pm?rev=575915&r1=575914&r2=575915&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Check.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Check.pm Sat Sep 15 06:13:34 2007
@@ -20,7 +20,7 @@
 
 use Mail::SpamAssassin::Plugin;
 use Mail::SpamAssassin::Logger;
-use Mail::SpamAssassin::Util;
+use Mail::SpamAssassin::Util qw(untaint_var);
 use Mail::SpamAssassin::Constants qw(:sa);
 
 use vars qw(@ISA @TEMPORARY_METHODS);

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Util.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Util.pm?rev=575915&r1=575914&r2=575915&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Util.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Util.pm Sat Sep 15 06:13:34 2007
@@ -48,14 +48,15 @@
 use Mail::SpamAssassin::Logger;
 
 use vars qw (
-  @ISA @EXPORT
+  @ISA @EXPORT @EXPORT_OK
   $AM_TAINTED
 );
 
 require Exporter;
 
 @ISA = qw(Exporter);
-@EXPORT = qw(local_tz base64_decode untaint_var);
+@EXPORT = ();
+@EXPORT_OK = qw(&local_tz &base64_decode &untaint_var);
 
 use Mail::SpamAssassin;
 use Mail::SpamAssassin::Util::RegistrarBoundaries;