Escape HTML

Instead of trying to do some smart (and unsecure) stuff, just display the raw note contents as is
This commit is contained in:
Simon Cambier
2022-04-15 17:16:37 +02:00
parent 5602b1d8c8
commit e949f0916a
6 changed files with 32 additions and 54 deletions

View File

@@ -1,10 +1,6 @@
import { Notice, Plugin, TAbstractFile, TFile } from 'obsidian'
import MiniSearch from 'minisearch'
import {
clearContent,
extractHeadingsFromCache,
wait,
} from './utils'
import { escapeHTML, extractHeadingsFromCache, wait } from './utils'
import { IndexedNote } from './globals'
import { OmnisearchModal } from './modal'
@@ -97,7 +93,7 @@ export default class OmnisearchPlugin extends Plugin {
}
// Fetch content from the cache,
// trim the markdown, remove embeds and clear wikilinks
const content = clearContent(await this.app.vault.cachedRead(file))
const content = escapeHTML(await this.app.vault.cachedRead(file))
// Purge HTML before indexing
const tmp = document.createElement('div')
@@ -106,11 +102,17 @@ export default class OmnisearchPlugin extends Plugin {
// Make the document and index it
const note: IndexedNote = {
basename: file.basename,
content: tmp.innerText,
content: tmp.innerText, // content,
path: file.path,
headings1: fileCache ? extractHeadingsFromCache(fileCache, 1).join(' ') : '',
headings2: fileCache ? extractHeadingsFromCache(fileCache, 2).join(' ') : '',
headings3: fileCache ? extractHeadingsFromCache(fileCache, 3).join(' ') : '',
headings1: fileCache
? extractHeadingsFromCache(fileCache, 1).join(' ')
: '',
headings2: fileCache
? extractHeadingsFromCache(fileCache, 2).join(' ')
: '',
headings3: fileCache
? extractHeadingsFromCache(fileCache, 3).join(' ')
: '',
}
this.minisearch.add(note)
this.indexedNotes[file.path] = note

View File

@@ -1,7 +1,7 @@
import { MarkdownView, SuggestModal, TFile } from 'obsidian'
import { ResultNote } from './globals'
import OmnisearchPlugin from './main'
import { escapeRegex, getAllIndexes, highlighter } from './utils'
import { escapeHTML, escapeRegex, getAllIndexes, highlighter } from './utils'
export class OmnisearchModal extends SuggestModal<ResultNote> {
private plugin: OmnisearchPlugin
@@ -64,7 +64,8 @@ export class OmnisearchModal extends SuggestModal<ResultNote> {
const record = events.find(event =>
(event.target as HTMLDivElement).classList.contains('is-selected'),
)
const id = (record?.target as HTMLElement)?.getAttribute('data-note-id') ?? null
const id =
(record?.target as HTMLElement)?.getAttribute('data-note-id') ?? null
if (id) {
this.selectedNoteId = id
}
@@ -119,7 +120,9 @@ export class OmnisearchModal extends SuggestModal<ResultNote> {
results.map(async result => {
const file = this.app.vault.getAbstractFileByPath(result.id) as TFile
// const metadata = this.app.metadataCache.getFileCache(file)
let content = (await this.app.vault.cachedRead(file)).toLowerCase()
let content = escapeHTML(
await this.app.vault.cachedRead(file),
).toLowerCase()
let basename = file.basename
// Sort the terms from smaller to larger

View File

@@ -1,4 +1,3 @@
import markdownToTxt from 'markdown-to-txt'
import { CachedMetadata } from 'obsidian'
import {
isSearchMatch,
@@ -12,12 +11,13 @@ export function highlighter(str: string): string {
return '<span class="search-result-file-matched-text">' + str + '</span>'
}
/**
* Strips the markdown and frontmatter
* @param text
*/
export function clearContent(text: string): string {
return markdownToTxt(removeFrontMatter(text))
export function escapeHTML(html: string): string {
return html
.replaceAll('&', '&amp;')
.replaceAll('<', '&lt;')
.replaceAll('>', '&gt;')
.replaceAll('"', '&quot;')
.replaceAll("'", '&#039;')
}
/**