lukaszraczylo/traefik-llmgateway
1
0
Fork 0
mirror of https://github.com/lukaszraczylo/traefik-llmgateway.git synced 2026-10-14 05:18:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(webui): defuse scaffold config traps, tighten inline guards

Browse Source 
Micro-fix from re-review:

1. webui/components.json: deleted the font/iconLibrary keys instead of
   picking a value. Re-review checked shadcn-vue's actual parse schema
   (node_modules/shadcn-vue/dist/schema/index.js's rawConfigSchema):
   both fields are z.string().optional(), not an enum - the five-choice
   enum lives only on the init CLI's --font/--icon-library flags, not on
   the components.json schema. The previous commit's "schema forbids a
   fix" rationale was wrong; corrected here. Verified empirically, not
   just by reading the schema: ran a real `npx shadcn-vue add badge -o
   -y` against components.json with both keys removed - src/assets/
   main.css came back byte-for-byte unchanged (previously this exact
   class of call re-added a Google Fonts import and the .dark-class
   toggle). That same run did still re-add @lucide/vue to package.json's
   dependencies (some components' registry entries list an icon package
   regardless of iconLibrary) - reverted before committing, and
   webui/README.md's warning section rewritten to explain the omission
   (so nobody "helpfully" restores the keys), fix the schema claim, and
   note the narrower remaining package.json trap.

2. admin.go:27-28: adminCSP's doc comment now names all three set-sites
   (GET /admin, every GET /admin/assets/*, the three JSON routes) -
   previously only mentioned the page and JSON routes, dropped after the
   asset route gained the same header in the prior fix round.

3. Both inline-script guards (webui/generate.mjs's assertNoInlineAssets,
   admin_test.go's hasInlineScript) tightened from a bare \bsrc\s*=
   pattern to (^|\s)src\s*= - \b alone matches inside "data-src=" too
   (the "-" before "src" is a non-word character, so \b sits right
   before "src"), which would wrongly treat a data-src/nosrc attribute
   as the real src= that makes a <script> external. New Go test
   TestHasInlineScript_DataSrcIsNotExternal: <script data-src="x">
   is still flagged as inline.

No webui/src/ change this round - components.json isn't bundled, and
generate.mjs's edit only touches its own build-time guard, not the
Go-source-generation path. admin_assets_gen.go NOT regenerated
(confirmed via a throwaway `node generate.mjs` + gofmt -w run: output
is byte-identical to what's already committed).
This commit is contained in:
lukaszraczylo
2026-08-21 09:54:48 +01:00
parent b98416d1e9
commit 1aa2b43932
5 changed files with 96 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
webui/generate.mjs
+7 -1
View File
@@ -80,7 +80,13 @@ function assertNoInlineAssets(html, sourceLabel) {
const scriptTagRe = /<script\b([^>]*)>/gi
let match
while ((match = scriptTagRe.exec(html)) !== null) {
if (!/\bsrc\s*=/i.test(match[1])) {
// Anchored to attribute-start (start-of-string or preceding
// whitespace), not a bare \b word boundary: \b alone matches inside
// "data-src=" too (the "-" before "src" is itself a non-word
// character, so \b sits right before "src"), which would wrongly
// treat a data-src/nosrc/whatever-src attribute as the real src= that
// makes a <script> external.
if (!/(^|\s)src\s*=/i.test(match[1])) {
console.error(
`generate.mjs: ${sourceLabel} contains an inline <script> (no src= attribute): ${match[0]}\n` +
`The admin CSP ships script-src 'self' with no 'unsafe-inline' — every script must be external.`,