X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/f8c16494fd3d8ed8f38742f026eb26fbcafd338b..refs/pull/3918/head:/tests/Entity/PageContentTest.php

diff --git a/tests/Entity/PageContentTest.php b/tests/Entity/PageContentTest.php
index 9524186c8..0c9854206 100644
--- a/tests/Entity/PageContentTest.php
+++ b/tests/Entity/PageContentTest.php
@@ -15,8 +15,8 @@ class PageContentTest extends TestCase
 
     public function test_page_includes()
     {
-        $page = Page::query()->first();
-        $secondPage = Page::query()->where('id', '!=', $page->id)->first();
+        $page = $this->entities->page();
+        $secondPage = $this->entities->page();
 
         $secondPage->html = "<p id='section1'>Hello, This is a test</p><p id='section2'>This is a second block of content</p>";
         $secondPage->save();
@@ -44,8 +44,8 @@ class PageContentTest extends TestCase
 
     public function test_saving_page_with_includes()
     {
-        $page = Page::query()->first();
-        $secondPage = Page::query()->where('id', '!=', $page->id)->first();
+        $page = $this->entities->page();
+        $secondPage = $this->entities->page();
 
         $this->asEditor();
         $includeTag = '{{@' . $secondPage->id . '}}';
@@ -62,10 +62,8 @@ class PageContentTest extends TestCase
 
     public function test_page_includes_do_not_break_tables()
     {
-        /** @var Page $page */
-        $page = Page::query()->first();
-        /** @var Page $secondPage */
-        $secondPage = Page::query()->where('id', '!=', $page->id)->first();
+        $page = $this->entities->page();
+        $secondPage = $this->entities->page();
 
         $content = '<table id="table"><tbody><tr><td>test</td></tr></tbody></table>';
         $secondPage->html = $content;
@@ -80,10 +78,8 @@ class PageContentTest extends TestCase
 
     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();
+        $page = $this->entities->page();
+        $secondPage = $this->entities->page();
 
         $content = '<pre id="bkmrk-code"><code>var cat = null;</code></pre>';
         $secondPage->html = $content;
@@ -98,7 +94,7 @@ class PageContentTest extends TestCase
 
     public function test_page_includes_rendered_on_book_export()
     {
-        $page = Page::query()->first();
+        $page = $this->entities->page();
         $secondPage = Page::query()
             ->where('book_id', '!=', $page->book_id)
             ->first();
@@ -118,7 +114,7 @@ class PageContentTest extends TestCase
     public function test_page_content_scripts_removed_by_default()
     {
         $this->asEditor();
-        $page = Page::query()->first();
+        $page = $this->entities->page();
         $script = 'abc123<script>console.log("hello-test")</script>abc123';
         $page->html = "escape {$script}";
         $page->save();
@@ -141,7 +137,7 @@ class PageContentTest extends TestCase
         ];
 
         $this->asEditor();
-        $page = Page::query()->first();
+        $page = $this->entities->page();
 
         foreach ($checks as $check) {
             $page->html = $check;
@@ -149,8 +145,8 @@ class PageContentTest extends TestCase
 
             $pageView = $this->get($page->getUrl());
             $pageView->assertStatus(200);
-            $pageView->assertElementNotContains('.page-content', '<script>');
-            $pageView->assertElementNotContains('.page-content', '</script>');
+            $this->withHtml($pageView)->assertElementNotContains('.page-content', '<script>');
+            $this->withHtml($pageView)->assertElementNotContains('.page-content', '</script>');
         }
     }
 
@@ -177,7 +173,7 @@ class PageContentTest extends TestCase
         ];
 
         $this->asEditor();
-        $page = Page::query()->first();
+        $page = $this->entities->page();
 
         foreach ($checks as $check) {
             $page->html = $check;
@@ -185,13 +181,14 @@ class PageContentTest extends TestCase
 
             $pageView = $this->get($page->getUrl());
             $pageView->assertStatus(200);
-            $pageView->assertElementNotContains('.page-content', '<iframe>');
-            $pageView->assertElementNotContains('.page-content', '<img');
-            $pageView->assertElementNotContains('.page-content', '</iframe>');
-            $pageView->assertElementNotContains('.page-content', 'src=');
-            $pageView->assertElementNotContains('.page-content', 'javascript:');
-            $pageView->assertElementNotContains('.page-content', 'data:');
-            $pageView->assertElementNotContains('.page-content', 'base64');
+            $html = $this->withHtml($pageView);
+            $html->assertElementNotContains('.page-content', '<iframe>');
+            $html->assertElementNotContains('.page-content', '<img');
+            $html->assertElementNotContains('.page-content', '</iframe>');
+            $html->assertElementNotContains('.page-content', 'src=');
+            $html->assertElementNotContains('.page-content', 'javascript:');
+            $html->assertElementNotContains('.page-content', 'data:');
+            $html->assertElementNotContains('.page-content', 'base64');
         }
     }
 
@@ -205,7 +202,7 @@ class PageContentTest extends TestCase
         ];
 
         $this->asEditor();
