From 7ac8045ff77116bdeb3f4dcc5f44d47815d6bc69 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Fr=C3=A9d=C3=A9ric=20Buclin?= Date: Thu, 4 Aug 2011 12:24:00 -0700 Subject: [PATCH] Bug 657158 - (CVE-2011-2381) [SECURITY] Request email headers for attachment containing newline are corrupt [r=glob a=LpSolit] --- Bugzilla/Template.pm | 3 +++ template/en/default/request/email.txt.tmpl | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Bugzilla/Template.pm b/Bugzilla/Template.pm index f3fc1b82d3..bb5ff5eda7 100644 --- a/Bugzilla/Template.pm +++ b/Bugzilla/Template.pm @@ -549,6 +549,9 @@ sub create { # as prefix. In addition it replaces a ' ' by a '_'. css_class_quote => \&Bugzilla::Util::css_class_quote , + # Removes control characters and trims extra whitespace. + clean_text => \&Bugzilla::Util::clean_text , + quoteUrls => [ sub { my ($context, $bug, $comment) = @_; return sub { diff --git a/template/en/default/request/email.txt.tmpl b/template/en/default/request/email.txt.tmpl index e48b2fc133..20e7ef5ac0 100644 --- a/template/en/default/request/email.txt.tmpl +++ b/template/en/default/request/email.txt.tmpl @@ -50,7 +50,7 @@ From: [% Param('mailfrom') %] To: [% to %] Subject: [% flagtype_name %] [%+ subject_status %]: [[% terms.Bug %] [%+ bug.bug_id %]] [% bug.short_desc %] [%- IF attachment %] : - [Attachment [% attachment.id %]] [% attachment.description %][% END %] + [Attachment [% attachment.id %]] [% attachment.description FILTER clean_text %][% END %] X-Bugzilla-Type: request [%+ threadingmarker %] -- 2.47.2