fix(16.2): WR-05 keep only view-safe attributes in the editor schema
captureAttributes and renderCaptured dropped only on* names, so id, name, style, srcset, background and the like from stored HTML were rendered by ProseMirror into the live admin DOM (DOM clobbering of document.querySelector, fixed-position overlays, remote loads). htmlAttrs now keeps an allowlist: class, title, alt, width, height, colspan, rowspan, start, rel, target and data-*; href and src stay with the link and image nodes. Other attributes are dropped from a block once it is edited; untouched documents and untouched blocks keep their bytes.
This commit is contained in:
@@ -63,9 +63,8 @@ export function isPolicyUrl(url: string | null | undefined): boolean {
|
||||
}
|
||||
|
||||
/**
|
||||
* The attributes each node or mark models itself; htmlAttrs captures every
|
||||
* other attribute. Event handler attributes (on*) are never captured, so
|
||||
* they never reach the live admin DOM.
|
||||
* The attributes each node or mark models itself; htmlAttrs captures the
|
||||
* view-safe others (KEPT_ATTRIBUTES).
|
||||
*/
|
||||
const MODELLED: Record<string, readonly string[]> = {
|
||||
orderedList: ['start', 'type'],
|
||||
@@ -92,23 +91,47 @@ const HTML_ATTRIBUTE_TYPES = [
|
||||
'tableHeader',
|
||||
'image',
|
||||
'figure',
|
||||
'figureImage',
|
||||
'figcaption',
|
||||
'link',
|
||||
]
|
||||
|
||||
function isHandlerName(name: string): boolean {
|
||||
return /^on/i.test(name)
|
||||
/**
|
||||
* KEPT_ATTRIBUTES are the unmodelled attributes htmlAttrs keeps (besides
|
||||
* data-*): ones that are safe to render in the live admin DOM, where
|
||||
* ProseMirror draws the document (WR-05). Every other attribute (id, name,
|
||||
* style, srcset, form, contenteditable, popover, event handlers and the
|
||||
* like) is dropped from a block once the block is edited; an untouched
|
||||
* document and every untouched block keep their stored bytes. href and src
|
||||
* are kept through the link and image nodes, which check them.
|
||||
*/
|
||||
export const KEPT_ATTRIBUTES: readonly string[] = [
|
||||
'class',
|
||||
'title',
|
||||
'alt',
|
||||
'width',
|
||||
'height',
|
||||
'colspan',
|
||||
'rowspan',
|
||||
'start',
|
||||
'rel',
|
||||
'target',
|
||||
]
|
||||
|
||||
const DATA_ATTRIBUTE = /^data-[a-z0-9][a-z0-9._-]*$/
|
||||
|
||||
/** isKeptAttribute reports whether htmlAttrs keeps an attribute (lower-case name). */
|
||||
export function isKeptAttribute(name: string): boolean {
|
||||
return KEPT_ATTRIBUTES.includes(name) || DATA_ATTRIBUTE.test(name)
|
||||
}
|
||||
|
||||
/** captureAttributes returns the element's attributes outside skip, in order. */
|
||||
/** captureAttributes returns the element's kept attributes outside skip, in order. */
|
||||
function captureAttributes(element: HTMLElement, skip: readonly string[]): Record<string, string> | null {
|
||||
const out: Record<string, string> = {}
|
||||
let any = false
|
||||
for (const attr of Array.from(element.attributes)) {
|
||||
const name = attr.name.toLowerCase()
|
||||
if (skip.includes(name) || isHandlerName(name)) continue
|
||||
out[attr.name] = attr.value
|
||||
if (skip.includes(name) || !isKeptAttribute(name)) continue
|
||||
out[name] = attr.value
|
||||
any = true
|
||||
}
|
||||
return any ? out : null
|
||||
@@ -118,17 +141,17 @@ function renderCaptured(captured: unknown): Record<string, string> {
|
||||
if (!captured || typeof captured !== 'object') return {}
|
||||
const out: Record<string, string> = {}
|
||||
for (const [name, value] of Object.entries(captured as Record<string, unknown>)) {
|
||||
if (isHandlerName(name) || typeof value !== 'string') continue
|
||||
if (!isKeptAttribute(name.toLowerCase()) || typeof value !== 'string') continue
|
||||
out[name] = value
|
||||
}
|
||||
return out
|
||||
}
|
||||
|
||||
/**
|
||||
* HtmlAttributes keeps the attributes the schema does not model (class,
|
||||
* data-*, itemprop, style and others) on paragraphs, headings, lists, list
|
||||
* items, blockquotes, tables, cells, images and links, so they survive an
|
||||
* edit elsewhere in the document (D-03).
|
||||
* HtmlAttributes keeps the view-safe attributes the schema does not model
|
||||
* (KEPT_ATTRIBUTES and data-*) on paragraphs, headings, lists, list items,
|
||||
* blockquotes, tables, cells, images and links, so they survive an edit
|
||||
* elsewhere in the block (D-03).
|
||||
*/
|
||||
export const HtmlAttributes = Extension.create({
|
||||
name: 'htmlAttributes',
|
||||
@@ -148,7 +171,10 @@ export const HtmlAttributes = Extension.create({
|
||||
},
|
||||
})
|
||||
|
||||
/** Span keeps inline spans with their attributes (style, class) as a mark. */
|
||||
/**
|
||||
* Span keeps inline spans with kept attributes (class, data-*, title) as a
|
||||
* mark; a span with none of them is dropped and its text kept.
|
||||
*/
|
||||
export const Span = Mark.create({
|
||||
name: 'span',
|
||||
priority: 40,
|
||||
@@ -164,7 +190,7 @@ export const Span = Mark.create({
|
||||
},
|
||||
|
||||
parseHTML() {
|
||||
return [{ tag: 'span', getAttrs: (element) => ((element as HTMLElement).attributes.length > 0 ? null : false) }]
|
||||
return [{ tag: 'span', getAttrs: (element) => (captureAttributes(element as HTMLElement, []) ? null : false) }]
|
||||
},
|
||||
|
||||
renderHTML({ HTMLAttributes }) {
|
||||
|
||||
Reference in New Issue
Block a user