-        $page = Page::query()->first();
+        $page = $this->entities->page();
 
         foreach ($checks as $check) {
             $page->html = $check;
@@ -213,8 +210,8 @@ class PageContentTest extends TestCase
 
             $pageView = $this->get($page->getUrl());
             $pageView->assertStatus(200);
-            $pageView->assertElementNotContains('.page-content', '<a id="xss"');
-            $pageView->assertElementNotContains('.page-content', 'href=javascript:');
+            $this->withHtml($pageView)->assertElementNotContains('.page-content', '<a id="xss"');
+            $this->withHtml($pageView)->assertElementNotContains('.page-content', 'href=javascript:');
         }
     }
 
@@ -229,7 +226,7 @@ class PageContentTest extends TestCase
         ];
 
         $this->asEditor();
-        $page = Page::query()->first();
+        $page = $this->entities->page();
 
         foreach ($checks as $check) {
             $page->html = $check;
@@ -237,11 +234,11 @@ class PageContentTest extends TestCase
 
             $pageView = $this->get($page->getUrl());
             $pageView->assertStatus(200);
-            $pageView->assertElementNotContains('.page-content', '<button id="xss"');
-            $pageView->assertElementNotContains('.page-content', '<input id="xss"');
-            $pageView->assertElementNotContains('.page-content', '<form id="xss"');
-            $pageView->assertElementNotContains('.page-content', 'action=javascript:');
-            $pageView->assertElementNotContains('.page-content', 'formaction=javascript:');
+            $this->withHtml($pageView)->assertElementNotContains('.page-content', '<button id="xss"');
+            $this->withHtml($pageView)->assertElementNotContains('.page-content', '<input id="xss"');
+            $this->withHtml($pageView)->assertElementNotContains('.page-content', '<form id="xss"');
+            $this->withHtml($pageView)->assertElementNotContains('.page-content', 'action=javascript:');
+            $this->withHtml($pageView)->assertElementNotContains('.page-content', 'formaction=javascript:');
         }
     }
 
@@ -254,7 +251,7 @@ class PageContentTest extends TestCase
         ];
 
         $this->asEditor();
-        $page = Page::query()->first();
+        $page = $this->entities->page();
 
         foreach ($checks as $check) {
             $page->html = $check;
@@ -262,17 +259,17 @@ class PageContentTest extends TestCase
 
             $pageView = $this->get($page->getUrl());
             $pageView->assertStatus(200);
-            $pageView->assertElementNotContains('.page-content', '<meta>');
-            $pageView->assertElementNotContains('.page-content', '</meta>');
-            $pageView->assertElementNotContains('.page-content', 'content=');
-            $pageView->assertElementNotContains('.page-content', 'external_url');
+            $this->withHtml($pageView)->assertElementNotContains('.page-content', '<meta>');
+            $this->withHtml($pageView)->assertElementNotContains('.page-content', '</meta>');
+            $this->withHtml($pageView)->assertElementNotContains('.page-content', 'content=');
+            $this->withHtml($pageView)->assertElementNotContains('.page-content', 'external_url');
         }
     }
 
     public function test_page_inline_on_attributes_removed_by_default()
     {
         $this->asEditor();
-        $page = Page::query()->first();
+        $page = $this->entities->page();
         $script = '<p onmouseenter="console.log(\'test\')">Hello</p>';
         $page->html = "escape {$script}";
         $page->save();
@@ -297,7 +294,7 @@ class PageContentTest extends TestCase
         ];
 
         $this->asEditor();
