summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlpsolit%gmail.com <>2009-02-02 20:21:09 +0100
committerlpsolit%gmail.com <>2009-02-02 20:21:09 +0100
commitd5d928102e575599296421f3334e9f8c82ae5292 (patch)
tree2f49bc4fb306ee03a76ba447b550d47f18b1b2b7
parent9c49307f5c2f5a67ab5b3b1270cc83b30efa8637 (diff)
downloadbugzilla-d5d928102e575599296421f3334e9f8c82ae5292.tar.gz
bugzilla-d5d928102e575599296421f3334e9f8c82ae5292.tar.xz
Bug 472362: [SECURITY] Malicious attachments can change your user settings (user + email prefs, shared searches) - Patch by Frédéric Buclin <LpSolit@gmail.com> r=wicked a=LpSolit
-rw-r--r--template/en/default/account/prefs/prefs.html.tmpl1
-rwxr-xr-xuserprefs.cgi8
2 files changed, 9 insertions, 0 deletions
diff --git a/template/en/default/account/prefs/prefs.html.tmpl b/template/en/default/account/prefs/prefs.html.tmpl
index ed9cbce72..71e411d86 100644
--- a/template/en/default/account/prefs/prefs.html.tmpl
+++ b/template/en/default/account/prefs/prefs.html.tmpl
@@ -85,6 +85,7 @@
[% IF current_tab.saveable %]
<form name="userprefsform" method="post" action="userprefs.cgi">
<input type="hidden" name="tab" value="[% current_tab.name %]">
+ <input type="hidden" name="token" value="[% token FILTER html %]">
[% END %]
[% PROCESS "account/prefs/${current_tab.name}.html.tmpl"
diff --git a/userprefs.cgi b/userprefs.cgi
index 085372bac..cffae38cc 100755
--- a/userprefs.cgi
+++ b/userprefs.cgi
@@ -517,6 +517,9 @@ trick_taint($current_tab_name);
$vars->{'current_tab_name'} = $current_tab_name;
+my $token = $cgi->param('token');
+check_token_data($token, 'edit_user_prefs') if $cgi->param('dosave');
+
# Do any saving, and then display the current tab.
SWITCH: for ($current_tab_name) {
/^account$/ && do {
@@ -547,6 +550,11 @@ SWITCH: for ($current_tab_name) {
{ current_tab_name => $current_tab_name });
}
+delete_token($token) if $cgi->param('dosave');
+if ($current_tab_name ne 'permissions') {
+ $vars->{'token'} = issue_session_token('edit_user_prefs');
+}
+
# Generate and return the UI (HTML page) from the appropriate template.
print $cgi->header();
$template->process("account/prefs/prefs.html.tmpl", $vars)