# # Security fix for XSS in Web Admin's printer.php (#1362) # Licensed under the GPLv2 # Olivier Bilodeau # old_revision [4e7b8374a86e26fccebb4adc9385047431f3e1ea] # # patch "pf/html/admin/footer.php" # from [67a9b2cb5bb74696d168be4ef367111dc975fd77] # to [93a8a69e2a07df95ba5cff677273bfd55290b839] # # patch "pf/html/admin/printer.php" # from [c1b9ca5e1b9bcbd80a85a025d6960cad9e012765] # to [fe3722f9320d6bf1327b5a8b343e0966384a4a8b] # ============================================================ --- pf/html/admin/footer.php 67a9b2cb5bb74696d168be4ef367111dc975fd77 +++ pf/html/admin/footer.php 93a8a69e2a07df95ba5cff677273bfd55290b839 @@ -21,7 +21,7 @@ * * @author Olivier Bilodeau * @author Dominik Gehl - * @copyright 2008-2011 Inverse inc. + * @copyright 2008-2012 Inverse inc. * @license http://opensource.org/licenses/gpl-2.0.php GPL */ ?> @@ -53,7 +53,7 @@ print "Download CSV of this data"; } if(isset($is_printable) && $is_printable){ - print "View a Printer Friendly Version"; + print "View a Printer Friendly Version"; } ?> ============================================================ --- pf/html/admin/printer.php c1b9ca5e1b9bcbd80a85a025d6960cad9e012765 +++ pf/html/admin/printer.php fe3722f9320d6bf1327b5a8b343e0966384a4a8b @@ -1,8 +1,8 @@ * @author Dominik Gehl - * @copyright 2008-2010 Inverse inc. + * @copyright 2008-2010, 2012 Inverse inc. * @license http://opensource.org/licenses/gpl-2.0.php GPL */ @@ -37,12 +38,8 @@ "; - } - - else if($_SESSION['table']){ + if($_SESSION['table']){ $table = unserialize($_SESSION['table']); #if($table->editable){ # array_pop($table->headers); @@ -51,12 +48,16 @@ print "
"; $font_size = set_default($_GET['font_size'], 3); + # Anti-XSS + $font_size = htmlspecialchars($font_size, ENT_QUOTES | ENT_HTML401); + $uri = htmlspecialchars($_SERVER[REQUEST_URI], ENT_QUOTES | ENT_HTML401); + if($font_size < 5){ - print "Inbiggin Font"; + print "Inbiggin Font"; } if($font_size > 1){ - print "Smallify Font"; - } + print "Smallify Font"; + } print ""; print ""; @@ -72,11 +73,12 @@ } print ""; } - print "
"; - } + print ""; + } else { + print "No data"; + } - ?>