tonyair
/
silverstripe-framework
mirror of https://github.com/silverstripe/silverstripe-framework
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #9509 from brettt89/pulls/url_generator_nonce_sha1_md5

This commit is contained in:
Guy Marriott 2020-05-12 10:10:16 -07:00 committed by GitHub
parent 6fe74fb41b 1d19051c10
commit e5d0400596
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 42 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/Control/SimpleResourceURLGenerator.php
View File

@ -50,8 +50,8 @@ class SimpleResourceURLGenerator implements ResourceURLGenerator
*/
public function setNonceStyle($nonceStyle)
{
if ($nonceStyle && $nonceStyle !== 'mtime') {
throw new InvalidArgumentException('The only allowed NonceStyle is mtime');
if ($nonceStyle && !in_array($nonceStyle, ['mtime', 'sha1', 'md5'])) {
throw new InvalidArgumentException("NonceStyle '$nonceStyle' is not supported");
}
$this->nonceStyle = $nonceStyle;
return $this;
@ -104,12 +104,20 @@ class SimpleResourceURLGenerator implements ResourceURLGenerator
if ($this->nonceStyle && $exists && is_file($absolutePath)) {
switch ($this->nonceStyle) {
case 'mtime':
if ($query) {
$query .= '&';
}
$query .= "m=" . filemtime($absolutePath);
$method = 'filemtime';
break;
case 'sha1':
$method = 'sha1_file';
break;
case 'md5':
$method = 'md5_file';
break;
}
if ($query) {
$query .= '&';
}
$query .= "m=" . call_user_func($method, $absolutePath);
}
// Add back querystring

28
tests/php/Control/SimpleResourceURLGeneratorTest.php
View File

@ -41,6 +41,34 @@ class SimpleResourceURLGeneratorTest extends SapphireTest
);
}
public function testAddSha1()
{
/** @var SimpleResourceURLGenerator $generator */
$generator = Injector::inst()->get(ResourceURLGenerator::class);
$generator->setNonceStyle('sha1');
$hash = sha1_file(
__DIR__ . '/SimpleResourceURLGeneratorTest/_fakewebroot/basemodule/client/file.js'
);
$this->assertEquals(
'/' . RESOURCES_DIR . '/basemodule/client/file.js?m=' . $hash,
$generator->urlForResource('basemodule/client/file.js')
);
}
public function testAddMd5()
{
/** @var SimpleResourceURLGenerator $generator */
$generator = Injector::inst()->get(ResourceURLGenerator::class);
$generator->setNonceStyle('md5');
$hash = md5_file(
__DIR__ . '/SimpleResourceURLGeneratorTest/_fakewebroot/basemodule/client/file.js'
);
$this->assertEquals(
'/' . RESOURCES_DIR . '/basemodule/client/file.js?m=' . $hash,
$generator->urlForResource('basemodule/client/file.js')
);
}
public function testVendorResource()
{
/** @var SimpleResourceURLGenerator $generator */