Ticket #15182: clearablefieldwidget-encode-to-html.patch

tests/regressiontests/forms/tests/widgets.py

@@ -1086 +1086 @@
         self.assertEqual(widget.render('myfile', FakeFieldFile()),
                          u'Currently: <a target="_blank" href="something">something</a> <input type="checkbox" name="myfile-clear" id="myfile-clear_id" /> <label for="myfile-clear_id">Clear</label><br />Change: <input type="file" name="myfile" />')
 
+    def test_encode_field_to_html(self):
+        """
+        A ClearableFileInput should encode values when render HTML.
+        """
+
+        class StrangeFieldFile(object):
+            url = "something?chapter=1&sect=2&copy=3&lang=en"
+
+            def __unicode__(self):
+                return u'''something<div onclick="alert('oops')">.jpg'''
+
+        widget = ClearableFileInput()
+        widget.is_required = False
+        field = StrangeFieldFile()
+        output = widget.render('myfile', field)
+        self.assertFalse(field.url in output)
+        self.assertTrue(u'href="something?chapter=1&amp;sect=2&amp;copy=3&amp;lang=en"' in output)
+        self.assertFalse(unicode(field) in output)
+        self.assertTrue(u'something&lt;div onclick=&quot;alert(&#39;oops&#39;)&quot;&gt;.jpg' in output)
+
     def test_clear_input_renders_only_if_not_required(self):
         """
         A ClearableFileInput with is_required=False does not render a clear

django/forms/widgets.py

@@ -330 +330 @@
         if value and hasattr(value, "url"):
             template = self.template_with_initial
             substitutions['initial'] = (u'<a target="_blank" href="%s">%s</a>'
-                                        % (value.url, value))
+                                        % (escape(value.url),
+                                           escape(force_unicode(value))))
             if not self.is_required:
                 checkbox_name = self.clear_checkbox_name(name)
                 checkbox_id = self.clear_checkbox_id(checkbox_name)