-        $page = Page::query()->first();
+        $page = $this->entities->page();
 
         foreach ($checks as $check) {
             $page->html = $check;
@@ -305,14 +302,14 @@ class PageContentTest extends TestCase
 
             $pageView = $this->get($page->getUrl());
             $pageView->assertStatus(200);
-            $pageView->assertElementNotContains('.page-content', 'onclick');
+            $this->withHtml($pageView)->assertElementNotContains('.page-content', 'onclick');
         }
     }
 
     public function test_page_content_scripts_show_when_configured()
     {
         $this->asEditor();
-        $page = Page::query()->first();
+        $page = $this->entities->page();
         config()->push('app.allow_content_scripts', 'true');
 
         $script = 'abc123<script>console.log("hello-test")</script>abc123';
@@ -324,15 +321,21 @@ class PageContentTest extends TestCase
         $pageView->assertDontSee('abc123abc123');
     }
 
-    public function test_svg_xlink_hrefs_are_removed()
+    public function test_svg_script_usage_is_removed()
     {
         $checks = [
             '<svg id="test" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="100" height="100"><a xlink:href="javascript:alert(document.domain)"><rect x="0" y="0" width="100" height="100" /></a></svg>',
             '<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><use xlink:href="data:application/xml;base64 ,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIj4KPGRlZnM+CjxjaXJjbGUgaWQ9InRlc3QiIHI9IjAiIGN4PSIwIiBjeT0iMCIgc3R5bGU9ImZpbGw6ICNGMDAiPgo8c2V0IGF0dHJpYnV0ZU5hbWU9ImZpbGwiIGF0dHJpYnV0ZVR5cGU9IkNTUyIgb25iZWdpbj0nYWxlcnQoZG9jdW1lbnQuZG9tYWluKScKb25lbmQ9J2FsZXJ0KCJvbmVuZCIpJyB0bz0iIzAwRiIgYmVnaW49IjBzIiBkdXI9Ijk5OXMiIC8+CjwvY2lyY2xlPgo8L2RlZnM+Cjx1c2UgeGxpbms6aHJlZj0iI3Rlc3QiLz4KPC9zdmc+#test"/></svg>',
+            '<svg><animate href=#xss attributeName=href values=javascript:alert(1) /></svg>',
+            '<svg><animate href="#xss" attributeName="href" values="a;javascript:alert(1)" /></svg>',
+            '<svg><animate href="#xss" attributeName="href" values="a;data:alert(1)" /></svg>',
+            '<svg><animate href=#xss attributeName=href from=javascript:alert(1) to=1 /><a id=xss><text x=20 y=20>XSS</text></a>',
+            '<svg><set href=#xss attributeName=href from=? to=javascript:alert(1) /><a id=xss><text x=20 y=20>XSS</text></a>',
+            '<svg><g><g><g><animate href=#xss attributeName=href values=javascript:alert(1) /></g></g></g></svg>',
         ];
 
         $this->asEditor();
-        $page = Page::query()->first();
+        $page = $this->entities->page();
 
         foreach ($checks as $check) {
             $page->html = $check;
@@ -340,16 +343,18 @@ class PageContentTest extends TestCase
 
             $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');
+            $html = $this->withHtml($pageView);
+            $html->assertElementNotContains('.page-content', 'alert');
+            $html->assertElementNotContains('.page-content', 'xlink:href');
+            $html->assertElementNotContains('.page-content', 'application/xml');
+            $html->assertElementNotContains('.page-content', 'javascript');
         }
     }
 
     public function test_page_inline_on_attributes_show_if_configured()
     {
         $this->asEditor();
-        $page = Page::query()->first();
+        $page = $this->entities->page();
         config()->push('app.allow_content_scripts', 'true');
 
         $script = '<p onmouseenter="console.log(\'test\')">Hello</p>';
@@ -381,7 +386,7 @@ class PageContentTest extends TestCase
     public function test_duplicate_ids_fixed_on_page_save()
     {
         $this->asEditor();
-        $page = Page::query()->first();
+        $page = $this->entities->page();
 
         $content = '<ul id="bkmrk-test"><li>test a</li><li><ul id="bkmrk-test"><li>test b</li></ul></li></ul>';
         $pageSave = $this->put($page->getUrl(), [
@@ -398,7 +403,7 @@ class PageContentTest extends TestCase
     public function test_anchors_referencing_non_bkmrk_ids_rewritten_after_save()
     {
         $this->asEditor();
-        $page = Page::query()->first();
+        $page = $this->entities->page();
 
         $content = '<h1 id="non-standard-id">test</h1><p><a href="#non-standard-id">link</a></p>';
         $this->put($page->getUrl(), [
@@ -476,7 +481,7 @@ class PageContentTest extends TestCase
 
     public function test_page_text_decodes_html_entities()
     {
-        $page = Page::query()->first();
+        $page = $this->entities->page();
 
         $this->actingAs($this->getAdmin())
             ->put($page->getUrl(''), [
@@ -491,7 +496,7 @@ class PageContentTest extends TestCase
     public function test_page_markdown_table_rendering()
     {
         $this->asEditor();
-        $page = Page::query()->first();
+        $page = $this->entities->page();
 
         $content = '| Syntax      | Description |
 | ----------- | ----------- |
@@ -506,13 +511,13 @@ class PageContentTest extends TestCase
         $this->assertStringContainsString('</tbody>', $page->html);
 
         $pageView = $this->get($page->getUrl());
-        $pageView->assertElementExists('.page-content table tbody td');
+        $this->withHtml($pageView)->assertElementExists('.page-content table tbody td');
     }
 
     public function test_page_markdown_task_list_rendering()
     {
         $this->asEditor();
-        $page = Page::query()->first();
+        $page = $this->entities->page();
 
         $content = '- [ ] Item a
 - [x] Item b';
@@ -526,14 +531,14 @@ class PageContentTest extends TestCase
         $this->assertStringContainsString('type="checkbox"', $page->html);
 
         $pageView = $this->get($page->getUrl());
-        $pageView->assertElementExists('.page-content li.task-list-item input[type=checkbox]');
-        $pageView->assertElementExists('.page-content li.task-list-item input[type=checkbox][checked=checked]');
+        $this->withHtml($pageView)->assertElementExists('.page-content li.task-list-item input[type=checkbox]');
+        $this->withHtml($pageView)->assertElementExists('.page-content li.task-list-item input[type=checkbox][checked]');
     }
 
     public function test_page_markdown_strikethrough_rendering()
     {
         $this->asEditor();
-        $page = Page::query()->first();
+        $page = $this->entities->page();
 
         $content = '~~some crossed out text~~';
         $this->put($page->getUrl(), [
@@ -545,13 +550,13 @@ class PageContentTest extends TestCase
         $this->assertStringMatchesFormat('%A<s%A>some crossed out text</s>%A', $page->html);
 
         $pageView = $this->get($page->getUrl());
-        $pageView->assertElementExists('.page-content p > s');
+        $this->withHtml($pageView)->assertElementExists('.page-content p > s');
     }
 
     public function test_page_markdown_single_html_comment_saving()
     {
         $this->asEditor();
-        $page = Page::query()->first();
+        $page = $this->entities->page();
 
         $content = '<!-- Test Comment -->';
         $this->put($page->getUrl(), [
@@ -570,7 +575,7 @@ class PageContentTest extends TestCase
     public function test_base64_images_get_extracted_from_page_content()
     {
         $this->asEditor();
-        $page = Page::query()->first();
+        $page = $this->entities->page();
 
         $this->put($page->getUrl(), [
             'name' => $page->name, 'summary' => '',
@@ -592,7 +597,7 @@ class PageContentTest extends TestCase
     public function test_base64_images_get_extracted_when_containing_whitespace()
     {
         $this->asEditor();
-        $page = Page::query()->first();
+        $page = $this->entities->page();
 
         $base64PngWithWhitespace = "iVBORw0KGg\noAAAANSUhE\tUgAAAAEAAAA BCA   YAAAAfFcSJAAA\n\t ACklEQVR4nGMAAQAABQAB";
         $base64PngWithoutWhitespace = 'iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQAB';
@@ -623,7 +628,7 @@ class PageContentTest extends TestCase
 
         foreach ($extensions as $extension) {
             $this->asEditor();
-            $page = Page::query()->first();
+            $page = $this->entities->page();
 
             $this->put($page->getUrl(), [
                 'name' => $page->name, 'summary' => '',
@@ -638,7 +643,7 @@ class PageContentTest extends TestCase
     public function test_base64_images_get_extracted_from_markdown_page_content()
     {
         $this->asEditor();
-        $page = Page::query()->first();
+        $page = $this->entities->page();
 
         $this->put($page->getUrl(), [
             'name'     => $page->name, 'summary' => '',
@@ -657,37 +662,77 @@ class PageContentTest extends TestCase
         $this->deleteImage($imagePath);
     }
 
-    public function test_base64_images_within_markdown_blanked_if_not_supported_extension_for_extract()
+    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();
+        $page = $this->entities->page();
+
+        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/jiff;base64,' . $this->base64Jpeg . ')',
+            'markdown' => 'test ![test](data:image/jpeg;base64,' . $base64Content . ') ![test](data:image/jpeg;base64,' . $base64Content . ')',
         ]);
 
         $page->refresh();
-        $this->assertStringContainsString('<img src=""', $page->html);
+        $this->assertStringMatchesFormat('<p%A>test <img src="http://localhost/uploads/images/gallery/%A.jpeg" alt="test"> <img src="http://localhost/uploads/images/gallery/%A.jpeg" alt="test">%A</p>%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 = $this->entities->page();
+
+        $this->asEditor()->put($page->getUrl(), [
+            'name'     => $page->name, 'summary' => '',
+            'markdown' => 'test ![test](data:image/jiff;base64,' . $this->base64Jpeg . ')',
+        ]);
+
+        $this->assertStringContainsString('<img src=""', $page->refresh()->html);
     }
 
     public function test_nested_headers_gets_assigned_an_id()
     {
-        $this->asEditor();
-        $page = Page::query()->first();
+        $page = $this->entities->page();
 
         $content = '<table><tbody><tr><td><h5>Simple Test</h5></td></tr></tbody></table>';
-        $this->put($page->getUrl(), [
+        $this->asEditor()->put($page->getUrl(), [
             'name'    => $page->name,
             'html'    => $content,
-            'summary' => '',
         ]);
 
-        $updatedPage = Page::query()->where('id', '=', $page->id)->first();
-
         // The top level <table> 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('<h5 id="bkmrk-simple-test-1">Simple Test</h5>', $updatedPage->html);
+        $this->assertStringContainsString('<h5 id="bkmrk-simple-test-1">Simple Test</h5>', $page->refresh()->html);
+    }
+
+    public function test_non_breaking_spaces_are_preserved()
+    {
+        $page = $this->entities->page();
+
+        $content = '<p>&nbsp;</p>';
+        $this->asEditor()->put($page->getUrl(), [
+            'name'    => $page->name,
+            'html'    => $content,
+        ]);
+
+        $this->assertStringContainsString('<p id="bkmrk-%C2%A0">&nbsp;</p>', $page->refresh()->html);
     }
 }