X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/0372efa89a059e55eb0179186b15a012d6196874..refs/pull/2393/head:/tests/Entity/PageContentTest.php diff --git a/tests/Entity/PageContentTest.php b/tests/Entity/PageContentTest.php index 8b0e180da..51a8568bf 100644 --- a/tests/Entity/PageContentTest.php +++ b/tests/Entity/PageContentTest.php @@ -1,7 +1,8 @@ -id)->first(); + $this->asEditor(); - $page->html = "

{{@$secondPage->id}}

"; + $includeTag = '{{@' . $secondPage->id . '}}'; + $page->html = '

' . $includeTag . '

'; $resp = $this->put($page->getUrl(), ['name' => $page->name, 'html' => $page->html, 'summary' => '']); $resp->assertStatus(302); $page = Page::find($page->id); - $this->assertContains("{{@$secondPage->id}}", $page->html); + $this->assertStringContainsString($includeTag, $page->html); + $this->assertEquals('', $page->text); } public function test_page_includes_do_not_break_tables() @@ -67,62 +71,197 @@ class PageContentTest extends TestCase $pageResp->assertSee($content); } - public function test_page_revision_views_viewable() + public function test_page_includes_rendered_on_book_export() { + $page = Page::query()->first(); + $secondPage = Page::query() + ->where('book_id', '!=', $page->book_id) + ->first(); + + $content = '

my cat is awesome and scratchy

'; + $secondPage->html = $content; + $secondPage->save(); + + $page->html = "{{@{$secondPage->id}#bkmrk-meow}}"; + $page->save(); + $this->asEditor(); + $htmlContent = $this->get($page->book->getUrl('/export/html')); + $htmlContent->assertSee('my cat is awesome and scratchy'); + } - $entityRepo = $this->app[EntityRepo::class]; + public function test_page_content_scripts_removed_by_default() + { + $this->asEditor(); $page = Page::first(); - $entityRepo->updatePage($page, $page->book_id, ['name' => 'updated page', 'html' => '

new content

', 'summary' => 'page revision testing']); - $pageRevision = $page->revisions->last(); - - $revisionView = $this->get($page->getUrl() . '/revisions/' . $pageRevision->id); - $revisionView->assertStatus(200); - $revisionView->assertSee('new content'); + $script = 'abc123abc123'; + $page->html = "escape {$script}"; + $page->save(); - $revisionView = $this->get($page->getUrl() . '/revisions/' . $pageRevision->id . '/changes'); - $revisionView->assertStatus(200); - $revisionView->assertSee('new content'); + $pageView = $this->get($page->getUrl()); + $pageView->assertStatus(200); + $pageView->assertDontSee($script); + $pageView->assertSee('abc123abc123'); } - public function test_page_revision_restore_updates_content() + public function test_more_complex_content_script_escaping_scenarios() { + $checks = [ + "

Some script

", + "

Some script

", + "

Some script

", + "

Some script

", + "

Some script

", + "

Some script

", + ]; + $this->asEditor(); + $page = Page::first(); + + foreach ($checks as $check) { + $page->html = $check; + $page->save(); + + $pageView = $this->get($page->getUrl()); + $pageView->assertStatus(200); + $pageView->assertElementNotContains('.page-content', ''); + } - $entityRepo = $this->app[EntityRepo::class]; + } + + public function test_iframe_js_and_base64_urls_are_removed() + { + $checks = [ + '', + '', + '', + '', + '' + ]; + + $this->asEditor(); $page = Page::first(); - $entityRepo->updatePage($page, $page->book_id, ['name' => 'updated page abc123', 'html' => '

new contente def456

', 'summary' => 'initial page revision testing']); - $entityRepo->updatePage($page, $page->book_id, ['name' => 'updated page again', 'html' => '

new content

', 'summary' => 'page revision testing']); - $page = Page::find($page->id); + foreach ($checks as $check) { + $page->html = $check; + $page->save(); - $pageView = $this->get($page->getUrl()); - $pageView->assertDontSee('abc123'); - $pageView->assertDontSee('def456'); + $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'); + } - $revToRestore = $page->revisions()->where('name', 'like', '%abc123')->first(); - $restoreReq = $this->get($page->getUrl() . '/revisions/' . $revToRestore->id . '/restore'); - $page = Page::find($page->id); + } - $restoreReq->assertStatus(302); - $restoreReq->assertRedirect($page->getUrl()); + public function test_javascript_uri_links_are_removed() + { + $checks = [ + ''); + $pageView->assertElementNotContains('.page-content', 'href=javascript:'); + } } + public function test_form_actions_with_javascript_are_removed() + { + $checks = [ + '
', + '
', + '
' + ]; + + $this->asEditor(); + $page = Page::first(); - public function test_page_content_scripts_escaped_by_default() + foreach ($checks as $check) { + $page->html = $check; + $page->save(); + + $pageView = $this->get($page->getUrl()); + $pageView->assertStatus(200); + $pageView->assertElementNotContains('.page-content', '