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();
$content = '<table id="table"><tbody><tr><td>test</td></tr></tbody></table>';
$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()
$pageView = $this->get($page->getUrl());
$pageView->assertStatus(200);
- $pageView->assertDontSee($script);
+ $pageView->assertDontSee($script, false);
$pageView->assertSee('abc123abc123');
}
$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>');
}
}
- public function test_iframe_js_and_base64_urls_are_removed()
+ public function test_js_and_base64_src_urls_are_removed()
{
$checks = [
'<iframe src="javascript:alert(document.cookie)"></iframe>',
+ '<iframe src="JavAScRipT:alert(document.cookie)"></iframe>',
+ '<iframe src="JavAScRipT:alert(document.cookie)"></iframe>',
'<iframe SRC=" javascript: alert(document.cookie)"></iframe>',
'<iframe src="data:text/html;base64,PHNjcmlwdD5hbGVydCgnaGVsbG8nKTwvc2NyaXB0Pg==" frameborder="0"></iframe>',
+ '<iframe src="DaTa:text/html;base64,PHNjcmlwdD5hbGVydCgnaGVsbG8nKTwvc2NyaXB0Pg==" frameborder="0"></iframe>',
'<iframe src=" data:text/html;base64,PHNjcmlwdD5hbGVydCgnaGVsbG8nKTwvc2NyaXB0Pg==" frameborder="0"></iframe>',
+ '<img src="javascript:alert(document.cookie)"/>',
+ '<img src="JavAScRipT:alert(document.cookie)"/>',
+ '<img src="JavAScRipT:alert(document.cookie)"/>',
+ '<img SRC=" javascript: alert(document.cookie)"/>',
+ '<img src="data:text/html;base64,PHNjcmlwdD5hbGVydCgnaGVsbG8nKTwvc2NyaXB0Pg=="/>',
+ '<img src="DaTa:text/html;base64,PHNjcmlwdD5hbGVydCgnaGVsbG8nKTwvc2NyaXB0Pg=="/>',
+ '<img src=" data:text/html;base64,PHNjcmlwdD5hbGVydCgnaGVsbG8nKTwvc2NyaXB0Pg=="/>',
'<iframe srcdoc="<script>window.alert(document.cookie)</script>"></iframe>',
+ '<iframe SRCdoc="<script>window.alert(document.cookie)</script>"></iframe>',
+ '<IMG SRC=`javascript:alert("RSnake says, \'XSS\'")`>',
];
$this->asEditor();
$pageView = $this->get($page->getUrl());
$pageView->assertStatus(200);
- $pageView->assertElementNotContains('.page-content', '<iframe>');
- $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');
}
}
$checks = [
'<a id="xss" href="javascript:alert(document.cookie)>Click me</a>',
'<a id="xss" href="javascript: alert(document.cookie)>Click me</a>',
+ '<a id="xss" href="JaVaScRiPt: alert(document.cookie)>Click me</a>',
+ '<a id="xss" href=" JaVaScRiPt: alert(document.cookie)>Click me</a>',
];
$this->asEditor();
$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:');
}
}
{
$checks = [
'<form><input id="xss" type=submit formaction=javascript:alert(document.domain) value=Submit><input></form>',
+ '<form ><button id="xss" formaction="JaVaScRiPt:alert(document.domain)">Click me</button></form>',
'<form ><button id="xss" formaction=javascript:alert(document.domain)>Click me</button></form>',
'<form id="xss" action=javascript:alert(document.domain)><input type=submit value=Submit></form>',
+ '<form id="xss" action="JaVaScRiPt:alert(document.domain)"><input type=submit value=Submit></form>',
];
$this->asEditor();
$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:');
}
}
{
$checks = [
'<meta http-equiv="refresh" content="0; url=//external_url">',
+ '<meta http-equiv="refresh" ConTeNt="0; url=//external_url">',
+ '<meta http-equiv="refresh" content="0; UrL=//external_url">',
];
$this->asEditor();
$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');
}
}
$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()
{
$checks = [
'<p onclick="console.log(\'test\')">Hello</p>',
+ '<p OnCliCk="console.log(\'test\')">Hello</p>',
'<div>Lorem ipsum dolor sit amet.</div><p onclick="console.log(\'test\')">Hello</p>',
'<div>Lorem ipsum dolor sit amet.<p onclick="console.log(\'test\')">Hello</p></div>',
'<div><div><div><div>Lorem ipsum dolor sit amet.<p onclick="console.log(\'test\')">Hello</p></div></div></div></div>',
'<div onclick="console.log(\'test\')">Lorem ipsum dolor sit amet.</div><p onclick="console.log(\'test\')">Hello</p><div></div>',
'<a a="<img src=1 onerror=\'alert(1)\'> ',
+ '\<a onclick="alert(document.cookie)"\>xss link\</a\>',
];
$this->asEditor();
$pageView = $this->get($page->getUrl());
$pageView->assertStatus(200);
- $pageView->assertElementNotContains('.page-content', 'onclick');
+ $this->withHtml($pageView)->assertElementNotContains('.page-content', 'onclick');
}
}
$page->save();
$pageView = $this->get($page->getUrl());
- $pageView->assertSee($script);
+ $pageView->assertSee($script, false);
$pageView->assertDontSee('abc123abc123');
}
+ public function test_svg_xlink_hrefs_are_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>',
+ ];
+
+ $this->asEditor();
+ $page = Page::query()->first();
+
+ foreach ($checks as $check) {
+ $page->html = $check;
+ $page->save();
+
+ $pageView = $this->get($page->getUrl());
+ $pageView->assertStatus(200);
+ $this->withHtml($pageView)->assertElementNotContains('.page-content', 'alert');
+ $this->withHtml($pageView)->assertElementNotContains('.page-content', 'xlink:href');
+ $this->withHtml($pageView)->assertElementNotContains('.page-content', 'application/xml');
+ }
+ }
+
public function test_page_inline_on_attributes_show_if_configured()
{
$this->asEditor();
$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()
$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->assertStringContainsString('type="checkbox"', $page->html);
$pageView = $this->get($page->getUrl());
- $pageView->assertElementExists('.page-content input[type=checkbox]');
+ $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->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()
$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()
$this->deleteImage($imagePath);
}
- public function test_base64_images_blanked_if_not_supported_extension_for_extract()
+ public function test_base64_images_within_html_blanked_if_not_supported_extension_for_extract()
+ {
+ // 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',
+ ];
+
+ foreach ($extensions as $extension) {
+ $this->asEditor();
+ $page = Page::query()->first();
+
+ $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);
+ }
+ }
+
+ public function test_base64_images_get_extracted_from_markdown_page_content()
{
$this->asEditor();
$page = Page::query()->first();
$this->put($page->getUrl(), [
- 'name' => $page->name, 'summary' => '',
- 'html' => '<p>test<img src="data:image/jiff;base64,' . $this->base64Jpeg . '"/></p>',
+ 'name' => $page->name, 'summary' => '',
+ 'markdown' => 'test ',
]);
$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_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();
+
+ 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  ',
+ ]);
+
+ $page->refresh();
+ $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 = Page::query()->first();
+
+ $this->asEditor()->put($page->getUrl(), [
+ 'name' => $page->name, 'summary' => '',
+ 'markdown' => 'test ',
+ ]);
+
+ $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> </p>';
+ $this->asEditor()->put($page->getUrl(), [
+ 'name' => $page->name,
+ 'html' => $content,
+ ]);
+
+ $this->assertStringContainsString('<p id="bkmrk-%C2%A0"> </p>', $page->refresh()->html);
}
}
projects / bookstack / blobdiff