sanitize note title

This commit is contained in:
zadam 2022-07-05 22:40:41 +02:00
parent e7db262559
commit 4fc686bbbc
9 changed files with 21 additions and 13 deletions

View File

@ -297,7 +297,7 @@ export default class ApperanceOptions {
this.$themeSelect.append($("<option>") this.$themeSelect.append($("<option>")
.attr("value", theme.val) .attr("value", theme.val)
.attr("data-note-id", theme.noteId) .attr("data-note-id", theme.noteId)
.html(theme.title)); .text(theme.title));
} }
this.$themeSelect.val(options.theme); this.$themeSelect.val(options.theme);

View File

@ -61,9 +61,11 @@ async function getRenderedContent(note, options = {}) {
$renderedContent.append($("<pre>").text(trim(fullNote.content, options.trim))); $renderedContent.append($("<pre>").text(trim(fullNote.content, options.trim)));
} }
else if (type === 'image') { else if (type === 'image') {
const sanitizedTitle = note.title.replace(/[^a-z0-9-.]/gi, "");
$renderedContent.append( $renderedContent.append(
$("<img>") $("<img>")
.attr("src", `api/images/${note.noteId}/${note.title}`) .attr("src", `api/images/${note.noteId}/${sanitizedTitle}`)
.css("max-width", "100%") .css("max-width", "100%")
); );
} }

View File

@ -266,7 +266,7 @@ class NoteListRenderer {
.append($expander) .append($expander)
.append($('<span class="note-icon">').addClass(note.getIcon())) .append($('<span class="note-icon">').addClass(note.getIcon()))
.append(this.viewType === 'grid' .append(this.viewType === 'grid'
? note.title ? $("<span>").text(note.title)
: await linkService.createNoteLink(notePath, {showTooltip: false, showNotePath: this.showNotePath}) : await linkService.createNoteLink(notePath, {showTooltip: false, showNotePath: this.showNotePath})
) )
.append($renderedAttributes) .append($renderedAttributes)

View File

@ -482,7 +482,7 @@ export default class TabManager extends Component {
updateDocumentTitle(activeNoteContext) { updateDocumentTitle(activeNoteContext) {
const titleFragments = [ const titleFragments = [
// it helps navigating in history if note title is included in the title // it helps to navigate in history if note title is included in the title
activeNoteContext.note?.title, activeNoteContext.note?.title,
"Trilium Notes" "Trilium Notes"
].filter(Boolean); ].filter(Boolean);

View File

@ -4,16 +4,17 @@ import utils from "./utils.js";
function toast(options) { function toast(options) {
const $toast = $(`<div class="toast" role="alert" aria-live="assertive" aria-atomic="true"> const $toast = $(`<div class="toast" role="alert" aria-live="assertive" aria-atomic="true">
<div class="toast-header"> <div class="toast-header">
<strong class="mr-auto"><span class="bx bx-${options.icon}"></span> ${options.title}</strong> <strong class="mr-auto"><span class="bx bx-${options.icon}"></span> <span class="toast-title"></span></strong>
<button type="button" class="ml-2 mb-1 close" data-dismiss="toast" aria-label="Close"> <button type="button" class="ml-2 mb-1 close" data-dismiss="toast" aria-label="Close">
<span aria-hidden="true">&times;</span> <span aria-hidden="true">&times;</span>
</button> </button>
</div> </div>
<div class="toast-body"> <div class="toast-body"></div>
${options.message}
</div>
</div>`); </div>`);
$toast.find('.toast-title').text(options.title);
$toast.find('.toast-body').text(options.message);
if (options.id) { if (options.id) {
$toast.attr("id", "toast-" + options.id); $toast.attr("id", "toast-" + options.id);
} }

View File

@ -77,7 +77,9 @@ export default class EditedNotesWidget extends CollapsibleWidget {
); );
} }
else { else {
$item.append(editedNote.notePath ? await linkService.createNoteLink(editedNote.notePath.join("/"), {showNotePath: true}) : editedNote.title); $item.append(editedNote.notePath
? await linkService.createNoteLink(editedNote.notePath.join("/"), {showNotePath: true})
: $("<span>").text(editedNote.title));
} }
if (i < editedNotes.length - 1) { if (i < editedNotes.length - 1) {

View File

@ -296,7 +296,8 @@ export default class EditableTextTypeWidget extends AbstractTextTypeWidget {
const note = await froca.getNote(noteId); const note = await froca.getNote(noteId);
this.textEditor.model.change( writer => { this.textEditor.model.change( writer => {
const src = `api/images/${note.noteId}/${note.title}`; const sanitizedTitle = note.title.replace(/[^a-z0-9-.]/gi, "");
const src = `api/images/${note.noteId}/${sanitizedTitle}`;
const imageElement = writer.createElement( 'image', { 'src': src } ); const imageElement = writer.createElement( 'image', { 'src': src } );

View File

@ -79,7 +79,7 @@ export default class EmptyTypeWidget extends TypeWidget {
this.$workspaceNotes.append( this.$workspaceNotes.append(
$('<div class="workspace-note">') $('<div class="workspace-note">')
.append($("<div>").addClass(workspaceNote.getIcon() + " workspace-icon")) .append($("<div>").addClass(workspaceNote.getIcon() + " workspace-icon"))
.append($("<div>").append(workspaceNote.title)) .append($("<div>").text(workspaceNote.title))
.attr("title", "Enter workspace " + workspaceNote.title) .attr("title", "Enter workspace " + workspaceNote.title)
.on('click', () => this.triggerCommand('hoistNote', {noteId: workspaceNote.noteId})) .on('click', () => this.triggerCommand('hoistNote', {noteId: workspaceNote.noteId}))
); );

View File

@ -341,8 +341,10 @@ function downloadImages(noteId, content) {
const imageService = require('../services/image'); const imageService = require('../services/image');
const {note} = imageService.saveImage(noteId, imageBuffer, "inline image", true, true); const {note} = imageService.saveImage(noteId, imageBuffer, "inline image", true, true);
const sanitizedTitle = note.title.replace(/[^a-z0-9-.]/gi, "");
content = content.substr(0, imageMatch.index) content = content.substr(0, imageMatch.index)
+ `<img src="api/images/${note.noteId}/${note.title}"` + `<img src="api/images/${note.noteId}/${sanitizedTitle}"`
+ content.substr(imageMatch.index + imageMatch[0].length); + content.substr(imageMatch.index + imageMatch[0].length);
} }
else if (!url.includes('api/images/') else if (!url.includes('api/images/')