mirror of
https://github.com/BookStackApp/BookStack.git
synced 2025-06-06 18:54:33 +08:00
Comments: Added HTML filter on load, tinymce elem filtering
- Added filter on load to help prevent potentially dangerous comment HTML in DB at load time (if it gets passed input filtering, or is existing). - Added TinyMCE valid_elements for input wysiwygs, to gracefully degrade content at point of user-view, rather than surprising the user by stripping content, which TinyMCE would show, post-save.
This commit is contained in:
@ -339,6 +339,7 @@ export function buildForInput(options) {
|
||||
toolbar: 'bold italic link bullist numlist',
|
||||
content_style: getContentStyle(options),
|
||||
file_picker_types: 'file',
|
||||
valid_elements: 'p,a[href|title],ol,ul,li,strong,em,br',
|
||||
file_picker_callback: filePickerCallback,
|
||||
init_instance_callback(editor) {
|
||||
addCustomHeadContent(editor.getDoc());
|
||||
|
@ -1,3 +1,6 @@
|
||||
@php
|
||||
$commentHtml = $comment->safeHtml();
|
||||
@endphp
|
||||
<div component="{{ $readOnly ? '' : 'page-comment' }}"
|
||||
option:page-comment:comment-id="{{ $comment->id }}"
|
||||
option:page-comment:comment-local-id="{{ $comment->local_id }}"
|
||||
@ -71,13 +74,13 @@
|
||||
<a class="text-muted text-small" href="#comment{{ $comment->parent_id }}">@icon('reply'){{ trans('entities.comment_in_reply_to', ['commentId' => '#' . $comment->parent_id]) }}</a>
|
||||
</p>
|
||||
@endif
|
||||
{!! $comment->html !!}
|
||||
{!! $commentHtml !!}
|
||||
</div>
|
||||
|
||||
@if(!$readOnly && userCan('comment-update', $comment))
|
||||
<form novalidate refs="page-comment@form" hidden class="content pt-s px-s block">
|
||||
<div class="form-group description-input">
|
||||
<textarea refs="page-comment@input" name="html" rows="3" placeholder="{{ trans('entities.comment_placeholder') }}">{{ $comment->html }}</textarea>
|
||||
<textarea refs="page-comment@input" name="html" rows="3" placeholder="{{ trans('entities.comment_placeholder') }}">{{ $commentHtml }}</textarea>
|
||||
</div>
|
||||
<div class="form-group text-right">
|
||||
<button type="button" class="button outline" refs="page-comment@form-cancel">{{ trans('common.cancel') }}</button>
|
||||
|
Reference in New Issue
Block a user