fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-05-10 12:32:14 +09:00
Code Issues Projects Releases Packages Wiki Activity

Prevent overwriting jQuery and other common scripts

Browse source 
- Block third-party programs trying to load their own version of jQuery
- Block obsolete scripts such as xe.css and xe.js
- Block minified versions of the above, too
- Increase blocking index threshold from 1,500,000 to 1,500,000,000
- Add unit tests for script blocking
This commit is contained in:
Kijin Sung 2017-07-02 00:36:19 +09:00
parent 99cc64163f
commit 21072195c0
3 changed files with 74 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

38
classes/display/HTMLDisplayHandler.php
View file

@ -3,19 +3,33 @@
class HTMLDisplayHandler class HTMLDisplayHandler
{ {
/**
* jQuery versions
*/
const JQUERY_V1 = '1.11.3';
const JQUERY_V2 = '2.1.4';
/** /**
* Reserved scripts * Reserved scripts
*/ */
public static $reservedCSS = '@\bcommon/css/(?:xe|rhymix|mobile)\.(?:min\.)?(?:s?css|less)$@'; public static $reservedCSS = '@\bcommon/css/(?:xe|rhymix|mobile)\.(?:min\.)?(?:s?css|less)$@';
public static $reservedJS = '@\bcommon/js/(?:jquery(?:-[123][0-9.x-]+)?|xe?|common|js_app|xml_handler|xml_js_filter)\.(?:min\.)?js$@'; public static $reservedJS = '@\bcommon/js/(?:jquery(?:-[123][0-9.x-]+)?|xe?|common|js_app|xml_handler|xml_js_filter)\.(?:min\.)?js$@';
/**
* List of scripts to block loading
*/
public static $blockedScripts = array(
'@\bcommon/(?:css|js)/xe(?:\.min)?\.(?:css|js)$@',
'@\bj[Qq]uery(?:-[0-9]+(?:\.[0-9x]+)*)?(?:\.min)?\.js$@',
);
/** /**
* Replacement table for XE compatibility * Replacement table for XE compatibility
*/ */
public static $replacements = array( public static $replacements = array(
'@\bcommon/xeicon/@' => 'common/css/xeicon/', '@\bcommon/xeicon/@' => 'common/css/xeicon/',
); );
/** /**
* Produce HTML compliant content given a module object.\n * Produce HTML compliant content given a module object.\n
* @param ModuleObject $oModule the module object * @param ModuleObject $oModule the module object
@ -546,7 +560,7 @@ class HTMLDisplayHandler
private function _loadMobileJSCSS() private function _loadMobileJSCSS()
{ {
$this->_loadCommonJSCSS(); $this->_loadCommonJSCSS();
Context::loadFile(array('./common/css/mobile.css', '', '', -1500000), true); Context::loadFile(array('./common/css/mobile.css', '', '', -1500000000), true);
} }
/** /**
@ -554,23 +568,23 @@ class HTMLDisplayHandler
*/ */
private function _loadCommonJSCSS() private function _loadCommonJSCSS()
{ {
Context::loadFile(array('./common/css/rhymix.scss', '', '', -1600000), true); Context::loadFile(array('./common/css/rhymix.scss', '', '', -1600000000), true);
$original_file_list = array('x', 'common', 'js_app', 'xml_handler', 'xml_js_filter'); $original_file_list = array('x', 'common', 'js_app', 'xml_handler', 'xml_js_filter');
$jquery_version = preg_match('/MSIE [5-8]\./', $_SERVER['HTTP_USER_AGENT']) ? '1.11.3' : '2.1.4'; $jquery_version = preg_match('/MSIE [5-8]\./', $_SERVER['HTTP_USER_AGENT']) ? self::JQUERY_V1 : self::JQUERY_V2;
if(config('view.minify_scripts') === 'none') if(config('view.minify_scripts') === 'none')
{ {
Context::loadFile(array('./common/js/jquery-' . $jquery_version . '.js', 'head', '', -1730000), true); Context::loadFile(array('./common/js/jquery-' . $jquery_version . '.js', 'head', '', -1730000000), true);
Context::loadFile(array('./common/js/plugins/jquery.migrate/jquery-migrate-1.2.1.js', 'head', '', -1720000), true); Context::loadFile(array('./common/js/plugins/jquery.migrate/jquery-migrate-1.2.1.js', 'head', '', -1720000000), true);
foreach($original_file_list as $filename) foreach($original_file_list as $filename)
{ {
Context::loadFile(array('./common/js/' . $filename . '.js', 'head', '', -1700000), true); Context::loadFile(array('./common/js/' . $filename . '.js', 'head', '', -1710000000), true);
} }
} }
else else
{ {
Context::loadFile(array('./common/js/jquery-' . $jquery_version . '.min.js', 'head', '', -1730000), true); Context::loadFile(array('./common/js/jquery-' . $jquery_version . '.min.js', 'head', '', -1730000000), true);
Context::loadFile(array('./common/js/plugins/jquery.migrate/jquery-migrate-1.2.1.min.js', 'head', '', -1720000), true); Context::loadFile(array('./common/js/plugins/jquery.migrate/jquery-migrate-1.2.1.min.js', 'head', '', -1720000000), true);
$concat_target_filename = 'files/cache/assets/minified/rhymix.min.js'; $concat_target_filename = 'files/cache/assets/minified/rhymix.min.js';
if(file_exists(\RX_BASEDIR . $concat_target_filename)) if(file_exists(\RX_BASEDIR . $concat_target_filename))
{ {
@ -582,14 +596,14 @@ class HTMLDisplayHandler
} }
if($concat_target_mtime > $original_mtime) if($concat_target_mtime > $original_mtime)
{ {
Context::loadFile(array('./' . $concat_target_filename, 'head', '', -100000), true); Context::loadFile(array('./' . $concat_target_filename, 'head', '', -1500000000), true);
return; return;
} }
} }
Rhymix\Framework\Formatter::minifyJS(array_map(function($str) { Rhymix\Framework\Formatter::minifyJS(array_map(function($str) {
return \RX_BASEDIR . 'common/js/' . $str . '.js'; return \RX_BASEDIR . 'common/js/' . $str . '.js';
}, $original_file_list), \RX_BASEDIR . $concat_target_filename); }, $original_file_list), \RX_BASEDIR . $concat_target_filename);
Context::loadFile(array('./' . $concat_target_filename, 'head', '', -100000), true); Context::loadFile(array('./' . $concat_target_filename, 'head', '', -1500000000), true);
} }
} }
} }

