Compare commits

...
3 changed files with 80 additions and 14 deletions

No files matched your search

+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "worldwideview",
"version": "2.48.17",
"version": "2.48.18",
"private": true,
"type": "module",
"packageManager": "[email protected]",
+50
View File
@@ -375,3 +375,53 @@ describe("validateManifest no execution field required (MAN-04)", () => {
expect(hasExecutionError).toBe(false);
});
});
// ---------------------------------------------------------------------------
// SEC-URL: entry URL allowlist must host-match the PARSED hostname.
// Substring checks (includes / startsWith on the raw string) are bypassable
// and would allow an attacker-controlled origin to serve the imported bundle.
// ---------------------------------------------------------------------------
describe("validateManifest entry URL allowlist (security)", () => {
const ERR =
"entry URL must be a relative path, CDN, localhost, or worldwideview.dev domain";
const accepts = (entry: string) => {
const result = validateManifest(baseManifest({ entry }));
expect(result.errors, `expected "${entry}" to be accepted`).not.toContain(ERR);
};
const rejects = (entry: string) => {
const result = validateManifest(baseManifest({ entry }));
expect(result.errors, `expected "${entry}" to be rejected`).toContain(ERR);
};
it("accepts relative and exact known-host absolute entries", () => {
accepts("/plugins/test/frontend.mjs");
accepts("./frontend.mjs");
accepts("https://unpkg.com/@wwv/plugin/frontend.mjs");
accepts("https://cdn.jsdelivr.net/npm/@wwv/plugin/frontend.mjs");
accepts("https://marketplace.worldwideview.dev/p/frontend.mjs");
accepts("https://worldwideview.dev/p/frontend.mjs");
accepts("http://localhost:3000/plugins/x/frontend.mjs");
accepts("http://127.0.0.1:5000/plugins/x/frontend.mjs");
accepts("http://[::1]:5000/plugins/x/frontend.mjs");
});
it("rejects substring-bypass hostnames the old check allowed", () => {
rejects("https://unpkg.com.evil.com/frontend.mjs");
rejects("https://cdn.jsdelivr.net.evil.com/frontend.mjs");
rejects("https://sub.worldwideview.dev.evil.com/frontend.mjs");
rejects("https://evil.com/#.worldwideview.dev");
rejects("https://evil.com/?x=.worldwideview.dev");
rejects("http://localhost.evil.com/frontend.mjs");
rejects("https://hacker.com/malicious.js");
});
it("rejects protocol-relative, slash-backslash, userinfo and non-http(s) scheme tricks", () => {
rejects("//evil.com/frontend.mjs");
rejects("/\\evil.com/frontend.mjs");
rejects("https://[email protected]/frontend.mjs");
rejects("javascript:alert(1)");
rejects("data:text/javascript,alert(1)");
});
});
+29 -13
View File
@@ -86,25 +86,41 @@ export function validateManifest(
errors.push("Missing required field: entry");
} else {
const entry = manifest.entry.trim();
const isRelative = entry.startsWith("/") || entry.startsWith("./");
const isLocal = entry.startsWith("http://localhost") || entry.startsWith("http://127.0.0.1");
const isWWV = entry.includes(".worldwideview.dev");
const isCDN = entry.startsWith("https://cdn.jsdelivr.net") || entry.startsWith("https://unpkg.com");
// A relative path starts with "/" or "./". Reject protocol-relative
// ("//host") and slash-backslash ("/\\host") forms: they start with "/"
// but resolve to an EXTERNAL origin when import()-ed.
const isRelative =
entry.startsWith("./") ||
(entry.startsWith("/") && entry[1] !== "/" && entry[1] !== "\\");
// Accept bundles served from a configured marketplace/instance host
// (e.g. marketplace.wwv.local) derived from env, so custom deployment
// hostnames work without being hardcoded.
let isConfiguredHost = false;
if (ENV_ALLOWED_ENTRY_HOSTS.size > 0) {
// Absolute entry URLs are host-matched against an allowlist using the
// PARSED hostname. Substring checks on the raw string (includes /
// startsWith) are bypassable, e.g. "https://unpkg.com.evil.com/x.mjs"
// or "https://sub.worldwideview.dev.evil.com/x.mjs", which would let an
// attacker-controlled origin serve the dynamically imported bundle (RCE).
let isAllowedHost = false;
if (!isRelative) {
try {
isConfiguredHost = ENV_ALLOWED_ENTRY_HOSTS.has(new URL(entry).hostname);
const url = new URL(entry);
const host = url.hostname;
const isSecure = url.protocol === "https:";
const isLocalhost =
(url.protocol === "http:" || isSecure) &&
(host === "localhost" || host === "127.0.0.1" || host === "[::1]");
const isWWV =
isSecure &&
(host === "worldwideview.dev" || host.endsWith(".worldwideview.dev"));
const isCDN = isSecure && (host === "cdn.jsdelivr.net" || host === "unpkg.com");
// Operator-configured hosts (from NEXT_PUBLIC_*MARKETPLACE_URL) are an
// explicit deployment opt-in, so their protocol is trusted as set.
const isConfiguredHost = ENV_ALLOWED_ENTRY_HOSTS.has(host);
isAllowedHost = isLocalhost || isWWV || isCDN || isConfiguredHost;
} catch {
// Relative paths and other non-absolute entries aren't parseable
// as full URLs — they're already covered by `isRelative`.
// Not a parseable absolute URL and not relative: rejected below.
}
}
if (!isRelative && !isLocal && !isWWV && !isCDN && !isConfiguredHost) {
if (!isRelative && !isAllowedHost) {
errors.push("entry URL must be a relative path, CDN, localhost, or worldwideview.dev domain");
}
}