Bug 330555: [SECURITY] H1, H2 and H3 are not filtered in global/header.html.tmpl...

diff --git a/template/en/default/admin/flag-type/edit.html.tmpl b/template/en/default/admin/flag-type/edit.html.tmpl
index be2b0b061fa8949ab2bad37588453b4f3980e5db..11c951f15558663e22c373563fa062825764f5b8 100644 (file)
--- a/template/en/default/admin/flag-type/edit.html.tmpl
+++ b/template/en/default/admin/flag-type/edit.html.tmpl
@@ -45,9 +45,9 @@
 [% END %]
 
 [% IF last_action == "copy" %]
-  [% title = "Create Flag Type Based on $type.name" %]
+  [% title = BLOCK %]Create Flag Type Based on [% type.name FILTER html %][% END %]
 [% ELSIF last_action == "edit" %]
-  [% title = "Edit Flag Type $type.name" %]
+  [% title = BLOCK %]Edit Flag Type [% type.name FILTER html %][% END %]
 [% END %]
 
 [% PROCESS global/header.html.tmpl

diff --git a/template/en/default/admin/groups/edit.html.tmpl b/template/en/default/admin/groups/edit.html.tmpl
index bb513cf12e66893ebc8e0b7ffe598c9807b72951..e317770cce0a9118d141bb346b34c3798a88ceba 100644 (file)
--- a/template/en/default/admin/groups/edit.html.tmpl
+++ b/template/en/default/admin/groups/edit.html.tmpl
@@ -41,9 +41,10 @@
   #                   be aware of the group being edited and its members.
   #%]
 
+[% title = BLOCK %]Change Group: [% name FILTER html %][% END %]
 
 [% PROCESS global/header.html.tmpl
-  title = "Change Group: $name"
+  title = title
   style = "tr.odd_row {
                background: #e9e9e9; 
            }

diff --git a/template/en/default/admin/groups/remove.html.tmpl b/template/en/default/admin/groups/remove.html.tmpl
index 0eed2d9fbee9ccb75f041089f3bfeecdcbfd5b38..b79d7e68b9e55dc08da2301a96907b11294bccba 100644 (file)
--- a/template/en/default/admin/groups/remove.html.tmpl
+++ b/template/en/default/admin/groups/remove.html.tmpl
@@ -33,14 +33,16 @@
 
 
 [% IF remove_all %]
-  [% title = "Removing All Explicit Group Memberships from '"
-      _ name _ "'" %]
+  [% title = BLOCK %]
+    Removing All Explicit Group Memberships from '[% name FILTER html %]'
+  [% END %]
 [% ELSE %]
-  [% title = "Removing All Explicit Group Memberships Matching "
-      _ "Group RegExp from '" _ name _ "'" %]
+  [% title = BLOCK %]
+    Removing All Explicit Group Memberships Matching Group RegExp from '[% name FILTER html %]'
+  [% END %]
 [% END %]
 
-[% PROCESS global/header.html.tmpl %]
+[% PROCESS global/header.html.tmpl title = title %]
 
 [% IF remove_all %]
   <p><b>Removing explicit membership</b></p>

diff --git a/template/en/default/admin/users/confirm-delete.html.tmpl b/template/en/default/admin/users/confirm-delete.html.tmpl
index 9296f49d6ffa60c3d3d7d1dd2d637026cfde98fa..68d7078f0e6bf55daddc3b11b9d236768a592942 100644 (file)
--- a/template/en/default/admin/users/confirm-delete.html.tmpl
+++ b/template/en/default/admin/users/confirm-delete.html.tmpl
@@ -43,8 +43,10 @@
   #                           created
   #%]
 
+[% title = BLOCK %]Confirm deletion of user [% otheruser.login FILTER html %][% END %]
+
 [% PROCESS global/header.html.tmpl
-  title = "Confirm deletion of user $otheruser.login"
+  title = title
   style_urls = ['skins/standard/admin.css',
                 'skins/standard/editusers.css']
 %]

diff --git a/template/en/default/admin/users/edit.html.tmpl b/template/en/default/admin/users/edit.html.tmpl
index 03125eaf1da3b6da3457f497a33ad982e2ce87a3..8f8e6692bc47dae79ee13c0b939b5a4f263e97aa 100644 (file)
--- a/template/en/default/admin/users/edit.html.tmpl
+++ b/template/en/default/admin/users/edit.html.tmpl
@@ -25,8 +25,10 @@
   #                      canbless) for viewed user.
   #%]
 
+[% title = BLOCK %]Edit user [% otheruser.login FILTER html %][% END %]
+
 [% PROCESS global/header.html.tmpl
-  title = "Edit user $login"
+  title = title
   message = message
   style_urls = ['skins/standard/editusers.css']
 %]

diff --git a/template/en/default/bug/show.html.tmpl b/template/en/default/bug/show.html.tmpl
index 8cb14ee4df121f64e0ff5378f8eaab1c514722d2..faf7b965c11f7441d36b3669057e282bb85cddbd 100644 (file)
--- a/template/en/default/bug/show.html.tmpl
+++ b/template/en/default/bug/show.html.tmpl
@@ -30,7 +30,7 @@
   [% filtered_desc = bug.short_desc FILTER html %]
   [% filtered_timestamp = bug.delta_ts FILTER time %]
   [% PROCESS global/header.html.tmpl
-    title = "$terms.Bug $bug.bug_id - $bug.short_desc"
+    title = "$terms.Bug $bug.bug_id - $filtered_desc"
     h1 = "$terms.Bugzilla $terms.Bug $bug.bug_id"
     h2 = filtered_desc
     h3 = "Last modified: $filtered_timestamp"

diff --git a/template/en/default/filterexceptions.pl b/template/en/default/filterexceptions.pl
index 2c594fde5fa6c2b693e80116372a9075c73ecc96..e2123ac110710c3f227f88b02d8325c7ebb7ba4e 100644 (file)
--- a/template/en/default/filterexceptions.pl
+++ b/template/en/default/filterexceptions.pl
@@ -244,6 +244,7 @@
   'javascript', 
   'style', 
   'onload',
+  'title',
   'h1',
   'h2',
   'h3', 

diff --git a/template/en/default/global/header.html.tmpl b/template/en/default/global/header.html.tmpl
index 959bf5a995821ca5f2f5bd0d0563ff8108b29d4f..ae83e08753fcf43a114937d3a1292346913d3213 100644 (file)
--- a/template/en/default/global/header.html.tmpl
+++ b/template/en/default/global/header.html.tmpl
@@ -61,7 +61,7 @@
                       "http://www.w3.org/TR/html4/loose.dtd">
 <html>
   <head>
-    <title>[% title FILTER html %]</title>
+    <title>[% title %]</title>
 
 [%# Migration note: contents of the old Param 'headerhtml' would go here %]
 

diff --git a/template/en/default/reports/components.html.tmpl b/template/en/default/reports/components.html.tmpl
index 37e4627704fa6018dedacc50ec4bb948a7b4aa12..0a315498da27ba41957ea586fe680a34d734612e 100644 (file)
--- a/template/en/default/reports/components.html.tmpl
+++ b/template/en/default/reports/components.html.tmpl
@@ -30,7 +30,7 @@
   
 [% filtered_product = product FILTER html %]
 [% PROCESS global/header.html.tmpl 
-  title = "Components for $product"
+  title = "Components for $filtered_product"
   h2 = filtered_product %]
 
 [% IF Param("useqacontact") %]

diff --git a/template/en/default/reports/duplicates.html.tmpl b/template/en/default/reports/duplicates.html.tmpl
index 897bbf17f911bcdd19fad892718b7131c7e76059..8be0c5517b127edb542b28aa3897d711d0a0e6c4 100644 (file)
--- a/template/en/default/reports/duplicates.html.tmpl
+++ b/template/en/default/reports/duplicates.html.tmpl
@@ -36,12 +36,15 @@
 [% PROCESS global/variables.none.tmpl %]
 
 [% IF query_products.size %]
-  [% title = "Most Frequently Reported $terms.Bugs for ${query_products.join(', ')}" %]
+  [% title = BLOCK %]
+    Most Frequently Reported [% terms.Bugs %] for [% query_products.join(', ') FILTER html %]
+  [% END %]
 [% ELSE %]
   [% title = "Most Frequently Reported $terms.Bugs" %]
 [% END%]
 
 [% PROCESS global/header.html.tmpl
+   title = title
    style = ".resolved { background-color: #d9d9d9; color: #000000; }"
 %]