25
classes/frontendfile/FrontEndFileHandler.class.php
View file

@ -93,12 +93,27 @@ class FrontEndFileHandler extends Handler
{ {
$args = array($args); $args = array($args);
} }
$args[0] = preg_replace(array_keys(HTMLDisplayHandler::$replacements), array_values(HTMLDisplayHandler::$replacements), $args[0]);
$isCommon = preg_match(HTMLDisplayHandler::$reservedCSS, $args[0]) || preg_match(HTMLDisplayHandler::$reservedJS, $args[0]); // Replace obsolete paths with current paths.
if($args[3] > -1500000 && $isCommon) $args[0] = preg_replace(array_keys(HTMLDisplayHandler::$replacements), array_values(HTMLDisplayHandler::$replacements), $args[0]);
$isCommon = preg_match(HTMLDisplayHandler::$reservedCSS, $args[0]) || preg_match(HTMLDisplayHandler::$reservedJS, $args[0]);
// Prevent overwriting common scripts.
if(intval($args[3]) > -1500000000)
{ {
return; if($isCommon)
} {
return;
}
foreach(HTMLDisplayHandler::$blockedScripts as $regexp)
{
if(preg_match($regexp, $args[0]))
{
return;
}
}
}
$file = $this->getFileInfo($args[0], $args[2], $args[1], $args[4], $isCommon); $file = $this->getFileInfo($args[0], $args[2], $args[1], $args[4], $isCommon);
$file->index = (int)$args[3]; $file->index = (int)$args[3];

28
tests/unit/classes/FrontEndFileHandlerTest.php
View file

@ -236,6 +236,34 @@ class FrontEndFileHandlerTest extends \Codeception\TestCase\Test
$this->assertEquals($expected, $handler->getCssFileList()); $this->assertEquals($expected, $handler->getCssFileList());
}); });
$this->specify("path conversion", function() {
$handler = new FrontEndFileHandler();
$handler->loadFile(array('./common/xeicon/xeicon.min.css'));
$result = $handler->getCssFileList();
$this->assertEquals('/rhymix/common/css/xeicon/xeicon.min.css' . $this->_filemtime('common/css/xeicon/xeicon.min.css'), $result[0]['file']);
$this->assertEquals('all', $result[0]['media']);
$this->assertEmpty($result[0]['targetie']);
});
$this->specify("blocked scripts", function() {
$handler = new FrontEndFileHandler();
$handler->loadFile(array('./common/css/mobile.css'));
$handler->loadFile(array('./common/css/xe.min.css'));
$handler->loadFile(array('./common/js/common.js'));
$handler->loadFile(array('./common/js/xe.js'));
$handler->loadFile(array('./common/js/xe.min.js'));
$handler->loadFile(array('./common/js/xml2json.js'));
$handler->loadFile(array('./common/js/jquery.js'));
$handler->loadFile(array('./common/js/jquery-1.x.min.js'));
$handler->loadFile(array('./common/js/jquery-2.0.0.js'));
$handler->loadFile(array('./common/js/jQuery.min.js'));
$result = $handler->getCssFileList();
$this->assertEquals(1, count($result));
$this->assertEquals('/rhymix/common/css/mobile.css' . $this->_filemtime('common/css/mobile.css'), $result[0]['file']);
$result = $handler->getJsFileList();
$this->assertEquals(2, count($result));
$this->assertEquals('/rhymix/common/js/common.js' . $this->_filemtime('common/js/common.js'), $result[0]['file']);
$this->assertEquals('/rhymix/common/js/xml2json.js' . $this->_filemtime('common/js/xml2json.js'), $result[1]['file']);
});
} }
} }