Tiny header

[bookstack] / tests / Entity / PageContentTest.php

diff --git a/tests/Entity/PageContentTest.php b/tests/Entity/PageContentTest.php
index 47a3c9c13614fe2d9f351fce1270d5c6db579cf5..b9680d23fc80598746bff0f096255b9083ceda1d 100644 (file)
--- a/tests/Entity/PageContentTest.php
+++ b/tests/Entity/PageContentTest.php
@@ -62,7 +62,9 @@ class PageContentTest extends TestCase
 
     public function test_page_includes_do_not_break_tables()
     {
 
     public function test_page_includes_do_not_break_tables()
     {

+        /** @var Page $page */

         $page = Page::query()->first();
         $page = Page::query()->first();

+        /** @var Page $secondPage */

         $secondPage = Page::query()->where('id', '!=', $page->id)->first();
 
         $content = '<table id="table"><tbody><tr><td>test</td></tr></tbody></table>';
         $secondPage = Page::query()->where('id', '!=', $page->id)->first();
 
         $content = '<table id="table"><tbody><tr><td>test</td></tr></tbody></table>';


@@ -72,9 +74,26 @@ class PageContentTest extends TestCase
         $page->html = "{{@{$secondPage->id}#table}}";
         $page->save();
 
         $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 = '<pre id="bkmrk-code"><code>var cat = null;</code></pre>';
+        $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()
     }
 
     public function test_page_includes_rendered_on_book_export()


@@ -106,7 +125,7 @@ class PageContentTest extends TestCase
 
         $pageView = $this->get($page->getUrl());
         $pageView->assertStatus(200);
 
         $pageView = $this->get($page->getUrl());
         $pageView->assertStatus(200);

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

         $pageView->assertSee('abc123abc123');
     }
 
         $pageView->assertSee('abc123abc123');
     }
 


@@ -260,8 +279,8 @@ class PageContentTest extends TestCase
 
         $pageView = $this->get($page->getUrl());
         $pageView->assertStatus(200);
 
         $pageView = $this->get($page->getUrl());
         $pageView->assertStatus(200);

-        $pageView->assertDontSee($script);
-        $pageView->assertSee('<p>Hello</p>');
+        $pageView->assertDontSee($script, false);
+        $pageView->assertSee('<p>Hello</p>', false);

     }
 
     public function test_more_complex_inline_on_attributes_escaping_scenarios()
     }
 
     public function test_more_complex_inline_on_attributes_escaping_scenarios()


@@ -301,7 +320,7 @@ class PageContentTest extends TestCase
         $page->save();
 
         $pageView = $this->get($page->getUrl());
         $page->save();
 
         $pageView = $this->get($page->getUrl());

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

         $pageView->assertDontSee('abc123abc123');
     }
 
         $pageView->assertDontSee('abc123abc123');
     }
 


@@ -338,8 +357,8 @@ class PageContentTest extends TestCase
         $page->save();
 
         $pageView = $this->get($page->getUrl());
         $page->save();
 
         $pageView = $this->get($page->getUrl());

-        $pageView->assertSee($script);
-        $pageView->assertDontSee('<p>Hello</p>');
+        $pageView->assertSee($script, false);
+        $pageView->assertDontSee('<p>Hello</p>', false);

     }
 
     public function test_duplicate_ids_does_not_break_page_render()
     }
 
     public function test_duplicate_ids_does_not_break_page_render()


@@ -545,7 +564,7 @@ class PageContentTest extends TestCase
 
         $pageView = $this->get($page->getUrl());
         $pageView->assertStatus(200);
 
         $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()
     }
 
     public function test_base64_images_get_extracted_from_page_content()


@@ -596,66 +615,120 @@ class PageContentTest extends TestCase
 
     public function test_base64_images_within_html_blanked_if_not_supported_extension_for_extract()
     {
 
     public function test_base64_images_within_html_blanked_if_not_supported_extension_for_extract()
     {

-        $this->asEditor();
-        $page = Page::query()->first();
+        // 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',
+        ];

 
 

-        $this->put($page->getUrl(), [
-            'name' => $page->name, 'summary' => '',
-            'html' => '<p>test<img src="data:image/jiff;base64,' . $this->base64Jpeg . '"/></p>',
-        ]);
+        foreach ($extensions as $extension) {
+            $this->asEditor();
+            $page = Page::query()->first();

 
 

-        $page->refresh();
-        $this->assertStringContainsString('<img src=""', $page->html);
+            $this->put($page->getUrl(), [
+                'name' => $page->name, 'summary' => '',
+                'html' => '<p>test<img src="data:image/' . $extension . ';base64,' . $this->base64Jpeg . '"/></p>',
+            ]);
+
+            $page->refresh();
+            $this->assertStringContainsString('<img src=""', $page->html);
+        }

     }
 
     }
 

-    // Relevant to https://github.com/BookStackApp/BookStack/issues/3010
-    public function test_base64_images_within_html_blanked_if_extension_incorrect_but_prefix_matches_correct_extension()
+    public function test_base64_images_get_extracted_from_markdown_page_content()

     {
         $this->asEditor();
         $page = Page::query()->first();
 
         $this->put($page->getUrl(), [
     {
         $this->asEditor();
         $page = Page::query()->first();
 
         $this->put($page->getUrl(), [

-            'name' => $page->name, 'summary' => '',
-            'html' => '<p>test<img src="data:image/pngr;base64,' . $this->base64Jpeg . '"/></p>',
+            'name'     => $page->name, 'summary' => '',
+            'markdown' => 'test ![test](data:image/jpeg;base64,' . $this->base64Jpeg . ')',

         ]);
 
         $page->refresh();
         ]);
 
         $page->refresh();

-        $this->assertStringContainsString('<img src=""', $page->html);
+        $this->assertStringMatchesFormat('%A<p%A>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(base64_decode($this->base64Jpeg), file_get_contents($imageFile));
+
+        $this->deleteImage($imagePath);

     }
 
     }
 

-    public function test_base64_images_get_extracted_from_markdown_page_content()
+    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();
 
         $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' => '',
         $this->put($page->getUrl(), [
             'name'     => $page->name, 'summary' => '',

-            'markdown' => 'test ![test](data:image/jpeg;base64,' . $this->base64Jpeg . ')',
+            'markdown' => 'test ![test](data:image/jpeg;base64,' . $base64Content . ') ![test](data:image/jpeg;base64,' . $base64Content . ')',

         ]);
 
         $page->refresh();
         ]);
 
         $page->refresh();

-        $this->assertStringMatchesFormat('%A<p%A>test <img src="http://localhost/uploads/images/gallery/%A.jpeg" alt="test">%A</p>%A', $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);
 
         $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->assertEquals($content, file_get_contents($imageFile));

 
         $this->deleteImage($imagePath);
 
         $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()
     {
     }
 
     public function test_base64_images_within_markdown_blanked_if_not_supported_extension_for_extract()
     {

-        $this->asEditor();

         $page = Page::query()->first();
 
         $page = Page::query()->first();
 

-        $this->put($page->getUrl(), [
+        $this->asEditor()->put($page->getUrl(), [

             'name'     => $page->name, 'summary' => '',
             'markdown' => 'test ![test](data:image/jiff;base64,' . $this->base64Jpeg . ')',
         ]);
 
             'name'     => $page->name, 'summary' => '',
             'markdown' => 'test ![test](data:image/jiff;base64,' . $this->base64Jpeg . ')',
         ]);
 

-        $page->refresh();
-        $this->assertStringContainsString('<img src=""', $page->html);
+        $this->assertStringContainsString('<img src=""', $page->refresh()->html);
+    }
+
+    public function test_nested_headers_gets_assigned_an_id()
+    {
+        $page = Page::query()->first();
+
+        $content = '<table><tbody><tr><td><h5>Simple Test</h5></td></tr></tbody></table>';
+        $this->asEditor()->put($page->getUrl(), [
+            'name'    => $page->name,
+            'html'    => $content,
+        ]);
+
+        // 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>', $page->refresh()->html);
+    }
+
+    public function test_non_breaking_spaces_are_preserved()
+    {
+        /** @var Page $page */
+        $page = Page::query()->first();
+
+        $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);

     }
 }
     }
 }