Fix issue2551129 - Template not found return 500 and traceback

rouilj · rouilj · commit 019b56d45a71 · 2021-04-18T20:54:48.000-04:00
Handle traceback caused when requested @template is not found. Moved scope of try to include call to self.selectTemplate. Patch provided by Cedric Krier. Additional patch to make this case return 400 error since it is a client caused error. Test case added.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -88,6 +88,10 @@ Fixed:
 - issue2551128 - Impossible to validate a user with unknown timezone
   Raise KeyError when an unrecognized timezones is passed to
   pytz. (patch Cedric Krier, test John Rouillard)
+- issue2551129 - Template not found return 500
+  Handle traceback caused when requested @template is not found.
+  Return 400 error in this condition. (patch Cedric Krier,
+  additional change and test John Rouillard)
 
 Features:
 - issue2550522 - Add 'filter' command to command-line
diff --git a/roundup/cgi/client.py b/roundup/cgi/client.py
@@ -1863,14 +1863,14 @@ def selectTemplate(self, name, view):
     def renderContext(self):
         """ Return a PageTemplate for the named page
         """
-        tplname = self.selectTemplate(self.classname, self.template)
-
-        # catch errors so we can handle PT rendering errors more nicely
-        args = {
-            'ok_message': self._ok_message,
-            'error_message': self._error_message
-        }
         try:
+            tplname = self.selectTemplate(self.classname, self.template)
+
+            # catch errors so we can handle PT rendering errors more nicely
+            args = {
+                'ok_message': self._ok_message,
+                'error_message': self._error_message
+            }
             pt = self.instance.templates.load(tplname)
             # let the template render figure stuff out
             result = pt.render(self, None, None, **args)
@@ -1894,6 +1894,7 @@ def renderContext(self):
                 result = result.replace('</body>', s)
             return result
         except templating.NoTemplate as message:
+            self.response_code = 400 
             return '<strong>%s</strong>'%html_escape(str(message))
         except templating.Unauthorised as message:
             raise Unauthorised(html_escape(str(message)))
diff --git a/test/test_cgi.py b/test/test_cgi.py
@@ -746,6 +746,17 @@ def testBackwardsCompat(self):
             'name': 'foo.txt', 'type': 'text/plain'}},
             [('issue', None, 'files', [('file', '-1')])]))
 
+    def testErrorForBadTemplate(self):
+         form = {}
+         cl = self.setupClient(form, 'issue', '1', template="broken",
+                 env_addon = {'HTTP_REFERER': 'http://whoami.com/path/'})
+         out = []
+
+         out = cl.renderContext()
+
+         self.assertEqual(out, '<strong>No template file exists for templating "issue" with template "broken" (neither "issue.broken" nor "_generic.broken")</strong>')
+         self.assertEqual(cl.response_code, 400)
+
     def testFormValuePreserveOnError(self):
         page_template = """
         <html>
