thinkpool-pair 0.7.99 → 0.7.100
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/flow-assembly.mjs +16 -3
- package/package.json +1 -1
package/flow-assembly.mjs
CHANGED
|
@@ -42,7 +42,18 @@ export function inlineSingleHtml ({ htmlPath, root, readFile = fsReadFile }) {
|
|
|
42
42
|
let html = String(readFile(htmlPath, 'utf8'))
|
|
43
43
|
|
|
44
44
|
const isLocal = (ref) => ref && !/^[a-z]+:\/\//i.test(ref) && !ref.startsWith('//')
|
|
45
|
-
|
|
45
|
+
// CONTAIN to baseDir — a lane-authored index.html could reference `../../etc/passwd`
|
|
46
|
+
// or an absolute path; without this the bridge would read arbitrary host files and
|
|
47
|
+
// inline them into the served preview (path traversal). Mirrors resolveUnderRoot in
|
|
48
|
+
// flow-preview.mjs: resolve, then reject anything that escapes baseDir. Returns null on
|
|
49
|
+
// an out-of-root / absolute ref so callers leave the tag untouched (never read it).
|
|
50
|
+
const resolve = (ref) => {
|
|
51
|
+
if (!ref || path.isAbsolute(ref)) return null
|
|
52
|
+
const abs = path.resolve(baseDir, ref.replace(/^\.\//, ''))
|
|
53
|
+
const rel = path.relative(baseDir, abs)
|
|
54
|
+
if (rel === '' || rel.startsWith('..') || path.isAbsolute(rel)) return rel === '' ? abs : null
|
|
55
|
+
return abs
|
|
56
|
+
}
|
|
46
57
|
|
|
47
58
|
// Collected module-script bodies (import/export users) get merged into one block.
|
|
48
59
|
const moduleBodies = []
|
|
@@ -53,7 +64,8 @@ export function inlineSingleHtml ({ htmlPath, root, readFile = fsReadFile }) {
|
|
|
53
64
|
(tag) => {
|
|
54
65
|
const m = tag.match(/\bhref=["']([^"']+)["']/i)
|
|
55
66
|
if (!m || !isLocal(m[1])) return tag
|
|
56
|
-
const
|
|
67
|
+
const p = resolve(m[1]); if (!p) return tag // out-of-root ref → leave the tag as-is
|
|
68
|
+
const css = String(readFile(p, 'utf8'))
|
|
57
69
|
return `<style>\n${css}\n</style>`
|
|
58
70
|
}
|
|
59
71
|
)
|
|
@@ -64,9 +76,10 @@ export function inlineSingleHtml ({ htmlPath, root, readFile = fsReadFile }) {
|
|
|
64
76
|
/<script\b([^>]*)\bsrc=["']([^"']+)["']([^>]*)>\s*<\/script>/gi,
|
|
65
77
|
(tag, pre, src, post) => {
|
|
66
78
|
if (!isLocal(src)) return tag
|
|
79
|
+
const p = resolve(src); if (!p) return tag // out-of-root ref → leave the tag as-is
|
|
67
80
|
const attrs = `${pre} ${post}`
|
|
68
81
|
const isModule = /\btype=["']module["']/i.test(attrs)
|
|
69
|
-
const body = String(readFile(
|
|
82
|
+
const body = String(readFile(p, 'utf8'))
|
|
70
83
|
const usesEsm = /(^|[\s;{(])(import|export)\s/.test(body)
|
|
71
84
|
if (isModule && usesEsm) {
|
|
72
85
|
moduleBodies.push(`/* inlined: ${src} */\n${body}`)
|