[Pkg-sympa-commits] [sympa] 04/12: Imported Upstream version 6.1.24~dfsg
Emmanuel Bouthenot
kolter at moszumanska.debian.org
Fri Jul 31 05:18:12 UTC 2015
This is an automated email from the git hooks/post-receive script.
kolter pushed a commit to branch master
in repository sympa.
commit 89713d8a6fdb81d1482db018e1ea162309d33321
Author: Emmanuel Bouthenot <kolter at openics.org>
Date: Mon Feb 2 18:02:57 2015 +0100
Imported Upstream version 6.1.24~dfsg
---
ChangeLog | 51 +++++++++++++++++++++++++++++++++++++++++++++-
NEWS | 28 +++++++++++++++++++++++++
configure | 20 +++++++++---------
configure.ac | 4 ++--
soap/sympasoap.pm | 8 +++++++-
src/etc/list_aliases.tt2 | 24 +++++++++++-----------
src/lib/Conf.pm | 7 +++----
src/lib/Sympa/Constants.pm | 34 +++++++++++++++----------------
src/lib/confdef.pm | 2 +-
src/lib/tools.pm | 6 +++---
src/sympa.pl.in | 4 ++--
sympa.spec | 2 +-
wwsympa/wwsympa.fcgi.in | 17 ++++++++++------
13 files changed, 147 insertions(+), 60 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 915b498..56745b4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,53 @@
------------------------------------------------------------------------
+r11778 | david.verdin | 2014-12-17 11:41:05 +0100 (mer. 17 d�c. 2014) | 1 ligne
+Chemins modifi�s�:
+ M /branches/sympa-6.1-branch/wwsympa/wwsympa.fcgi.in
+
+[bug] Preventing faulty newsletter sending.
+------------------------------------------------------------------------
+r11690 | david.verdin | 2014-11-14 16:38:25 +0100 (ven. 14 nov. 2014) | 1 ligne
+Chemins modifi�s�:
+ M /branches/sympa-6.1-branch/src/sympa.pl.in
+
+[bug][Submitted by B. Marchal, univ. Lorraine] the loop_prevention_regex parameter was never taken into account. This was due to a o modifier in the regexp which resulted in the regexp being set at compile time and never changed after. Fixed by removing this modifier.
+------------------------------------------------------------------------
+r11563 | sikeda | 2014-10-17 09:17:36 +0200 (ven. 17 oct. 2014) | 2 lignes
+Chemins modifi�s�:
+ M /branches/sympa-6.1-branch/soap/sympasoap.pm
+
+[bug][#9542] [Submitted by M. Howe, Univ. of Oxford] SympaSOAP does not validate added addresses.
+
+------------------------------------------------------------------------
+r11562 | sikeda | 2014-10-17 03:34:08 +0200 (ven. 17 oct. 2014) | 2 lignes
+Chemins modifi�s�:
+ M /branches/sympa-6.1-branch/wwsympa/wwsympa.fcgi.in
+
+[-bug][#9548][Submitted by M. Howe, Univ. of Oxford] do_del only logs single address successfully removed, even if multiple addresses are specified.
+
+------------------------------------------------------------------------
+r11428 | david.verdin | 2014-09-24 16:49:09 +0200 (mer. 24 sept. 2014) | 2 lignes
+Chemins modifi�s�:
+ M /branches/sympa-6.1-branch/src/lib/confdef.pm
+ M /branches/sympa-6.1-branch/src/lib/tools.pm
+
+[bug] When checking misaddressed commands in subject, the command length was not taken into account. Any message whose subjects started with unsubscribe, signoff or subscribe would be rejectd. Fixed by forcing test to match only if the subject contains two words exactly, including the command. We might miss wom better form subscribe commands but will have very less false positive.
+
+------------------------------------------------------------------------
+r11427 | david.verdin | 2014-09-24 16:31:44 +0200 (mer. 24 sept. 2014) | 2 lignes
+Chemins modifi�s�:
+ M /branches/sympa-6.1-branch/src/lib/Conf.pm
+
+[bug] DMARC protection mode was not correctly loaded in virtual hosts. Fixed by getting rid of double parsing of this parameter.
+
+------------------------------------------------------------------------
+r11398 | sympa-authors | 2014-09-17 17:19:31 +0200 (mer. 17 sept. 2014) | 1 ligne
+Chemins modifi�s�:
+ M /branches/sympa-6.1-branch/ChangeLog
+ M /branches/sympa-6.1-branch/NEWS
+ M /branches/sympa-6.1-branch/configure.ac
+
+[-release]Preparing version 6.1.23
+------------------------------------------------------------------------
r11369 | david.verdin | 2014-09-12 17:52:50 +0200 (ven. 12 sept. 2014) | 2 lignes
Chemins modifi�s�:
M /branches/sympa-6.1-branch/wwsympa/wwsympa.fcgi.in
@@ -2830,7 +2879,7 @@ Chemins modifi
- Comments in the sources should be written using UTF-8, not ISO-8859-1, EUC-JP or others.
- Perl literals must not contain non-ASCII: They must be escaped, e.g. "\xE9".
- In PODs, E<xxx> escapes should be used if at all possible. Note that it can not be used in verbatim (indented) paragraphs: use UTF-8.
-- It is recommended that subversion commands (checkout, update etc.) are run under UTF-8 locales to freed coders from encoding mess: RCS revision tags such as $Date: 2014-09-17 17:19:31 +0200 (mer. 17 sept. 2014) $ can contain localised texts. Or, "C" locale may be used.
+- It is recommended that subversion commands (checkout, update etc.) are run under UTF-8 locales to freed coders from encoding mess: RCS revision tags such as $Date: 2015-01-13 17:04:20 +0100 (mar. 13 janv. 2015) $ can contain localised texts. Or, "C" locale may be used.
------------------------------------------------------------------------
r9968 | sikeda | 2013-11-29 14:36:40 +0100 (ven. 29 nov. 2013) | 2 lignes
diff --git a/NEWS b/NEWS
index caab826..c541a4e 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,34 @@
(See Changelog file for the full changes log)
+6.1.24 January 13, 2015
+
+ Bug fixes:
+
+ [11778] wwsympa/wwsympa.fcgi.in: Preventing faulty newsletter sending.
+
+ [11690] src/sympa.pl.in: [Submitted by B. Marchal, univ. Lorraine] the
+ loop_prevention_regex parameter was never taken into account. This was
+ due to a o modifier in the regexp which resulted in the regexp being
+ set at compile time and never changed after. Fixed by removing this
+ modifier.
+
+ [11563] soap/sympasoap.pm: [#9542] [Submitted by M. Howe, Univ. of
+ Oxford] SympaSOAP does not validate added addresses.
+
+ [11428] src/lib/confdef.pm, src/lib/tools.pm: When checking
+ misaddressed commands in subject, the command length was not taken into
+ account. Any message whose subjects started with unsubscribe, signoff
+ or subscribe would be rejectd. Fixed by forcing test to match only if
+ the subject contains two words exactly, including the command. We might
+ miss wom better form subscribe commands but will have very less false
+ positive.
+
+ [11427] src/lib/Conf.pm: DMARC protection mode was not correctly
+ loaded in virtual hosts. Fixed by getting rid of double parsing of this
+ parameter.
+
+
6.1.23 September 17, 2014
Features:
diff --git a/configure b/configure
index eaad9b9..a9f5e1b 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for sympa 6.1.23.
+# Generated by GNU Autoconf 2.63 for sympa 6.1.24.
#
# Report bugs to <sympa-authors at listes.renater.fr>.
#
@@ -596,8 +596,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='sympa'
PACKAGE_TARNAME='sympa'
-PACKAGE_VERSION='6.1.23'
-PACKAGE_STRING='sympa 6.1.23'
+PACKAGE_VERSION='6.1.24'
+PACKAGE_STRING='sympa 6.1.24'
PACKAGE_BUGREPORT='sympa-authors at listes.renater.fr'
ac_default_prefix=/home/sympa
@@ -1319,7 +1319,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures sympa 6.1.23 to adapt to many kinds of systems.
+\`configure' configures sympa 6.1.24 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1385,7 +1385,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of sympa 6.1.23:";;
+ short | recursive ) echo "Configuration of sympa 6.1.24:";;
esac
cat <<\_ACEOF
@@ -1526,7 +1526,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-sympa configure 6.1.23
+sympa configure 6.1.24
generated by GNU Autoconf 2.63
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1540,7 +1540,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by sympa $as_me 6.1.23, which was
+It was created by sympa $as_me 6.1.24, which was
generated by GNU Autoconf 2.63. Invocation command line was
$ $0 $@
@@ -2236,7 +2236,7 @@ fi
# Define the identity of the package.
PACKAGE='sympa'
- VERSION='6.1.23'
+ VERSION='6.1.24'
cat >>confdefs.h <<_ACEOF
@@ -5331,7 +5331,7 @@ exec 6>&1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by sympa $as_me 6.1.23, which was
+This file was extended by sympa $as_me 6.1.24, which was
generated by GNU Autoconf 2.63. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -5385,7 +5385,7 @@ Report bugs to <bug-autoconf at gnu.org>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
-sympa config.status 6.1.23
+sympa config.status 6.1.24
configured by $0, generated by GNU Autoconf 2.63,
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff --git a/configure.ac b/configure.ac
index 9f45842..54309b9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
# configure.in - Top-level configure.in for Sympa
-# RCS Identication ; $Revision: 11398 $ ; $Date: 2014-09-17 17:19:31 +0200 (mer. 17 sept. 2014) $
+# RCS Identication ; $Revision: 11842 $ ; $Date: 2015-01-13 17:04:20 +0100 (mar. 13 janv. 2015) $
#
# Sympa - SYsteme de Multi-Postage Automatique
#
@@ -22,7 +22,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
AC_PREREQ(2.60)
-AC_INIT(sympa, 6.1.23, sympa-authors at listes.renater.fr)
+AC_INIT(sympa, 6.1.24, sympa-authors at listes.renater.fr)
AM_INIT_AUTOMAKE([foreign -Wall -Werror])
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
AM_PO_SUBDIRS
diff --git a/soap/sympasoap.pm b/soap/sympasoap.pm
index 562f52a..2c001af 100644
--- a/soap/sympasoap.pm
+++ b/soap/sympasoap.pm
@@ -1,4 +1,4 @@
-# $Id: sympasoap.pm 11154 2014-07-12 03:31:32Z sikeda $
+# $Id: sympasoap.pm 11563 2014-10-17 07:17:36Z sikeda $
# Sympa - SYsteme de Multi-Postage Automatique
#
@@ -719,6 +719,12 @@ sub add {
->faultstring('Incorrect number of parameters')
->faultdetail('Use : <email>');
}
+ unless (tools::valid_email($email)) {
+ my $error = "Invalid email address provided: '$email'";
+ die SOAP::Fault->faultcode('Client')
+ ->faultstring('Unable to add user')
+ ->faultdetail($error);
+ }
my $list = new List ($listname, $robot);
unless ($list) {
&Log::do_log('info', 'add %s@%s %s from %s refused, no such list ', $listname,$robot,$email,$sender);
diff --git a/src/etc/list_aliases.tt2 b/src/etc/list_aliases.tt2
index 31d205a..5748d0c 100644
--- a/src/etc/list_aliases.tt2
+++ b/src/etc/list_aliases.tt2
@@ -1,16 +1,16 @@
#------------------------------ [% list.name %]: list alias created [% date %]
[% IF is_default_domain -%]
-[% list.name %]: "| /tmp/sympapipo/bin/queue [% list.name %]@[% list.domain %]"
-[% list.name %]-request: "| /tmp/sympapipo/bin/queue [% list.name %]-request@[% list.domain %]"
-[% list.name %]-editor: "| /tmp/sympapipo/bin/queue [% list.name %]-editor@[% list.domain %]"
-#[% list.name %]-subscribe: "| /tmp/sympapipo/bin/queue [% list.name %]-subscribe@[% list.domain %]"
-[% list.name %]-unsubscribe: "| /tmp/sympapipo/bin/queue [% list.name %]-unsubscribe@[% list.domain %]"
-[% list.name %][% return_path_suffix %]: "| /tmp/sympapipo/bin/bouncequeue [% list.name %]@[% list.domain %]"
+[% list.name %]: "| /usr/local/sympa-stable/bin/queue [% list.name %]@[% list.domain %]"
+[% list.name %]-request: "| /usr/local/sympa-stable/bin/queue [% list.name %]-request@[% list.domain %]"
+[% list.name %]-editor: "| /usr/local/sympa-stable/bin/queue [% list.name %]-editor@[% list.domain %]"
+#[% list.name %]-subscribe: "| /usr/local/sympa-stable/bin/queue [% list.name %]-subscribe@[% list.domain %]"
+[% list.name %]-unsubscribe: "| /usr/local/sympa-stable/bin/queue [% list.name %]-unsubscribe@[% list.domain %]"
+[% list.name %][% return_path_suffix %]: "| /usr/local/sympa-stable/bin/bouncequeue [% list.name %]@[% list.domain %]"
[% ELSE -%]
-[% list.domain %]-[% list.name %]: "| /tmp/sympapipo/bin/queue [% list.name %]@[% list.domain %]"
-[% list.domain %]-[% list.name %]-request: "| /tmp/sympapipo/bin/queue [% list.name %]-request@[% list.domain %]"
-[% list.domain %]-[% list.name %]-editor: "| /tmp/sympapipo/bin/queue [% list.name %]-editor@[% list.domain %]"
-#[% list.domain %]-[% list.name %]-subscribe: "| /tmp/sympapipo/bin/queue [% list.name %]-subscribe@[% list.domain %]"
-[% list.domain %]-[% list.name %]-unsubscribe: "| /tmp/sympapipo/bin/queue [% list.name %]-unsubscribe@[% list.domain %]"
-[% list.domain %]-[% list.name %][% return_path_suffix %]: "| /tmp/sympapipo/bin/bouncequeue [% list.name %]@[% list.domain %]"
+[% list.domain %]-[% list.name %]: "| /usr/local/sympa-stable/bin/queue [% list.name %]@[% list.domain %]"
+[% list.domain %]-[% list.name %]-request: "| /usr/local/sympa-stable/bin/queue [% list.name %]-request@[% list.domain %]"
+[% list.domain %]-[% list.name %]-editor: "| /usr/local/sympa-stable/bin/queue [% list.name %]-editor@[% list.domain %]"
+#[% list.domain %]-[% list.name %]-subscribe: "| /usr/local/sympa-stable/bin/queue [% list.name %]-subscribe@[% list.domain %]"
+[% list.domain %]-[% list.name %]-unsubscribe: "| /usr/local/sympa-stable/bin/queue [% list.name %]-unsubscribe@[% list.domain %]"
+[% list.domain %]-[% list.name %][% return_path_suffix %]: "| /usr/local/sympa-stable/bin/bouncequeue [% list.name %]@[% list.domain %]"
[% END -%]
diff --git a/src/lib/Conf.pm b/src/lib/Conf.pm
index e9586ff..6f6d118 100644
--- a/src/lib/Conf.pm
+++ b/src/lib/Conf.pm
@@ -1,5 +1,5 @@
# Conf.pm - This module does the sympa.conf and robot.conf parsing
-# RCS Identication ; $Revision: 10875 $ ; $Date: 2014-06-06 17:44:04 +0200 (ven. 06 juin 2014) $
+# RCS Identication ; $Revision: 11427 $ ; $Date: 2014-09-24 16:31:44 +0200 (mer. 24 sept. 2014) $
#
# Sympa - SYsteme de Multi-Postage Automatique
#
@@ -610,9 +610,8 @@ sub load_robots {
unless ($robot_conf->{$robot}{'dkim_signer_domain'}) {
$robot_conf->{$robot}{'dkim_signer_domain'} = $robot_conf->{$robot}{'domain'};
}
- $robot_conf->{$robot}{'dmarc_protection_mode'} =~ s/\s//g ;
- my @dmarc = split(/,/, $robot_conf->{$robot}{'dmarc_protection_mode'});
- $robot_conf->{$robot}{'dmarc_protection_mode'} = \@dmarc;
+
+ $robot_conf->{$robot}{'dmarc_protection_mode'} ||= $Conf{'dmarc_protection_mode'};
$robot_conf->{$robot}{'title'} ||= $wwsconf->{'title'};
$robot_conf->{$robot}{'default_home'} ||= $wwsconf->{'default_home'};
diff --git a/src/lib/Sympa/Constants.pm b/src/lib/Sympa/Constants.pm
index 44535cd..463ca1a 100644
--- a/src/lib/Sympa/Constants.pm
+++ b/src/lib/Sympa/Constants.pm
@@ -28,26 +28,26 @@ use Exporter;
our @ISA = qw(Exporter);
-use constant VERSION => '6.1.23';
+use constant VERSION => '6.1.24';
use constant USER => 'sympa';
use constant GROUP => 'sympa';
-use constant CONFIG => '/tmp/sympapipo/etc/sympa.conf';
-use constant WWSCONFIG => '/tmp/sympapipo/etc/wwsympa.conf';
-use constant SENDMAIL_ALIASES => '/etc/mail/aliases-sympapipo';
+use constant CONFIG => '/usr/local/sympa-stable/etc/sympa.conf';
+use constant WWSCONFIG => '/usr/local/sympa-stable/etc/wwsympa.conf';
+use constant SENDMAIL_ALIASES => '/etc/mail/aliases-sympa-stable';
-use constant PIDDIR => '/tmp/sympapipo';
-use constant EXPLDIR => '/tmp/sympapipo/list_data';
-use constant SPOOLDIR => '/tmp/sympapipo/spool';
-use constant SYSCONFDIR => '/tmp/sympapipo/etc';
-use constant LOCALEDIR => '/tmp/sympapipo/locale';
-use constant LIBEXECDIR => '/tmp/sympapipo/bin';
-use constant SBINDIR => '/tmp/sympapipo/bin';
-use constant SCRIPTDIR => '/tmp/sympapipo/bin';
-use constant MODULEDIR => '/tmp/sympapipo/bin';
-use constant DEFAULTDIR => '/tmp/sympapipo/default';
-use constant STATICDIR => '/tmp/sympapipo/static_content';
-use constant ARCDIR => '/tmp/sympapipo/arc';
-use constant BOUNCEDIR => '/tmp/sympapipo/bounce';
+use constant PIDDIR => '/usr/local/sympa-stable';
+use constant EXPLDIR => '/usr/local/sympa-stable/list_data';
+use constant SPOOLDIR => '/usr/local/sympa-stable/spool';
+use constant SYSCONFDIR => '/usr/local/sympa-stable/etc';
+use constant LOCALEDIR => '/usr/local/sympa-stable/locale';
+use constant LIBEXECDIR => '/usr/local/sympa-stable/bin';
+use constant SBINDIR => '/usr/local/sympa-stable/bin';
+use constant SCRIPTDIR => '/usr/local/sympa-stable/bin';
+use constant MODULEDIR => '/usr/local/sympa-stable/bin';
+use constant DEFAULTDIR => '/usr/local/sympa-stable/default';
+use constant STATICDIR => '/usr/local/sympa-stable/static_content';
+use constant ARCDIR => '/usr/local/sympa-stable/arc';
+use constant BOUNCEDIR => '/usr/local/sympa-stable/bounce';
1;
diff --git a/src/lib/confdef.pm b/src/lib/confdef.pm
index 4e40f1c..72070f5 100644
--- a/src/lib/confdef.pm
+++ b/src/lib/confdef.pm
@@ -542,7 +542,7 @@ our @params = (
},
{
'name' => 'misaddressed_commands_regexp',
- 'default' => '(subscribe|unsubscribe|signoff|set\s+(\S+)\s+(mail|nomail|digest))',
+ 'default' => '((subscribe\s+(\S+)|unsubscribe\s+(\S+)|signoff\s+(\S+)|set\s+(\S+)\s+(mail|nomail|digest))\s*)',
},
{
'name' => 'nrcpt',
diff --git a/src/lib/tools.pm b/src/lib/tools.pm
index 53872b7..ca895f3 100644
--- a/src/lib/tools.pm
+++ b/src/lib/tools.pm
@@ -1,5 +1,5 @@
# tools.pl - This module provides various tools for Sympa
-# RCS Identication ; $Revision: 11245 $ ; $Date: 2014-07-27 03:57:48 +0200 (dim. 27 juil. 2014) $
+# RCS Identication ; $Revision: 11428 $ ; $Date: 2014-09-24 16:49:09 +0200 (mer. 24 sept. 2014) $
#
# Sympa - SYsteme de Multi-Postage Automatique
#
@@ -44,7 +44,7 @@ use Sympa::Constants;
use Message;
## RCS identification.
-#my $id = '@(#)$Id: tools.pm 11245 2014-07-27 01:57:48Z sikeda $';
+#my $id = '@(#)$Id: tools.pm 11428 2014-09-24 14:49:09Z david.verdin $';
## global var to store a CipherSaber object
my $cipher;
@@ -346,7 +346,7 @@ sub checkcommand {
do_log('debug3', 'tools::checkcommand(msg->head->get(subject): %s,%s)', $subject, $sender);
if ($subject) {
- if ($Conf::Conf{'misaddressed_commands_regexp'} && ($subject =~ /^$Conf::Conf{'misaddressed_commands_regexp'}\b/im)) {
+ if ($Conf::Conf{'misaddressed_commands_regexp'} && ($subject =~ /^$Conf::Conf{'misaddressed_commands_regexp'}$/im)) {
return 1;
}
}
diff --git a/src/sympa.pl.in b/src/sympa.pl.in
index 2c1a1c3..a4808ac 100644
--- a/src/sympa.pl.in
+++ b/src/sympa.pl.in
@@ -1,7 +1,7 @@
#! --PERL--
# sympa.pl - This script is the main one ; it runs as a daemon and does
# the messages/commands processing
-# RCS Identication ; $Revision: 11009 $ ; $Date: 2014-06-18 09:54:30 +0200 (mer. 18 juin 2014) $
+# RCS Identication ; $Revision: 11690 $ ; $Date: 2014-11-14 16:38:25 +0100 (ven. 14 nov. 2014) $
#
# Sympa - SYsteme de Multi-Postage Automatique
#
@@ -1441,7 +1441,7 @@ sub DoFile {
my $conf_loop_prevention_regex;
$conf_loop_prevention_regex = $list->{'admin'}{'loop_prevention_regex'};
$conf_loop_prevention_regex ||= &Conf::get_robot_conf($robot, 'loop_prevention_regex');
- if ($sender =~ /^($conf_loop_prevention_regex)(\@|$)/mio) {
+ if ($sender =~ /^($conf_loop_prevention_regex)(\@|$)/mi) {
&do_log('notice','Ignoring message which would cause a loop, sent by %s', $sender);
return undef;
}
diff --git a/sympa.spec b/sympa.spec
index 918d32f..997f592 100644
--- a/sympa.spec
+++ b/sympa.spec
@@ -1,5 +1,5 @@
%define name sympa
-%define version 6.1.23
+%define version 6.1.24
%define release 1
Name: %{name}
diff --git a/wwsympa/wwsympa.fcgi.in b/wwsympa/wwsympa.fcgi.in
index 55953cc..c858038 100644
--- a/wwsympa/wwsympa.fcgi.in
+++ b/wwsympa/wwsympa.fcgi.in
@@ -1,6 +1,6 @@
#!--PERL--
# wwsympa.fcgi - This script provides the web interface to Sympa
-# RCS Identication ; $Revision: 11369 $ ; $Date: 2014-09-12 17:52:50 +0200 (ven. 12 sept. 2014) $
+# RCS Identication ; $Revision: 11778 $ ; $Date: 2014-12-17 11:41:05 +0100 (mer. 17 déc. 2014) $
#
# Sympa - SYsteme de Multi-Postage Automatique
#
@@ -6546,6 +6546,8 @@ sub do_skinsedit {
&wwslog('notice',"Unable to send template 'removed' to $email");
}
}
+ &web_db_log({'target_email' => $email,
+ 'status' => 'success'});
}
$total = $list->delete_user('users' => \@removed_users, 'exclude' =>'1');
@@ -6560,8 +6562,6 @@ sub do_skinsedit {
}
&report::notice_report_web('del_performed',{'total' => $total},$param->{'action'});
- &web_db_log({'target_email' => $in{'email'},
- 'status' => 'success'});
$param->{'is_subscriber'} = 1;
$param->{'may_signoff'} = 1;
@@ -15758,9 +15758,14 @@ sub do_compose_mail {
$pages_url = $in{'url'};
# parse return the MIME::Lite part to send
- my $MIMEmail = $mailHTML->parse($pages_url);
-
- $in{'body'} = $MIMEmail->as_string;
+ $mailHTML->{_AGENT}->protocols_allowed(['http', 'https', 'ftp', 'nntp']);
+ my $MIMEmail = eval { $mailHTML->parse($pages_url) };
+ if ($MIMEmail) {
+ $in{'body'} = $MIMEmail->as_string;
+ } else {
+ report::reject_report_web('user', 'wrong_value', {'argument' => 'url'}, $param->{'action'});
+ return undef;
+ }
}else{
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/sympa.git
More information about the Pkg-sympa-commits
mailing list