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: more tests, improved paths detection, readability

Browse Source
This commit is contained in:
Sergey Shevchenko 2022-08-02 21:39:31 +12:00
parent 9854e48cfc
commit bc9a323418
3 changed files with 41 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/View/Requirements_Backend.php
View File

@ -19,6 +19,7 @@ use SilverStripe\Dev\Debug;
use SilverStripe\Dev\Deprecation; use SilverStripe\Dev\Deprecation;
use SilverStripe\i18n\i18n; use SilverStripe\i18n\i18n;
use SilverStripe\ORM\FieldType\DBField; use SilverStripe\ORM\FieldType\DBField;
use Symfony\Component\Filesystem\Path as FilesystemPath;
class Requirements_Backend class Requirements_Backend
{ {
@ -1454,19 +1455,12 @@ MESSAGE
} }
$fileUrl = Injector::inst()->get(ResourceURLGenerator::class)->urlForResource($filePath); $fileUrl = Injector::inst()->get(ResourceURLGenerator::class)->urlForResource($filePath);
$fileUrlDir = dirname($fileUrl); $fileUrlDir = dirname($fileUrl);
$content = preg_replace_callback('#([\s\'"\(])((:?[\.]{1,2}/)+)#', function ($a) use ($fileUrlDir) { $content = preg_replace_callback('#(url\([\n\r\s\'"]*)([^\s\)\?\'"]+)#i', function ($match) use ($fileUrlDir) {
[ $_, $prefix, $match ] = $a; [ $_, $prefix, $relativePath ] = $match;
$full = $fileUrlDir . '/' . $match; if ($relativePath[0] === '/' || false !== strpos($relativePath, '://')) {
$full = preg_replace('#/{2,}#', '/', $full); // ensure there's no repeated slashes return $prefix . $relativePath;
while (strpos($full, './') > 0) {
$post = $full;
$post = preg_replace('#([^/\.]+)/\.\./#', '', $post); // erase 'something/../' with the predecessor
$post = preg_replace('#([^/\.]+)/\./#', '\\1/', $post); // erase './'
if ($post == $full) {
break; // nothing changed
}
$full = $post;
} }
$full = FilesystemPath::canonicalize($fileUrlDir . '/' . $relativePath);
return $prefix . $full; return $prefix . $full;
}, $content); }, $content);
return $content; return $content;

34
tests/php/View/RequirementsTest.php
View File

@ -164,6 +164,13 @@ class RequirementsTest extends SapphireTest
$content = file_get_contents($combinedFilePath); $content = file_get_contents($combinedFilePath);
/* COMBINED CSS URL RESOLVER IGNORE FULL URLS */
$this->assertStringContainsString(
".url { background: url(http://example.com/zero.gif); }",
$content,
'combined css url resolver ignore full urls'
);
/* COMBINED CSS URL RESOLVER DECODED ONE DOT */ /* COMBINED CSS URL RESOLVER DECODED ONE DOT */
$this->assertStringContainsString( $this->assertStringContainsString(
".p0 { background: url(/css/deep/deeper/zero.gif); }", ".p0 { background: url(/css/deep/deeper/zero.gif); }",
@ -171,6 +178,20 @@ class RequirementsTest extends SapphireTest
'combined css url resolver decoded one dot' 'combined css url resolver decoded one dot'
); );
/* COMBINED CSS URL RESOLVER DECODED NO DOTS */
$this->assertStringContainsString(
".p0-plain { background: url(/css/deep/deeper/zero.gif); }",
$content,
'combined css url resolver decoded no dots'
);
/* COMBINED CSS URL RESOLVER DAMAGED A QUERYSTRING */
$this->assertStringContainsString(
".p0-qs { background: url(/css/deep/deeper/zero.gif?some=param); }",
$content,
'combined css url resolver damaged a querystring'
);
/* COMBINED CSS URL RESOLVER DECODED ONE DOT WITH SINGLE QUOTES */ /* COMBINED CSS URL RESOLVER DECODED ONE DOT WITH SINGLE QUOTES */
$this->assertStringContainsString( $this->assertStringContainsString(
".p0sq { background: url('/css/deep/deeper/zero-sq.gif'); }", ".p0sq { background: url('/css/deep/deeper/zero-sq.gif'); }",
@ -255,11 +276,18 @@ class RequirementsTest extends SapphireTest
'combined css url resolver decoded 3 double-dot' 'combined css url resolver decoded 3 double-dot'
); );
/* COMBINED CSS URL RESOLVER DECODED 4 DOUBLE-DOT */ /* COMBINED CSS URL RESOLVER DECODED 4 DOUBLE-DOT WHEN ONLY 3 LEVELS AVAILABLE*/
$this->assertStringContainsString( $this->assertStringContainsString(
".p4 { background: url(/../four.gif); }", ".p4 { background: url(/four.gif); }",
$content, $content,
'combined css url resolver decoded 4 double-dot' 'combined css url resolver decoded 4 double-dot when only 4 levels available'
);
/* COMBINED CSS URL RESOLVER MODIFIED AN ARBITRARY VALUE */
$this->assertStringContainsString(
".weird { content: \"./keepme.gif\"; }",
$content,
'combined css url resolver modified an arbitrary value'
); );
} }

4
tests/php/View/SSViewerTest/public/css/deep/deeper/RequirementsTest_p.css
View File

@ -1,4 +1,7 @@
.url { background: url(http://example.com/zero.gif); } /* don't touch this */
.p0 { background: url(./zero.gif); } .p0 { background: url(./zero.gif); }
.p0-plain { background: url(zero.gif); }
.p0-qs { background: url(./zero.gif?some=param); } /* keep the query string */
.p0-nl { background: url( .p0-nl { background: url(
./zero-nl.gif ); ./zero-nl.gif );
} }
@ -20,3 +23,4 @@
.p2dq { background: url("../../two-dq.gif"); } .p2dq { background: url("../../two-dq.gif"); }
.p3 { background: url(../../../three.gif); } .p3 { background: url(../../../three.gif); }
.p4 { background: url(../../../../four.gif); } .p4 { background: url(../../../../four.gif); }
.weird { content: "./keepme.gif"; }