Bug 287436: [SECURITY] After having logged in, links to change the report type contai...

Patch By Marc Schumann <wurblzap@gmail.com> r=gerv, a=justdave

diff --git a/Bugzilla/Auth/CGI.pm b/Bugzilla/Auth/CGI.pm
index 0a1a331f1942a83ea6bb8795ffae99aa907315d2..2146ca398653b808361ef335496658f3a284dfe7 100644 (file)
--- a/Bugzilla/Auth/CGI.pm
+++ b/Bugzilla/Auth/CGI.pm
@@ -48,6 +48,8 @@ sub login {
     # First, try the actual login method against form variables
     my $username = $cgi->param("Bugzilla_login");
     my $passwd = $cgi->param("Bugzilla_password");
+    
+    $cgi->delete('Bugzilla_login', 'Bugzilla_password');
 
     my $authmethod = Param("loginmethod");
     my ($authres, $userid, $extra, $info) =

diff --git a/chart.cgi b/chart.cgi
index 4bab17701a2b8842297a05e4add683b6f7969a54..645beb9cbfbeefe413da56c8893422e6c1ec4469 100755 (executable)
--- a/chart.cgi
+++ b/chart.cgi
@@ -284,8 +284,7 @@ sub wrap {
     $vars->{'time'} = time();
 
     $vars->{'imagebase'} = $cgi->canonicalise_query(
-                "action", "action-wrap", "ctype", "format", "width", "height",
-                "Bugzilla_login", "Bugzilla_password");
+                "action", "action-wrap", "ctype", "format", "width", "height");
 
     print $cgi->header();
     $template->process("reports/chart.html.tmpl", $vars)

diff --git a/userprefs.cgi b/userprefs.cgi
index 1c9cf2068852cb33efa27e6739efeb739a51d965..8dbee7b917fc157a5b9edb9b56364cb7037db6df 100755 (executable)
--- a/userprefs.cgi
+++ b/userprefs.cgi
@@ -327,12 +327,19 @@ sub SaveSavedSearches() {
 # Live code (not subroutine definitions) starts here
 ###############################################################################
 
+my $cgi = Bugzilla->cgi;
+
+# This script needs direct access to the username and password CGI variables,
+# so we save them before their removal in Bugzilla->login
+my $bugzilla_login    = $cgi->param('Bugzilla_login');
+my $bugzilla_password = $cgi->param('Bugzilla_password');
+
 Bugzilla->login(LOGIN_REQUIRED);
+$cgi->param('Bugzilla_login', $bugzilla_login);
+$cgi->param('Bugzilla_password', $bugzilla_password);
 
 GetVersionTable();
 
-my $cgi = Bugzilla->cgi;
-
 $vars->{'changes_saved'} = $cgi->param('dosave');
 
 my $current_tab_name = $cgi->param('tab') || "account";