From 6066ff31980fddc2eb97b987c5bbd1a931495f1e Mon Sep 17 00:00:00 2001
From: Manish Goregaokar <manishearth@gmail.com>
Date: Thu, 17 Apr 2014 18:37:11 +0200
Subject: Bug 968576: [SECURITY] Dangerous control characters allowed in
 Bugzilla text r=glob a=justdave

---
 Bugzilla/Template.pm | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'Bugzilla/Template.pm')

diff --git a/Bugzilla/Template.pm b/Bugzilla/Template.pm
index cd7507963..08999b27a 100644
--- a/Bugzilla/Template.pm
+++ b/Bugzilla/Template.pm
@@ -672,6 +672,17 @@ sub create {
                 my ($data) = @_;
                 return encode_base64($data);
             },
+
+            # Strips out control characters excepting whitespace
+            strip_control_chars => sub {
+                my ($data) = @_;
+                # Only run for utf8 to avoid issues with other multibyte encodings 
+                # that may be reassigning meaning to ascii characters.
+                if (Bugzilla->params->{'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
-- 
cgit v1.2.3-24-g4f1b