From: Max Kanat-Alexander <mkanat@bugzilla.org>
Date: Fri, 14 May 2010 14:11:38 +0000 (-0700)
Subject: Bug 372537: Improve CodeErrors: show the traceback (without function
X-Git-Tag: bugzilla-3.7.1~79
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8bc37c2d851e06b036c8f895582fedd7051b3592;p=thirdparty%2Fbugzilla.git

Bug 372537: Improve CodeErrors: show the traceback (without function
arguments)
r=LpSolit, a=LpSolit
---

diff --git a/Bugzilla/Error.pm b/Bugzilla/Error.pm
index 0c471125dd..60e7837deb 100644
--- a/Bugzilla/Error.pm
+++ b/Bugzilla/Error.pm
@@ -31,6 +31,8 @@ use base qw(Exporter);
 use Bugzilla::Constants;
 use Bugzilla::WebService::Constants;
 use Bugzilla::Util;
+
+use Carp;
 use Date::Format;
 
 # We cannot use $^S to detect if we are in an eval(), because mod_perl
@@ -50,6 +52,12 @@ sub _throw_error {
     $vars ||= {};
 
     $vars->{error} = $error;
+    # Don't show function arguments, in case they contain confidential data.
+    local $Carp::MaxArgNums = -1;
+    # Don't show the error as coming from Bugzilla::Error, show it as coming
+    # from the caller.
+    local $Carp::CarpInternal{'Bugzilla::Error'} = 1; 
+    $vars->{traceback} = Carp::longmess();
 
     # Make sure any transaction is rolled back (if supported).
     # If we are within an eval(), do not roll back transactions as we are
diff --git a/template/en/default/global/code-error.html.tmpl b/template/en/default/global/code-error.html.tmpl
index c91bc66eeb..e3bd3ba8b0 100644
--- a/template/en/default/global/code-error.html.tmpl
+++ b/template/en/default/global/code-error.html.tmpl
@@ -539,6 +539,9 @@
   </tr>
 </table>
 
+<p>Traceback:</p>
+<pre>[% traceback FILTER html_linebreak %]</pre>
+
 [% IF variables %]
   <pre>
 Variables: