Skip to content
This repository was archived by the owner on Sep 20, 2024. It is now read-only.

Fixed CVE-2019-18888 #50

Merged
merged 5 commits into from
Dec 6, 2019
Merged

Fixed CVE-2019-18888 #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5b75871
Fixed copyright
shinsenter Oct 25, 2019
4de725e
Merge branch 'master' into develop
shinsenter Dec 5, 2019
a970443
Fixed HTML encoding
shinsenter Dec 5, 2019
59de60a
Fixed code format
shinsenter Dec 6, 2019
1dc1b0f
Fixed CVE-2019-18888
shinsenter Dec 6, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion assets/helpers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,6 @@
window[ADD_EVENT_LISTENER](LOAD_EVENT, deferscript);

defermedia();
// copyright();
copyright();

})(this, document, console, 'defer_helper');
5 changes: 3 additions & 2 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,9 @@
},
"require":
{
"php": ">=5.6",
"symfony/http-foundation": ">2.6"
"php": ">=5.6.20",
"symfony/mime": "<2.8.0||>2.8.50 <3.4.0||>3.4.34 <4.2.0||>4.2.11 <4.3.0||>=4.3.8",
"symfony/http-foundation": ">2.6 <2.8.0||>2.8.50 <3.4.0||>3.4.34 <4.2.0||>4.2.11 <4.3.0||>=4.3.8"
},
"minimum-stability": "dev",
"prefer-stable": true,
Expand Down
77 changes: 40 additions & 37 deletions composer.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion public/helpers.min.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions src/DeferInterface.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
namespace shinsenter;

if (!defined('DEFER_JS_ROOT')) {
define('DEFER_JS_ROOT', dirname(dirname(__FILE__)));
define('DEFER_JS_ROOT', dirname(__DIR__));
}

if (!defined('DEFER_JS_VERSION')) {
Expand Down Expand Up @@ -189,7 +189,7 @@ abstract class DeferInterface
const IMG_XPATH = '//*[(' . DEFER_IMG_TAGS . ') and ' . DEFER_IMG_IGNORE . ']';
const IFRAME_XPATH = '//*[(' . DEFER_IFRAME_TAGS . ') and ' . DEFER_IFRAME_IGNORE . ']';
const BACKGROUND_XPATH = '//*[' . DEFER_JS_IGNORE . ' and @style and contains(@style,"url")]';
const NORMALIZE_XPATH = '//text()[' . DEFER_MINIFY_HTML_IGNORE . ' and not(.=normalize-space(.))]';
const NORMALIZE_XPATH = '//text()[not(.=normalize-space(.))]';

// Variable holders
public static $deferjs_script = null;
Expand Down
14 changes: 8 additions & 6 deletions src/DeferOptimizer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,13 +49,15 @@ protected function optimize()

// Meta optimizations
$this->addMissingMeta();
$this->addFingerprint();

// Add custom splash screen
$this->addCustomSplashScreen();

// Minify
$this->minifyOutputHTML();

// Footer
$this->addFingerprint();
}

/*
Expand Down Expand Up @@ -482,7 +484,7 @@ protected function optimizeStyleTags()

// Update the node content
if ($node->nodeValue != $code) {
$node->nodeValue = htmlspecialchars($code);
$node->nodeValue = $code;
}

// Defer the style tag if there is background url
Expand Down Expand Up @@ -512,7 +514,7 @@ protected function optimizeScriptTags()
$code = $this->minifyInlineScript($node->nodeValue);

if ($node->nodeValue != $code) {
$node->nodeValue = htmlspecialchars($code);
$node->nodeValue = $code;
}
}
}
Expand Down Expand Up @@ -830,12 +832,12 @@ protected function getPreloadType($node)
protected function addBackgroundColor($node)
{
if ($this->use_color_placeholder) {
if ($this->use_color_placeholder == 'grey') {
if ($this->use_color_placeholder === 'grey') {
// Light grey placeholder
$placeholder = 'background-color:hsl(0,0%,' . rand(95, 99) . '%);';
$placeholder = 'background-color:hsl(0,0%,' . rand(91, 99) . '%);';
} else {
// Colorful placeholder
$placeholder = 'background-color:hsl(' . rand(1, 360) . ',100%,96%);';
$placeholder = 'background-color:hsl(' . rand(1, 360) . ',30%,96%);';
}

$style = (string) $node->getAttribute(static::ATTR_STYLE);
Expand Down
Loading