X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/58fa7679bccafd00f9a50bcd4a87e96876331b03..refs/pull/3365/head:/tests/Entity/PageContentTest.php diff --git a/tests/Entity/PageContentTest.php b/tests/Entity/PageContentTest.php index f1462dbd0..b9680d23f 100644 --- a/tests/Entity/PageContentTest.php +++ b/tests/Entity/PageContentTest.php @@ -1,7 +1,9 @@ -first(); + /** @var Page $secondPage */ $secondPage = Page::query()->where('id', '!=', $page->id)->first(); $content = '
test
'; @@ -70,9 +74,26 @@ class PageContentTest extends TestCase $page->html = "{{@{$secondPage->id}#table}}"; $page->save(); - $this->asEditor(); - $pageResp = $this->get($page->getUrl()); - $pageResp->assertSee($content); + $pageResp = $this->asEditor()->get($page->getUrl()); + $pageResp->assertSee($content, false); + } + + public function test_page_includes_do_not_break_code() + { + /** @var Page $page */ + $page = Page::query()->first(); + /** @var Page $secondPage */ + $secondPage = Page::query()->where('id', '!=', $page->id)->first(); + + $content = '
var cat = null;
'; + $secondPage->html = $content; + $secondPage->save(); + + $page->html = "{{@{$secondPage->id}#bkmrk-code}}"; + $page->save(); + + $pageResp = $this->asEditor()->get($page->getUrl()); + $pageResp->assertSee($content, false); } public function test_page_includes_rendered_on_book_export() @@ -104,7 +125,7 @@ class PageContentTest extends TestCase $pageView = $this->get($page->getUrl()); $pageView->assertStatus(200); - $pageView->assertDontSee($script); + $pageView->assertDontSee($script, false); $pageView->assertSee('abc123abc123'); } @@ -131,17 +152,28 @@ class PageContentTest extends TestCase $pageView->assertElementNotContains('.page-content', ''); } - } - public function test_iframe_js_and_base64_urls_are_removed() + public function test_js_and_base64_src_urls_are_removed() { $checks = [ '', + '', + '', '', '', + '', '', - '' + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', ]; $this->asEditor(); @@ -154,20 +186,22 @@ class PageContentTest extends TestCase $pageView = $this->get($page->getUrl()); $pageView->assertStatus(200); $pageView->assertElementNotContains('.page-content', ''); $pageView->assertElementNotContains('.page-content', 'src='); $pageView->assertElementNotContains('.page-content', 'javascript:'); $pageView->assertElementNotContains('.page-content', 'data:'); $pageView->assertElementNotContains('.page-content', 'base64'); } - } public function test_javascript_uri_links_are_removed() { $checks = [ ''); + $pageView->assertElementNotContains('.page-content', 'assertElementNotContains('.page-content', 'href=javascript:'); } } + public function test_form_actions_with_javascript_are_removed() { $checks = [ '
', + '
', '
', - '
' + '
', + '
', ]; $this->asEditor(); @@ -207,11 +244,13 @@ class PageContentTest extends TestCase $pageView->assertElementNotContains('.page-content', 'formaction=javascript:'); } } - + public function test_metadata_redirects_are_removed() { $checks = [ '', + '', + '', ]; $this->asEditor(); @@ -229,6 +268,7 @@ class PageContentTest extends TestCase $pageView->assertElementNotContains('.page-content', 'external_url'); } } + public function test_page_inline_on_attributes_removed_by_default() { $this->asEditor(); @@ -239,19 +279,21 @@ class PageContentTest extends TestCase $pageView = $this->get($page->getUrl()); $pageView->assertStatus(200); - $pageView->assertDontSee($script); - $pageView->assertSee('

Hello

'); + $pageView->assertDontSee($script, false); + $pageView->assertSee('

Hello

', false); } public function test_more_complex_inline_on_attributes_escaping_scenarios() { $checks = [ '

Hello

', + '

Hello

', '
Lorem ipsum dolor sit amet.

Hello

', '
Lorem ipsum dolor sit amet.

Hello

', '
Lorem ipsum dolor sit amet.

Hello

', '
Lorem ipsum dolor sit amet.

Hello

', '
xss link\', ]; $this->asEditor(); @@ -265,7 +307,6 @@ class PageContentTest extends TestCase $pageView->assertStatus(200); $pageView->assertElementNotContains('.page-content', 'onclick'); } - } public function test_page_content_scripts_show_when_configured() @@ -279,10 +320,32 @@ class PageContentTest extends TestCase $page->save(); $pageView = $this->get($page->getUrl()); - $pageView->assertSee($script); + $pageView->assertSee($script, false); $pageView->assertDontSee('abc123abc123'); } + public function test_svg_xlink_hrefs_are_removed() + { + $checks = [ + '', + '', + ]; + + $this->asEditor(); + $page = Page::query()->first(); + + foreach ($checks as $check) { + $page->html = $check; + $page->save(); + + $pageView = $this->get($page->getUrl()); + $pageView->assertStatus(200); + $pageView->assertElementNotContains('.page-content', 'alert'); + $pageView->assertElementNotContains('.page-content', 'xlink:href'); + $pageView->assertElementNotContains('.page-content', 'application/xml'); + } + } + public function test_page_inline_on_attributes_show_if_configured() { $this->asEditor(); @@ -294,8 +357,8 @@ class PageContentTest extends TestCase $page->save(); $pageView = $this->get($page->getUrl()); - $pageView->assertSee($script); - $pageView->assertDontSee('

Hello

'); + $pageView->assertSee($script, false); + $pageView->assertDontSee('

Hello

', false); } public function test_duplicate_ids_does_not_break_page_render() @@ -308,7 +371,7 @@ class PageContentTest extends TestCase $pageA->html = $content; $pageA->save(); - $pageB->html = '

{{@'. $pageA->id .'#test}}

'; + $pageB->html = '

{{@' . $pageA->id . '#test}}

'; $pageB->save(); $pageView = $this->get($pageB->getUrl()); @@ -322,14 +385,14 @@ class PageContentTest extends TestCase $content = ''; $pageSave = $this->put($page->getUrl(), [ - 'name' => $page->name, - 'html' => $content, - 'summary' => '' + 'name' => $page->name, + 'html' => $content, + 'summary' => '', ]); $pageSave->assertRedirect(); $updatedPage = Page::query()->where('id', '=', $page->id)->first(); - $this->assertEquals(substr_count($updatedPage->html, "bkmrk-test\""), 1); + $this->assertEquals(substr_count($updatedPage->html, 'bkmrk-test"'), 1); } public function test_anchors_referencing_non_bkmrk_ids_rewritten_after_save() @@ -339,9 +402,9 @@ class PageContentTest extends TestCase $content = '

test

link

'; $this->put($page->getUrl(), [ - 'name' => $page->name, - 'html' => $content, - 'summary' => '' + 'name' => $page->name, + 'html' => $content, + 'summary' => '', ]); $updatedPage = Page::query()->where('id', '=', $page->id)->first(); @@ -358,21 +421,21 @@ class PageContentTest extends TestCase $this->assertCount(3, $navMap); $this->assertArrayMapIncludes([ 'nodeName' => 'h1', - 'link' => '#testa', - 'text' => 'Hello', - 'level' => 1, + 'link' => '#testa', + 'text' => 'Hello', + 'level' => 1, ], $navMap[0]); $this->assertArrayMapIncludes([ 'nodeName' => 'h2', - 'link' => '#testb', - 'text' => 'There', - 'level' => 2, + 'link' => '#testb', + 'text' => 'There', + 'level' => 2, ], $navMap[1]); $this->assertArrayMapIncludes([ 'nodeName' => 'h3', - 'link' => '#testc', - 'text' => 'Donkey', - 'level' => 3, + 'link' => '#testc', + 'text' => 'Donkey', + 'level' => 3, ], $navMap[2]); } @@ -385,8 +448,8 @@ class PageContentTest extends TestCase $this->assertCount(1, $navMap); $this->assertArrayMapIncludes([ 'nodeName' => 'h1', - 'link' => '#testa', - 'text' => 'Hello' + 'link' => '#testa', + 'text' => 'Hello', ], $navMap[0]); } @@ -399,15 +462,15 @@ class PageContentTest extends TestCase $this->assertCount(3, $navMap); $this->assertArrayMapIncludes([ 'nodeName' => 'h4', - 'level' => 1, + 'level' => 1, ], $navMap[0]); $this->assertArrayMapIncludes([ 'nodeName' => 'h5', - 'level' => 2, + 'level' => 2, ], $navMap[1]); $this->assertArrayMapIncludes([ 'nodeName' => 'h6', - 'level' => 3, + 'level' => 3, ], $navMap[2]); } @@ -436,7 +499,7 @@ class PageContentTest extends TestCase | Paragraph | Text |'; $this->put($page->getUrl(), [ 'name' => $page->name, 'markdown' => $content, - 'html' => '', 'summary' => '' + 'html' => '', 'summary' => '', ]); $page->refresh(); @@ -455,7 +518,7 @@ class PageContentTest extends TestCase - [x] Item b'; $this->put($page->getUrl(), [ 'name' => $page->name, 'markdown' => $content, - 'html' => '', 'summary' => '' + 'html' => '', 'summary' => '', ]); $page->refresh(); @@ -463,7 +526,8 @@ class PageContentTest extends TestCase $this->assertStringContainsString('type="checkbox"', $page->html); $pageView = $this->get($page->getUrl()); - $pageView->assertElementExists('.page-content input[type=checkbox]'); + $pageView->assertElementExists('.page-content li.task-list-item input[type=checkbox]'); + $pageView->assertElementExists('.page-content li.task-list-item input[type=checkbox][checked=checked]'); } public function test_page_markdown_strikethrough_rendering() @@ -474,7 +538,7 @@ class PageContentTest extends TestCase $content = '~~some crossed out text~~'; $this->put($page->getUrl(), [ 'name' => $page->name, 'markdown' => $content, - 'html' => '', 'summary' => '' + 'html' => '', 'summary' => '', ]); $page->refresh(); @@ -492,7 +556,7 @@ class PageContentTest extends TestCase $content = ''; $this->put($page->getUrl(), [ 'name' => $page->name, 'markdown' => $content, - 'html' => '', 'summary' => '' + 'html' => '', 'summary' => '', ]); $page->refresh(); @@ -500,7 +564,7 @@ class PageContentTest extends TestCase $pageView = $this->get($page->getUrl()); $pageView->assertStatus(200); - $pageView->assertSee($content); + $pageView->assertSee($content, false); } public function test_base64_images_get_extracted_from_page_content() @@ -510,7 +574,7 @@ class PageContentTest extends TestCase $this->put($page->getUrl(), [ 'name' => $page->name, 'summary' => '', - 'html' => '

test

', + 'html' => '

test

', ]); $page->refresh(); @@ -534,7 +598,7 @@ class PageContentTest extends TestCase $base64PngWithoutWhitespace = 'iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQAB'; $this->put($page->getUrl(), [ 'name' => $page->name, 'summary' => '', - 'html' => '

test

', + 'html' => '

test

', ]); $page->refresh(); @@ -549,17 +613,122 @@ class PageContentTest extends TestCase $this->deleteImage($imagePath); } - public function test_base64_images_blanked_if_not_supported_extension_for_extract() + public function test_base64_images_within_html_blanked_if_not_supported_extension_for_extract() + { + // Relevant to https://github.com/BookStackApp/BookStack/issues/3010 and other cases + $extensions = [ + 'jiff', 'pngr', 'png ', ' png', '.png', 'png.', 'p.ng', ',png', + 'data:image/png', ',data:image/png', + ]; + + foreach ($extensions as $extension) { + $this->asEditor(); + $page = Page::query()->first(); + + $this->put($page->getUrl(), [ + 'name' => $page->name, 'summary' => '', + 'html' => '

test

', + ]); + + $page->refresh(); + $this->assertStringContainsString('html); + } + } + + public function test_base64_images_get_extracted_from_markdown_page_content() { $this->asEditor(); $page = Page::query()->first(); $this->put($page->getUrl(), [ - 'name' => $page->name, 'summary' => '', - 'html' => '

test

', + 'name' => $page->name, 'summary' => '', + 'markdown' => 'test ![test](data:image/jpeg;base64,' . $this->base64Jpeg . ')', + ]); + + $page->refresh(); + $this->assertStringMatchesFormat('%Atest test%A

%A', $page->html); + + $matches = []; + preg_match('/src="https:\/\/p.rizon.top:443\/http\/localhost(.*?)"/', $page->html, $matches); + $imagePath = $matches[1]; + $imageFile = public_path($imagePath); + $this->assertEquals(base64_decode($this->base64Jpeg), file_get_contents($imageFile)); + + $this->deleteImage($imagePath); + } + + public function test_markdown_base64_extract_not_limited_by_pcre_limits() + { + $pcreBacktrackLimit = ini_get('pcre.backtrack_limit'); + $pcreRecursionLimit = ini_get('pcre.recursion_limit'); + + $this->asEditor(); + $page = Page::query()->first(); + + ini_set('pcre.backtrack_limit', '500'); + ini_set('pcre.recursion_limit', '500'); + + $content = str_repeat('a', 5000); + $base64Content = base64_encode($content); + + $this->put($page->getUrl(), [ + 'name' => $page->name, 'summary' => '', + 'markdown' => 'test ![test](data:image/jpeg;base64,' . $base64Content . ') ![test](data:image/jpeg;base64,' . $base64Content . ')', ]); $page->refresh(); - $this->assertStringContainsString('html); + $this->assertStringMatchesFormat('test test test%A

%A', $page->html); + + $matches = []; + preg_match('/src="https:\/\/p.rizon.top:443\/http\/localhost(.*?)"/', $page->html, $matches); + $imagePath = $matches[1]; + $imageFile = public_path($imagePath); + $this->assertEquals($content, file_get_contents($imageFile)); + + $this->deleteImage($imagePath); + ini_set('pcre.backtrack_limit', $pcreBacktrackLimit); + ini_set('pcre.recursion_limit', $pcreRecursionLimit); + } + + public function test_base64_images_within_markdown_blanked_if_not_supported_extension_for_extract() + { + $page = Page::query()->first(); + + $this->asEditor()->put($page->getUrl(), [ + 'name' => $page->name, 'summary' => '', + 'markdown' => 'test ![test](data:image/jiff;base64,' . $this->base64Jpeg . ')', + ]); + + $this->assertStringContainsString('refresh()->html); + } + + public function test_nested_headers_gets_assigned_an_id() + { + $page = Page::query()->first(); + + $content = '
Simple Test
'; + $this->asEditor()->put($page->getUrl(), [ + 'name' => $page->name, + 'html' => $content, + ]); + + // The top level node will get assign the bkmrk-simple-test id because the system will + // take the node value of h5 + // So the h5 should get the bkmrk-simple-test-1 id + $this->assertStringContainsString('
Simple Test
', $page->refresh()->html); + } + + public function test_non_breaking_spaces_are_preserved() + { + /** @var Page $page */ + $page = Page::query()->first(); + + $content = '

 

'; + $this->asEditor()->put($page->getUrl(), [ + 'name' => $page->name, + 'html' => $content, + ]); + + $this->assertStringContainsString('

 

', $page->refresh()->html); } }