X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/e66ddbc17b9d16a8615eb7735342296274a3cfa8..refs/pull/5721/head:/tests/Entity/PageContentTest.php diff --git a/tests/Entity/PageContentTest.php b/tests/Entity/PageContentTest.php index 86abadf14..23a38b573 100644 --- a/tests/Entity/PageContentTest.php +++ b/tests/Entity/PageContentTest.php @@ -1,16 +1,19 @@ -id)->first(); + $page = $this->entities->page(); + $secondPage = $this->entities->page(); $secondPage->html = "
Hello, This is a test
This is a second block of content
"; $secondPage->save(); @@ -38,8 +41,8 @@ class PageContentTest extends TestCase public function test_saving_page_with_includes() { - $page = Page::first(); - $secondPage = Page::where('id', '!=', $page->id)->first(); + $page = $this->entities->page(); + $secondPage = $this->entities->page(); $this->asEditor(); $includeTag = '{{@' . $secondPage->id . '}}'; @@ -50,97 +53,766 @@ class PageContentTest extends TestCase $resp->assertStatus(302); $page = Page::find($page->id); - $this->assertContains($includeTag, $page->html); + $this->assertStringContainsString($includeTag, $page->html); $this->assertEquals('', $page->text); } - public function test_page_includes_do_not_break_tables() + public function test_page_includes_rendered_on_book_export() { - $page = Page::first(); - $secondPage = Page::where('id', '!=', $page->id)->first(); + $page = $this->entities->page(); + $secondPage = Page::query() + ->where('book_id', '!=', $page->book_id) + ->first(); - $content = 'test |
my cat is awesome and scratchy
'; $secondPage->html = $content; $secondPage->save(); - $page->html = "{{@{$secondPage->id}#table}}"; + $page->html = "{{@{$secondPage->id}#bkmrk-meow}}"; $page->save(); $this->asEditor(); - $pageResp = $this->get($page->getUrl()); - $pageResp->assertSee($content); + $htmlContent = $this->get($page->book->getUrl('/export/html')); + $htmlContent->assertSee('my cat is awesome and scratchy'); } - public function test_page_revision_views_viewable() + public function test_page_includes_can_be_nested_up_to_three_times() + { + $page = $this->entities->page(); + $tag = "{{@{$page->id}#bkmrk-test}}"; + $page->html = 'Hello Barry ' . $tag . '
'; + $page->save(); + + $pageResp = $this->asEditor()->get($page->getUrl()); + $this->withHtml($pageResp)->assertElementContains('#bkmrk-test', 'Hello Barry Hello Barry Hello Barry Hello Barry ' . $tag); + $this->withHtml($pageResp)->assertElementNotContains('#bkmrk-test', 'Hello Barry Hello Barry Hello Barry Hello Barry Hello Barry ' . $tag); + } + + public function test_page_includes_to_nonexisting_pages_does_not_error() + { + $page = $this->entities->page(); + $missingId = Page::query()->max('id') + 1; + $tag = "{{@{$missingId}}}"; + $page->html = 'Hello Barry ' . $tag . '
'; + $page->save(); + + $pageResp = $this->asEditor()->get($page->getUrl()); + $pageResp->assertOk(); + $pageResp->assertSee('Hello Barry'); + } + + public function test_page_content_scripts_removed_by_default() { $this->asEditor(); + $page = $this->entities->page(); + $script = 'abc123abc123'; + $page->html = "escape {$script}"; + $page->save(); - $pageRepo = app(PageRepo::class); - $page = Page::first(); - $pageRepo->updatePage($page, $page->book_id, ['name' => 'updated page', 'html' => 'new content
', 'summary' => 'page revision testing']); - $pageRevision = $page->revisions->last(); + $pageView = $this->get($page->getUrl()); + $pageView->assertStatus(200); + $pageView->assertDontSee($script, false); + $pageView->assertSee('abc123abc123'); + } + + 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 = $this->entities->page(); - $revisionView = $this->get($page->getUrl() . '/revisions/' . $pageRevision->id); - $revisionView->assertStatus(200); - $revisionView->assertSee('new content'); + foreach ($checks as $check) { + $page->html = $check; + $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); + $this->withHtml($pageView)->assertElementNotContains('.page-content', ''); + } } - public function test_page_revision_restore_updates_content() + public function test_js_and_base64_src_urls_are_removed() { + $checks = [ + '', + '', + '', + '', + '', + '', + '', + 'new contente def456
', 'summary' => 'initial page revision testing']); - $pageRepo->updatePage($page, $page->book_id, ['name' => 'updated page again', 'html' => 'new content
', 'summary' => 'page revision testing']); - $page = Page::find($page->id); + public function test_javascript_uri_links_are_removed() + { + $checks = [ + 'withHtml($pageView)->assertElementNotContains('.page-content', 'href=javascript:'); + } + } - $restoreReq->assertStatus(302); - $restoreReq->assertRedirect($page->getUrl()); + public function test_form_actions_with_javascript_are_removed() + { + $checks = [ + '', + '', + '', + '', + '', + ]; - $pageView = $this->get($page->getUrl()); - $pageView->assertSee('abc123'); - $pageView->assertSee('def456'); + $this->asEditor(); + $page = $this->entities->page(); + + foreach ($checks as $check) { + $page->html = $check; + $page->save(); + + $pageView = $this->get($page->getUrl()); + $pageView->assertStatus(200); + $this->withHtml($pageView)->assertElementNotContains('.page-content', '