NOW MANAGED ON CODEBERG
Images: Prevented base64 extraction without permission
Dan Brown15d716142883
diff --git a/app/Entities/Repos/PageRepo.php b/app/Entities/Repos/PageRepo.phpindex 61a1db63e..dbd4a47d2 100644--- a/app/Entities/Repos/PageRepo.php+++ b/app/Entities/Repos/PageRepo.php@@ -211,13 +211,13 @@ class PageRepo$inputEmpty = empty($input['markdown']) && empty($input['html']);if ($haveInput && $inputEmpty) {- $pageContent->setNewHTML('');+ $pageContent->setNewHTML('', user());} elseif (!empty($input['markdown']) && is_string($input['markdown'])) {$newEditor = 'markdown';- $pageContent->setNewMarkdown($input['markdown']);+ $pageContent->setNewMarkdown($input['markdown'], user());} elseif (isset($input['html'])) {$newEditor = 'wysiwyg';- $pageContent->setNewHTML($input['html']);+ $pageContent->setNewHTML($input['html'], user());}if ($newEditor !== $currentEditor && userCan('editor-change')) {@@ -284,9 +284,9 @@ class PageRepo$content = new PageContent($page);if (!empty($revision->markdown)) {- $content->setNewMarkdown($revision->markdown);+ $content->setNewMarkdown($revision->markdown, user());} else {- $content->setNewHTML($revision->html);+ $content->setNewHTML($revision->html, user());}$page->updated_by = user()->id;diff --git a/app/Entities/Tools/PageContent.php b/app/Entities/Tools/PageContent.phpindex 949816eff..1bde7b6ce 100644--- a/app/Entities/Tools/PageContent.php+++ b/app/Entities/Tools/PageContent.php@@ -9,7 +9,9 @@ use BookStack\Facades\Theme;use BookStack\Theming\ThemeEvents;use BookStack\Uploads\ImageRepo;use BookStack\Uploads\ImageService;+use BookStack\Users\Models\User;use BookStack\Util\HtmlContentFilter;+use BookStack\Util\WebSafeMimeSniffer;use DOMDocument;use DOMElement;use DOMNode;@@ -27,9 +29,9 @@ class PageContent/*** Update the content of the page with new provided HTML.*/- public function setNewHTML(string $html): void+ public function setNewHTML(string $html, User $updater): void{- $html = $this->extractBase64ImagesFromHtml($html);+ $html = $this->extractBase64ImagesFromHtml($html, $updater);$this->page->html = $this->formatHtml($html);$this->page->text = $this->toPlainText();$this->page->markdown = '';@@ -38,9 +40,9 @@ class PageContent/*** Update the content of the page with new provided Markdown content.*/- public function setNewMarkdown(string $markdown): void+ public function setNewMarkdown(string $markdown, User $updater): void{- $markdown = $this->extractBase64ImagesFromMarkdown($markdown);+ $markdown = $this->extractBase64ImagesFromMarkdown($markdown, $updater);$this->page->markdown = $markdown;$html = (new MarkdownToHtml($markdown))->convert();$this->page->html = $this->formatHtml($html);@@ -50,7 +52,7 @@ class PageContent/*** Convert all base64 image data to saved images.*/- protected function extractBase64ImagesFromHtml(string $htmlText): string+ protected function extractBase64ImagesFromHtml(string $htmlText, User $updater): string{if (empty($htmlText) || !str_contains($htmlText, 'data:image')) {return $htmlText;@@ -66,7 +68,7 @@ class PageContent$imageNodes = $xPath->query('//img[contains(@src, \'data:image\')]');foreach ($imageNodes as $imageNode) {$imageSrc = $imageNode->getAttribute('src');- $newUrl = $this->base64ImageUriToUploadedImageUrl($imageSrc);+ $newUrl = $this->base64ImageUriToUploadedImageUrl($imageSrc, $updater);$imageNode->setAttribute('src', $newUrl);}@@ -86,7 +88,7 @@ class PageContent* Attempting to capture the whole data uri using regex can cause PHP* PCRE limits to be hit with larger, multi-MB, files.*/- protected function extractBase64ImagesFromMarkdown(string $markdown): string+ protected function extractBase64ImagesFromMarkdown(string $markdown, User $updater): string{$matches = [];$contentLength = strlen($markdown);@@ -104,7 +106,7 @@ class PageContent$dataUri .= $char;}- $newUrl = $this->base64ImageUriToUploadedImageUrl($dataUri);+ $newUrl = $this->base64ImageUriToUploadedImageUrl($dataUri, $updater);$replacements[] = [$dataUri, $newUrl];}@@ -119,16 +121,28 @@ class PageContent* Parse the given base64 image URI and return the URL to the created image instance.* Returns an empty string if the parsed URI is invalid or causes an error upon upload.*/- protected function base64ImageUriToUploadedImageUrl(string $uri): string+ protected function base64ImageUriToUploadedImageUrl(string $uri, User $updater): string{$imageRepo = app()->make(ImageRepo::class);$imageInfo = $this->parseBase64ImageUri($uri);+ // Validate user has permission to create images+ if (!$updater->can('image-create-all')) {+ return '';+ }+// Validate extension and contentif (empty($imageInfo['data']) || !ImageService::isExtensionSupported($imageInfo['extension'])) {return '';}+ // Validate content looks like an image via sniffing mime type+ $mimeSniffer = new WebSafeMimeSniffer();+ $mime = $mimeSniffer->sniff($imageInfo['data']);+ if (!str_starts_with($mime, 'image/')) {+ return '';+ }+// Validate that the content is not over our upload limit$uploadLimitBytes = (config('app.upload_limit') * 1000000);if (strlen($imageInfo['data']) > $uploadLimitBytes) {diff --git a/app/Users/Models/User.php b/app/Users/Models/User.phpindex 5bd308ae8..3797e7cb0 100644--- a/app/Users/Models/User.php+++ b/app/Users/Models/User.php@@ -160,10 +160,6 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon*/public function can(string $permissionName): bool{- if ($this->email === 'guest') {- return false;- }-return $this->permissions()->contains($permissionName);}diff --git a/tests/Entity/PageContentTest.php b/tests/Entity/PageContentTest.phpindex d8845fe12..78b739512 100644--- a/tests/Entity/PageContentTest.php+++ b/tests/Entity/PageContentTest.php@@ -8,7 +8,7 @@ use Tests\TestCase;class PageContentTest extends TestCase{- protected $base64Jpeg = '/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=';+ protected string $base64Jpeg = '/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=';public function test_page_includes(){@@ -649,6 +649,35 @@ class PageContentTest extends TestCase}}+ public function test_base64_images_within_html_blanked_if_no_image_create_permission()+ {+ $editor = $this->users->editor();+ $page = $this->entities->page();+ $this->permissions->removeUserRolePermissions($editor, ['image-create-all']);++ $this->actingAs($editor)->put($page->getUrl(), [+ 'name' => $page->name,+ 'html' => '<p>test<img src="data:image/jpeg;base64,' . $this->base64Jpeg . '"/></p>',+ ]);++ $page->refresh();+ $this->assertStringMatchesFormat('%A<p%A>test<img src="">%A</p>%A', $page->html);+ }++ public function test_base64_images_within_html_blanked_if_content_does_not_appear_like_an_image()+ {+ $page = $this->entities->page();++ $imgContent = base64_encode('file://test/a/b/c');+ $this->asEditor()->put($page->getUrl(), [+ 'name' => $page->name,+ 'html' => '<p>test<img src="data:image/jpeg;base64,' . $imgContent . '"/></p>',+ ]);++ $page->refresh();+ $this->assertStringMatchesFormat('%A<p%A>test<img src="">%A</p>%A', $page->html);+ }+public function test_base64_images_get_extracted_from_markdown_page_content(){$this->asEditor();@@ -682,7 +711,7 @@ class PageContentTest extends TestCaseini_set('pcre.backtrack_limit', '500');ini_set('pcre.recursion_limit', '500');- $content = str_repeat('a', 5000);+ $content = str_repeat(base64_decode($this->base64Jpeg), 50);$base64Content = base64_encode($content);$this->put($page->getUrl(), [@@ -716,6 +745,34 @@ class PageContentTest extends TestCase$this->assertStringContainsString('<img src=""', $page->refresh()->html);}+ public function test_base64_images_within_markdown_blanked_if_no_image_create_permission()+ {+ $editor = $this->users->editor();+ $page = $this->entities->page();+ $this->permissions->removeUserRolePermissions($editor, ['image-create-all']);++ $this->actingAs($editor)->put($page->getUrl(), [+ 'name' => $page->name,+ 'markdown' => 'test ',+ ]);++ $this->assertStringContainsString('<img src=""', $page->refresh()->html);+ }++ public function test_base64_images_within_markdown_blanked_if_content_does_not_appear_like_an_image()+ {+ $page = $this->entities->page();++ $imgContent = base64_encode('file://test/a/b/c');+ $this->asEditor()->put($page->getUrl(), [+ 'name' => $page->name,+ 'markdown' => 'test ',+ ]);++ $page->refresh();+ $this->assertStringContainsString('<img src=""', $page->refresh()->html);+ }+public function test_nested_headers_gets_assigned_an_id(){$page = $this->entities->page();diff --git a/tests/ThemeTest.php b/tests/ThemeTest.phpindex 53361e351..f6706595b 100644--- a/tests/ThemeTest.php+++ b/tests/ThemeTest.php@@ -78,7 +78,7 @@ class ThemeTest extends TestCase$page = $this->entities->page();$content = new PageContent($page);- $content->setNewMarkdown('# test');+ $content->setNewMarkdown('# test', $this->users->editor());$this->assertTrue($callbackCalled);}