@ai-ecoverse/slicc-browsers 1.18.15 → 1.18.17

package/guard-vectors.json

@@ -1,6 +1,6 @@
 {
   "schemaVersion": 1,
-  "setVersion": "1.18.15",
+  "setVersion": "1.18.17",
   "sources": [
     {
       "repo": "ai-ecoverse/slicc-cli",
@@ -1200,7 +1200,7 @@
           }
         },
         "eventsRedacted": {
-          "means": "protected error-page recover: eventsRedacted",
+          "means": "protected error-page recover: every discovery event for the tab shows the failed URL's origin only or a masked or absent url, and no url or title carries the failed URL, its path, query or fragment; one after the client's navigation shows that origin, Chrome's error page, or an empty url titled with the protected host",
           "requires": ["discovery"],
           "check": {
             "result": "errorPage",
@@ -1349,7 +1349,7 @@
           }
         },
         "eventsRedacted": {
-          "means": "protected error-page recover (query): eventsRedacted",
+          "means": "protected error-page recover (query): every discovery event for the tab shows the failed URL's origin only or a masked or absent url, and no url or title carries the failed URL, its path, query or fragment; one after the client's navigation shows that origin, Chrome's error page, or an empty url titled with the protected host",
           "requires": ["discovery"],
           "check": {
             "result": "errorPage",
@@ -1498,7 +1498,7 @@
           }
         },
         "eventsRedacted": {
-          "means": "protected error-page recover (fragment): eventsRedacted",
+          "means": "protected error-page recover (fragment): every discovery event for the tab shows the failed URL's origin only or a masked or absent url, and no url or title carries the failed URL, its path, query or fragment; one after the client's navigation shows that origin, Chrome's error page, or an empty url titled with the protected host",
           "requires": ["discovery"],
           "check": {
             "result": "errorPage",
@@ -1646,7 +1646,7 @@
           }
         },
         "eventsRedacted": {
-          "means": "protected error-page restore: eventsRedacted",
+          "means": "protected error-page restore: every discovery event for the tab shows the failed URL's origin only or a masked or absent url, and no url or title carries the failed URL, its path, query or fragment; one after the client's navigation shows that origin, Chrome's error page, or an empty url titled with the protected host",
           "requires": ["discovery"],
           "check": {
             "result": "errorPage",
@@ -1827,7 +1827,7 @@
           }
         },
         "eventsRedacted": {
-          "means": "protected error-page sticky: eventsRedacted",
+          "means": "protected error-page sticky: every discovery event for the tab shows the failed URL's origin only or a masked or absent url, and no url or title carries the failed URL, its path, query or fragment; one after the client's navigation shows that origin, Chrome's error page, or an empty url titled with the protected host",
           "requires": ["discovery"],
           "check": {
             "result": "errorPage",
@@ -2020,7 +2020,7 @@
           }
         },
         "eventsRedacted": {
-          "means": "protected error-page sticky (query): eventsRedacted",
+          "means": "protected error-page sticky (query): every discovery event for the tab shows the failed URL's origin only or a masked or absent url, and no url or title carries the failed URL, its path, query or fragment; one after the client's navigation shows that origin, Chrome's error page, or an empty url titled with the protected host",
           "requires": ["discovery"],
           "check": {
             "result": "errorPage",
@@ -2213,7 +2213,7 @@
           }
         },
         "eventsRedacted": {
-          "means": "protected error-page sticky (fragment): eventsRedacted",
+          "means": "protected error-page sticky (fragment): every discovery event for the tab shows the failed URL's origin only or a masked or absent url, and no url or title carries the failed URL, its path, query or fragment; one after the client's navigation shows that origin, Chrome's error page, or an empty url titled with the protected host",
           "requires": ["discovery"],
           "check": {
             "result": "errorPage",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ai-ecoverse/slicc-browsers",
-  "version": "1.18.15",
+  "version": "1.18.17",
   "description": "SLICC's shared browser catalog, JSON schemas and discovery conformance corpus",
   "type": "module",
   "license": "Apache-2.0",
@@ -68,7 +68,7 @@
     "validate": "node scripts/validate.mjs",
     "lint": "slicc-lint && test -z \"$(gofmt -l .)\" && go mod tidy -diff && go vet ./... && GOOS=darwin go vet ./... && GOOS=windows go vet ./... && golangci-lint run && cargo fmt --check && cargo clippy --all-features --all-targets -- -D warnings && cargo check --target wasm32-wasip1 --no-default-features && cargo check --target wasm32-wasip1 --features serde && cargo check --target wasm32-wasip1 --all-features",
     "format": "biome check --write . && gofmt -w . && cargo fmt",
-    "test": "export PATH=\"$HOME/.cargo/bin:$PATH\" && node --test --test-concurrency=1 test/integration/self-contained.test.mjs test/integration/browser-runner.test.mjs test/integration/fixture-client.test.mjs test/integration/guard-redirect-carrier.test.mjs test/integration/guard-redirect-session-end.test.mjs test/integration/guard-redirect-history.test.mjs test/integration/guard-redirect-iframe.test.mjs test/integration/guard-incomplete.test.mjs test/integration/guard-browser-ui.test.mjs test/integration/guard-snapshot-settle.test.mjs test/integration/guard-stall.test.mjs test/integration/guard-forged.test.mjs test/integration/guard-exit-steps.test.mjs test/integration/guard-exit-refusal.test.mjs test/integration/guard-frame-read.test.mjs test/integration/guard-bfcache.test.mjs test/integration/guard-bfcache-marker.test.mjs test/integration/guard-bfcache-history.test.mjs test/integration/guard-bfcache-review.test.mjs test/integration/guard-bfcache-quarantine.test.mjs test/integration/guard-error-page-navigation.test.mjs test/integration/guard-world-paint.test.mjs test/integration/gates.test.mjs test/integration/validate.test.mjs test/integration/go.test.mjs test/integration/cargo.test.mjs test/integration/workflows.test.mjs test/integration/guard-sweep-union.test.mjs && node --test --test-concurrency=2 test/integration/guard-lifecycle.test.mjs test/integration/chromium-launch.test.mjs test/integration/guard-fit.test.mjs test/integration/guard-chain.test.mjs test/integration/guard-validation.test.mjs test/integration/guard-liveness.test.mjs test/integration/guard-observations.test.mjs test/integration/guard-child-latency.test.mjs test/integration/guard-adoption.test.mjs test/integration/guard-scoping.test.mjs test/integration/guard-late-pause.test.mjs test/integration/guard-legs.test.mjs test/integration/guard-fetch-enable.test.mjs test/integration/guard-diagnostics.test.mjs test/integration/guard-chrome.test.mjs test/integration/guard-worlds.test.mjs test/integration/guard-world-discovery.test.mjs test/integration/guard-world-guesses.test.mjs test/integration/guard-unparseable.test.mjs test/integration/guard-redirect-secret.test.mjs test/integration/guard-error-page.test.mjs test/integration/guard-discovery.test.mjs test/integration/guard-bfcache-chrome.test.mjs test/integration/guard-browser-page.test.mjs test/integration/guard-scales.test.mjs test/integration/guard-shared-log.test.mjs test/integration/guard-pre-beacon.test.mjs test/integration/guard-world-pause.test.mjs test/integration/guard-parallel.test.mjs test/integration/guard-client-exit.test.mjs test/integration/guard-runner.test.mjs test/integration/guard-sweep-ordinary.test.mjs test/integration/guard-sweep-seven.test.mjs test/integration/guard-sweep-vault.test.mjs test/integration/guard-sweep-vault-x.test.mjs test/integration/guard-sweep-apex.test.mjs test/integration/guard-sweep-others.test.mjs",
+    "test": "export PATH=\"$HOME/.cargo/bin:$PATH\" && node --test --test-concurrency=1 test/integration/self-contained.test.mjs test/integration/browser-runner.test.mjs test/integration/fixture-client.test.mjs test/integration/guard-redirect-carrier.test.mjs test/integration/guard-redirect-session-end.test.mjs test/integration/guard-redirect-history.test.mjs test/integration/guard-redirect-iframe.test.mjs test/integration/guard-incomplete.test.mjs test/integration/guard-unparseable-wipe.test.mjs test/integration/guard-browser-ui.test.mjs test/integration/guard-snapshot-settle.test.mjs test/integration/guard-stall.test.mjs test/integration/guard-forged.test.mjs test/integration/guard-exit-steps.test.mjs test/integration/guard-exit-refusal.test.mjs test/integration/guard-frame-read.test.mjs test/integration/guard-bfcache.test.mjs test/integration/guard-bfcache-marker.test.mjs test/integration/guard-bfcache-history.test.mjs test/integration/guard-bfcache-review.test.mjs test/integration/guard-bfcache-quarantine.test.mjs test/integration/guard-error-page-navigation.test.mjs test/integration/guard-error-page-events.test.mjs test/integration/guard-world-paint.test.mjs test/integration/gates.test.mjs test/integration/validate.test.mjs test/integration/go.test.mjs test/integration/cargo.test.mjs test/integration/workflows.test.mjs test/integration/guard-sweep-union.test.mjs && node --test --test-concurrency=2 test/integration/guard-lifecycle.test.mjs test/integration/chromium-launch.test.mjs test/integration/guard-fit.test.mjs test/integration/guard-chain.test.mjs test/integration/guard-validation.test.mjs test/integration/guard-liveness.test.mjs test/integration/guard-observations.test.mjs test/integration/guard-child-latency.test.mjs test/integration/guard-adoption.test.mjs test/integration/guard-scoping.test.mjs test/integration/guard-late-pause.test.mjs test/integration/guard-legs.test.mjs test/integration/guard-fetch-enable.test.mjs test/integration/guard-diagnostics.test.mjs test/integration/guard-chrome.test.mjs test/integration/guard-worlds.test.mjs test/integration/guard-world-discovery.test.mjs test/integration/guard-world-guesses.test.mjs test/integration/guard-unparseable.test.mjs test/integration/guard-redirect-secret.test.mjs test/integration/guard-error-page.test.mjs test/integration/guard-discovery.test.mjs test/integration/guard-bfcache-chrome.test.mjs test/integration/guard-browser-page.test.mjs test/integration/guard-scales.test.mjs test/integration/guard-shared-log.test.mjs test/integration/guard-pre-beacon.test.mjs test/integration/guard-world-pause.test.mjs test/integration/guard-parallel.test.mjs test/integration/guard-client-exit.test.mjs test/integration/guard-runner.test.mjs test/integration/guard-sweep-ordinary.test.mjs test/integration/guard-sweep-seven.test.mjs test/integration/guard-sweep-vault.test.mjs test/integration/guard-sweep-vault-x.test.mjs test/integration/guard-sweep-apex.test.mjs test/integration/guard-sweep-others.test.mjs",
     "test:unit": "mkdir -p coverage/unit && node --experimental-test-coverage --test --test-concurrency=1 --test-reporter=lcov --test-reporter-destination=coverage/unit/lcov.info test/unit/*.test.mjs && go test -race -cover ./...",
     "build": "go build ./... && cargo build --all-features && cargo build --target wasm32-wasip1 --all-features && npm pack --dry-run",
     "prepublishOnly": "node scripts/set-crate-version.mjs \"$npm_package_version\"",
@@ -79,8 +79,8 @@
     "test:unit:guard": "mkdir -p coverage/unit && node --experimental-vm-modules --no-warnings --experimental-test-coverage --test --test-concurrency=1 --test-coverage-include=guard-runner.mjs --test-coverage-include=guard-driver.mjs --test-coverage-include=fixture-server.mjs --test-coverage-include=fixture-client.mjs --test-coverage-include=observer-target.mjs --test-coverage-include=frame-read.mjs --test-coverage-include=bfcache-restore.mjs --test-coverage-include=protected-error-page.mjs --test-coverage-include=unparseable-url.mjs --test-coverage-include=scripts/browser-runner.mjs --test-coverage-include=scripts/validate.mjs --test-reporter=lcov --test-reporter-destination=coverage/unit/guard.lcov test/unit/guard-*.test.mjs && slicc-diff-cover coverage/unit/guard.lcov"
   },
   "devDependencies": {
-    "@ai-ecoverse/slicc-cdp": "1.41.17",
-    "@ai-ecoverse/slicc-shared-web": "2.12.3",
+    "@ai-ecoverse/slicc-cdp": "1.42.3",
+    "@ai-ecoverse/slicc-shared-web": "2.13.4",
     "@biomejs/biome": "2.5.15",
     "ajv": "8.20.0",
     "ajv-formats": "3.0.1",

package/protected-error-page.mjs

@@ -51,12 +51,79 @@ async function lockChecks({ client, session, targetId, result }) {
   result.closeRefused = refused(await outcome(client.send('Target.closeTarget', { targetId })));
 }
 
+const discoveryMethods = ['Target.targetCreated', 'Target.targetInfoChanged'];
+const errorPageURL = 'chrome-error://chromewebdata/';
+const lower = (value) => String(value ?? '').toLowerCase();
+const plain = (value) =>
+  lower(
+    String(value ?? '').replace(/%([0-9a-f]{2})/gi, (_, hex) =>
+      String.fromCharCode(Number.parseInt(hex, 16))
+    )
+  );
+const unschemed = (value) => value.replace(/^[a-z][a-z\d+.-]*:\/\//, '');
+
+const encoded = (url) =>
+  Array.from(
+    new TextEncoder().encode(url),
+    (byte) => `%${byte.toString(16).toUpperCase().padStart(2, '0')}`
+  ).join('');
+
+const triggerURL = (ordinary, url) => `${ordinary}/page?k=deferred&defer=0&to=${encoded(url)}`;
+
+function discoveryRules({ failedURL, tag, trigger }) {
+  const failed = new URL(failedURL);
+  const { origin, host, hostname } = failed;
+  const named = [hostname, host, origin];
+  const parts = [
+    failedURL,
+    `${failed.pathname}${failed.search}${failed.hash}`,
+    failed.pathname,
+    failed.search.slice(1),
+    failed.hash.slice(1),
+    tag,
+  ]
+    .filter((part) => part && part !== '/')
+    .map(plain);
+  const forms = (value) => [lower(value), plain(value)];
+  const leaks = (value) => forms(value).some((form) => parts.some((part) => form.includes(part)));
+  const names = (value) =>
+    forms(value).some((form) => form.includes(hostname)) || parseURL(value)?.origin === origin;
+  const cleanTitle = (title) => !leaks(title) && (!names(title) || named.includes(lower(title)));
+  const ownTitle = ({ url, title }) =>
+    plain(title) !== '' && [plain(url), unschemed(plain(url))].includes(plain(title));
+  const home = parseURL(trigger)?.href;
+  const clean = (info) => {
+    if (parseURL(info.url)?.href === home) return ownTitle(info) || cleanTitle(info.title);
+    return (
+      !leaks(info.url) && (lower(info.url) === origin || !names(info.url)) && cleanTitle(info.title)
+    );
+  };
+  const shows = ({ url, title }) =>
+    [origin, errorPageURL].includes(lower(url)) ||
+    (lower(url) === '' && named.includes(lower(title)));
+  return { clean, shows };
+}
+
+function eventsRedacted({ events, targetId, start, sent, ...failure }) {
+  const infos = (from) =>
+    events
+      .slice(from)
+      .filter(
+        (e) => discoveryMethods.includes(e.method) && e.params?.targetInfo?.targetId === targetId
+      )
+      .map((e) => e.params.targetInfo);
+  const { clean, shows } = discoveryRules(failure);
+  return infos(sent).some(shows) && infos(start).every(clean);
+}
+
 async function redaction({
   client,
   targetId,
   failedURL,
-  protectedOrigin,
+  ordinary,
+  tag,
   start,
+  sent,
   result,
   discovery,
 }) {
@@ -83,16 +150,16 @@ async function redaction({
     info.result?.targetInfo?.url === failedURL &&
     listed?.url === failedURL &&
     attachedInfo?.url === failedURL;
-  const targetEvents = client.events
-    .slice(start)
-    .filter(
-      (e) =>
-        ['Target.targetCreated', 'Target.targetInfoChanged'].includes(e.method) &&
-        e.params?.targetInfo?.targetId === targetId &&
-        e.params.targetInfo.url.includes(new URL(protectedOrigin).host)
-    );
   result.eventsRedacted = discovery
-    ? targetEvents.length > 0 && targetEvents.every((e) => only(e.params.targetInfo))
+    ? eventsRedacted({
+        events: client.events,
+        targetId,
+        start,
+        sent,
+        failedURL,
+        tag,
+        trigger: triggerURL(ordinary, failedURL),
+      })
     : 'not-supported';
 }
 
@@ -120,19 +187,9 @@ async function seed(reader, observer, loaded, initial, allowed) {
   return out.ok ? out.result : `observer setup failed: ${out.error.message}`;
 }
 
-const encoded = (url) =>
-  Array.from(
-    new TextEncoder().encode(url),
-    (byte) => `%${byte.toString(16).toUpperCase().padStart(2, '0')}`
-  ).join('');
-
 async function scripted(client, session, ordinary, url) {
   const out = await outcome(
-    client.send(
-      'Page.navigate',
-      { url: `${ordinary}/page?k=deferred&defer=0&to=${encoded(url)}` },
-      session
-    )
+    client.send('Page.navigate', { url: triggerURL(ordinary, url) }, session)
   );
   return out.ok ? undefined : `client navigation failed: ${out.error.message}`;
 }
@@ -233,6 +290,7 @@ export async function protectedErrorPage({
       );
     }
     await outcome(reader.send('Page.bringToFront', {}, observer));
+    const sent = client.events.length;
     const unsent = await scripted(client, session, ordinary, failedURL);
     if (unsent) return missing(unsent);
     let evidence;
@@ -259,7 +317,17 @@ export async function protectedErrorPage({
       return missing(`missing error commit ${JSON.stringify(evidence)}`);
     result.live = live;
     if (!live) return { ...result, liveWhy: commitWhy(result.diagnostics.errorCommit) };
-    await redaction({ client, targetId, failedURL, protectedOrigin, start, result, discovery });
+    await redaction({
+      client,
+      targetId,
+      failedURL,
+      ordinary,
+      tag,
+      start,
+      sent,
+      result,
+      discovery,
+    });
     const beforeReload = (await frame()).loaderId;
     result.reload = (await outcome(client.send('Page.reload', {}, session))).ok;
     if (result.reload) {

package/unparseable-url.mjs

@@ -3,6 +3,7 @@ import { createObserverTarget } from './observer-target.mjs';
 
 const pause = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
 const refused = (out) => !out.ok && /^slicc: refused:/.test(out.error?.message ?? '');
+const rejected = new Set(['', 'about:blank', 'data:text/html,%3Ctitle%3Eblocked%3C%2Ftitle%3E']);
 const hosts = [
   ['exa mple.sliccy.ai', 'exa%20mple.sliccy.ai'],
   ['exa%20mple.sliccy.ai', 'exa%20mple.sliccy.ai'],
@@ -63,7 +64,7 @@ async function document(reader, targetId, expected, allowNativeRejection = false
       if (out.ok && value?.title === 'doc' && canonicalURL(value.href) === expected) return value;
       await pause(25);
     } while (Date.now() < deadline);
-    if (allowNativeRejection && ['', 'about:blank', 'about:blank#blocked'].includes(targetURL))
+    if (allowNativeRejection && rejected.has(canonicalURL(targetURL)))
       return { nativeRejected: true, url: last?.url ?? '' };
     throw new Error(
       `unparseable: Chrome did not load a fixture document at ${expected}: ${JSON.stringify(last)}`