X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/0bc5ccba3206dd8a70dd89183acbbe8b592ab879..refs/pull/1881/head:/tests/Entity/PageContentTest.php diff --git a/tests/Entity/PageContentTest.php b/tests/Entity/PageContentTest.php index 03cf03956..8a78c8ac0 100644 --- a/tests/Entity/PageContentTest.php +++ b/tests/Entity/PageContentTest.php @@ -1,8 +1,7 @@ assertStatus(302); $page = Page::find($page->id); - $this->assertContains($includeTag, $page->html); + $this->assertStringContainsString($includeTag, $page->html); $this->assertEquals('', $page->text); } @@ -71,17 +70,112 @@ class PageContentTest extends TestCase $pageResp->assertSee($content); } - public function test_page_content_scripts_escaped_by_default() + public function test_page_content_scripts_removed_by_default() { $this->asEditor(); $page = Page::first(); - $script = ''; + $script = 'abc123abc123'; $page->html = "escape {$script}"; $page->save(); $pageView = $this->get($page->getUrl()); + $pageView->assertStatus(200); $pageView->assertDontSee($script); - $pageView->assertSee(htmlentities($script)); + $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 = Page::first(); + + foreach ($checks as $check) { + $page->html = $check; + $page->save(); + + $pageView = $this->get($page->getUrl()); + $pageView->assertStatus(200); + $pageView->assertElementNotContains('.page-content', ''); + } + + } + + public function test_iframe_js_and_base64_urls_are_removed() + { + $checks = [ + '', + '', + '', + '', + '' + ]; + + $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', ''); + $pageView->assertElementNotContains('.page-content', 'src='); + $pageView->assertElementNotContains('.page-content', 'javascript:'); + $pageView->assertElementNotContains('.page-content', 'data:'); + $pageView->assertElementNotContains('.page-content', 'base64'); + } + + } + + public function test_page_inline_on_attributes_removed_by_default() + { + $this->asEditor(); + $page = Page::first(); + $script = 'Hello
'; + $page->html = "escape {$script}"; + $page->save(); + + $pageView = $this->get($page->getUrl()); + $pageView->assertStatus(200); + $pageView->assertDontSee($script); + $pageView->assertSee('Hello
'); + } + + public function test_more_complex_inline_on_attributes_escaping_scenarios() + { + $checks = [ + 'Hello
', + 'Hello
', + 'Hello
Hello
Hello
', + ''; + + $script = 'abc123abc123'; $page->html = "no escape {$script}"; $page->save(); $pageView = $this->get($page->getUrl()); $pageView->assertSee($script); - $pageView->assertDontSee(htmlentities($script)); + $pageView->assertDontSee('abc123abc123'); + } + + public function test_page_inline_on_attributes_show_if_configured() + { + $this->asEditor(); + $page = Page::first(); + config()->push('app.allow_content_scripts', 'true'); + + $script = 'Hello
'; + $page->html = "escape {$script}"; + $page->save(); + + $pageView = $this->get($page->getUrl()); + $pageView->assertSee($script); + $pageView->assertDontSee('Hello
'); } public function test_duplicate_ids_does_not_break_page_render() @@ -120,7 +230,7 @@ class PageContentTest extends TestCase $this->asEditor(); $page = Page::first(); - $content = 'test a
'."\n".'test b
'; + $content = '