diff options
| author | Manish Goregaokar <manishearth@gmail.com> | 2014-04-17 18:27:05 +0200 |
|---|---|---|
| committer | Frédéric Buclin <LpSolit@gmail.com> | 2014-04-17 18:27:05 +0200 |
| commit | 58b92d3b0245f6565a7ff34e78fce1e9ec56b355 (patch) | |
| tree | 5b66f0684021f72559184c04a0a4f8294f863582 | |
| parent | 0e390970ba51b14a5dc780be7c6f0d6d7baa67e3 (diff) | |
| download | bugzilla-58b92d3b0245f6565a7ff34e78fce1e9ec56b355.tar.gz bugzilla-58b92d3b0245f6565a7ff34e78fce1e9ec56b355.tar.xz | |
Bug 968576: [SECURITY] Dangerous control characters allowed in Bugzilla text
r=glob a=justdave
| -rw-r--r-- | Bugzilla/Template.pm | 12 | ||||
| -rw-r--r-- | Bugzilla/Util.pm | 4 | ||||
| -rw-r--r-- | template/en/default/email/bugmail.txt.tmpl | 2 | ||||
| -rw-r--r-- | template/en/default/email/flagmail.txt.tmpl | 2 |
4 files changed, 18 insertions, 2 deletions
diff --git a/Bugzilla/Template.pm b/Bugzilla/Template.pm index 56d31dd2d..6f7900054 100644 --- a/Bugzilla/Template.pm +++ b/Bugzilla/Template.pm @@ -678,6 +678,18 @@ sub create { my ($data) = @_; return encode_base64($data); }, + + # Strips out control characters excepting whitespace + strip_control_chars => sub { + my ($data) = @_; + state $use_utf8 = Bugzilla->params->{'utf8'}; + # Only run for utf8 to avoid issues with other multibyte encodings + # that may be reassigning meaning to ascii characters. + if ($use_utf8) { + $data =~ s/(?![\t\r\n])[[:cntrl:]]//g; + } + return $data; + }, # HTML collapses newlines in element attributes to a single space, # so form elements which may have whitespace (ie comments) need diff --git a/Bugzilla/Util.pm b/Bugzilla/Util.pm index 5f359c38c..9bcb6962d 100644 --- a/Bugzilla/Util.pm +++ b/Bugzilla/Util.pm @@ -75,6 +75,10 @@ sub html_quote { state $use_utf8 = Bugzilla->params->{'utf8'}; if ($use_utf8) { + # Remove control characters if the encoding is utf8. + # Other multibyte encodings may be using this range; so ignore if not utf8. + $var =~ s/(?![\t\r\n])[[:cntrl:]]//g; + # Remove the following characters because they're # influencing BiDi: # -------------------------------------------------------- diff --git a/template/en/default/email/bugmail.txt.tmpl b/template/en/default/email/bugmail.txt.tmpl index 95cda7f10..1f04db7b1 100644 --- a/template/en/default/email/bugmail.txt.tmpl +++ b/template/en/default/email/bugmail.txt.tmpl @@ -19,7 +19,7 @@ [%- IF comment.count %] --- Comment #[% comment.count %] from [% comment.author.identity %] --- [% END %] -[%+ comment.body_full({ is_bugmail => 1, wrap => 1 }) %] +[%+ comment.body_full({ is_bugmail => 1, wrap => 1 }) FILTER strip_control_chars %] [% END %] [% IF referenced_bugs.size %] diff --git a/template/en/default/email/flagmail.txt.tmpl b/template/en/default/email/flagmail.txt.tmpl index 26b60143d..fe514e103 100644 --- a/template/en/default/email/flagmail.txt.tmpl +++ b/template/en/default/email/flagmail.txt.tmpl @@ -69,7 +69,7 @@ Attachment [% attidsummary %] [%-# .defined is necessary to avoid a taint issue, see bug 509794. %] [% IF Bugzilla.cgi.param("comment").defined && Bugzilla.cgi.param("comment").length > 0 %] ------- Additional Comments from [% user.identity %] -[%+ Bugzilla.cgi.param("comment") %] +[%+ Bugzilla.cgi.param("comment") FILTER strip_control_chars %] [% END %] [%- END %] |