tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

FIX #6855: Mangled JS in Requirements, escaping replacement values prior to passing to preg_replace().

Browse Source
This commit is contained in:
Patrick Nelson 2017-04-28 01:32:18 -07:00 committed by Sam Minnée
parent 04c1374a74
commit a511e3511c
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
view/Requirements.php
View File

@ -869,10 +869,10 @@ class Requirements_Backend {
// Forcefully put the scripts at the bottom of the body instead of before the first // Forcefully put the scripts at the bottom of the body instead of before the first
// script tag. // script tag.
$replacements["/(<\/body[^>]*>)/i"] = $jsRequirements . "\\1"; $replacements["/(<\/body[^>]*>)/i"] = $this->escapeReplacement($jsRequirements) . "\\1";
// Put CSS at the bottom of the head // Put CSS at the bottom of the head
$replacements["/(<\/head>)/i"] = $requirements . "\\1"; $replacements["/(<\/head>)/i"] = $this->escapeReplacement($requirements) . "\\1";
} elseif ($this->write_js_to_body) { } elseif ($this->write_js_to_body) {
$jsRequirements = $this->removeNewlinesFromCode($jsRequirements); $jsRequirements = $this->removeNewlinesFromCode($jsRequirements);
@ -894,14 +894,14 @@ class Requirements_Backend {
if ($canWriteToBody) { if ($canWriteToBody) {
$content = substr($content, 0, $p1) . $jsRequirements . substr($content, $p1); $content = substr($content, 0, $p1) . $jsRequirements . substr($content, $p1);
} else { } else {
$replacements["/(<\/body[^>]*>)/i"] = $jsRequirements . "\\1"; $replacements["/(<\/body[^>]*>)/i"] = $this->escapeReplacement($jsRequirements) . "\\1";
} }
// Put CSS at the bottom of the head // Put CSS at the bottom of the head
$replacements["/(<\/head>)/i"] = $requirements . "\\1"; $replacements["/(<\/head>)/i"] = $this->escapeReplacement($requirements) . "\\1";
} else { } else {
// Put CSS and Javascript together before the closing head tag // Put CSS and Javascript together before the closing head tag
$replacements["/(<\/head>)/i"] = $requirements . $jsRequirements. "\\1"; $replacements["/(<\/head>)/i"] = $this->escapeReplacement($requirements . $jsRequirements) . "\\1";
} }
if (!empty($replacements)) { if (!empty($replacements)) {
@ -923,6 +923,16 @@ class Requirements_Backend {
return preg_replace('/>\n*/', '>', $code); return preg_replace('/>\n*/', '>', $code);
} }
/**
* Safely escape a literal string for use in preg_replace replacement
*
* @param string $replacement
* @return string
*/
protected function escapeReplacement($replacement) {
return addcslashes($replacement, '\\$');
}
/** /**
* Attach requirements inclusion to X-Include-JS and X-Include-CSS headers on the given * Attach requirements inclusion to X-Include-JS and X-Include-CSS headers on the given
* HTTP Response * HTTP Response