ezmlm-web/ezmlm-web-modules
3
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

taint error in Mail::Ezmlm fixed

Browse source 
version check of Mail::Ezmlm fixed
This commit is contained in:
lars 2005-12-27 09:18:44 +00:00
parent beb4ce7f4f
commit c39cb18be6
2 changed files with 28 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Ezmlm/trunk/Changes
View file

@ -33,3 +33,4 @@ Revision history for Perl extension Mail::Ezmlm.
0.06 Mon Dec 26 18:55:12 CET 2005 0.06 Mon Dec 26 18:55:12 CET 2005
- support for ezmlm-idx-5.0.0 added - support for ezmlm-idx-5.0.0 added
- fixed version check

45
Ezmlm/trunk/Ezmlm.pm
View file

@ -56,9 +56,9 @@ $VERSION = '0.06';
require 5.005; require 5.005;
# == Begin site dependant variables == # == Begin site dependant variables ==
$EZMLM_BASE = '/usr/local/bin'; #Autoinserted by Makefile.PL $EZMLM_BASE = '/usr/local/bin'; #Autoinserted by Makefile.PL
$QMAIL_BASE = '/var/qmail'; #Autoinserted by Makefile.PL $QMAIL_BASE = '/var/qmail'; #Autoinserted by Makefile.PL
$MYSQL_BASE = ''; #Autoinserted by Makefile.PL $MYSQL_BASE = ''; #Autoinserted by Makefile.PL
# == End site dependant variables == # == End site dependant variables ==
use Carp; use Carp;
@ -139,7 +139,9 @@ sub update {
# UGLY! # UGLY!
foreach (split(/["'](.+?)["']|(-\w+)/, $switches)) { foreach (split(/["'](.+?)["']|(-\w+)/, $switches)) {
next if (!defined($_) or !$_ or $_ eq ' '); next if (!defined($_) or !$_ or $_ eq ' ');
push @switches, $_; # untaint input
$_ =~ m/^([\w _\/,\.@:'"-]*)$/;
push @switches, $1;
} }
# can we actually alter this list; # can we actually alter this list;
@ -435,21 +437,30 @@ sub errno {
# == Test the compatiblity of the module == # == Test the compatiblity of the module ==
sub check_version { sub check_version {
my($self) = @_; my($self) = @_;
my ($ezmlm, $idx);
my $version = `$EZMLM_BASE/ezmlm-make -V 2>&1`; my $version = `$EZMLM_BASE/ezmlm-make -V 2>&1`;
$self->_seterror(undef); $self->_seterror(undef);
my ($ezmlm, $idx) = $version =~ m/^ezmlm-make\s+version:\s+ezmlm-([\d.]+)(?:\+ezmlm-idx-([\d.]+))?/; #my ($ezmlm, $idx) = $version =~ m/^ezmlm-make\s+version:\s+(ezmlm-([\d\.])+|ezmlm-idx-([\d\.]+))$/;
if($ezmlm >= 0.53) { $version = $1 if ($version =~ m/^[^:]*:\s+(.*)$/);
if (defined($idx)) { $ezmlm = $1 if ($version =~ m/ezmlm-([\d\.]+)$/);
if ($idx >= 0.40) { $idx = $1 if ($version =~ m/ezmlm-idx-([\d\.]+)$/);
return 0; # ezmlm-idx is required
} else { if(defined($ezmlm)) {
return $version; return $version;
} } elsif (defined($idx)) {
if (($idx =~ m/^(\d)/) && ($1 >= 5)) {
# version 5.0 or higher
return 0;
} elsif (($idx =~ m/^0\.(\d)/) && ($1 >= 0)) {
# version 0.4 or higher
return 0;
} else {
return $version;
} }
return 0; } else {
return $version;
} }
return $version;
} }
# == Create SQL Database tables if defined for a list == # == Create SQL Database tables if defined for a list ==
@ -516,8 +527,7 @@ sub _getconfig_idx5 {
my ($file, $opt_num, $temp); my ($file, $opt_num, $temp);
# read flag file (available since ezmlm-idx 5.0.0) # read flag file (available since ezmlm-idx 5.0.0)
$options = $self->getpart('flags'); chomp($options = $self->getpart('flags'));
$options = chomp($options);
# remove prefixed '-' # remove prefixed '-'
$options =~ s/^-//; $options =~ s/^-//;
@ -535,8 +545,7 @@ sub _getconfig_idx5 {
# "-9" seems to be ignored - this is a good change (tm) # "-9" seems to be ignored - this is a good change (tm)
while (($file, $opt_num) = each(%optionfiles)) { while (($file, $opt_num) = each(%optionfiles)) {
if (-e "$self->{'LIST_NAME'}/$file") { if (-e "$self->{'LIST_NAME'}/$file") {
$temp = $self->getpart($file); chomp($temp = $self->getpart($file));
$temp = chomp($temp);
$options .= " -$opt_num '$temp'" if ($temp ne ''); $options .= " -$opt_num '$temp'" if ($temp ne '');
} }
} }