@slicedearth/whoisleuth-cli 2.2.0 → 2.4.0

package/packages/workspace/bulk-session-model.mjs

@@ -4,6 +4,8 @@
 import { normalizeDomain } from "../cases/case-model.mjs";
 import { normalizeCaaCritical } from "./dns-record-normalization.mjs";
 import { normalizeExplicitIsoTimestamp } from "../evidence/observation.mjs";
+import { RELATIONSHIP_EVIDENCE_VERSION } from "../contracts/offline-comparison.mjs";
+import { normalizeRelationshipSourceProjection } from "../comparison/relationship-provenance.mjs";
 import { assertWorkspaceDeclaredVersion, assertWorkspaceInputGraph, assertWorkspacePortableVersion, ordinaryWorkspaceRecord } from "./hostile-input.mjs";
 import { BULK_SESSION_SCHEMA, BULK_SESSION_SCHEMA_VERSION, MAX_BULK_PROFILE_CONTEXT_LIMITATION_LENGTH, MAX_BULK_SESSIONS, MAX_BULK_SESSION_ARRAY_VALUES, MAX_BULK_SESSION_NAME_LENGTH, MAX_BULK_SESSION_ROWS, MAX_BULK_SESSION_SOURCES, MAX_BULK_SESSION_STORE_BYTES, MAX_BULK_SESSION_TEXT_LENGTH, SUPPORTED_BULK_SESSION_SCHEMA_VERSIONS, } from "../contracts/workspace-portability.mjs";
 export { BULK_SESSION_SCHEMA, BULK_SESSION_SCHEMA_VERSION, MAX_BULK_PROFILE_CONTEXT_LIMITATION_LENGTH, MAX_BULK_SESSIONS, MAX_BULK_SESSION_ARRAY_VALUES, MAX_BULK_SESSION_NAME_LENGTH, MAX_BULK_SESSION_ROWS, MAX_BULK_SESSION_SOURCES, MAX_BULK_SESSION_STORE_BYTES, MAX_BULK_SESSION_TEXT_LENGTH, SUPPORTED_BULK_SESSION_SCHEMA_VERSIONS, } from "../contracts/workspace-portability.mjs";
@@ -175,7 +177,7 @@ function normalizeSourceCoverage(value) {
         if (!SOURCE_RE.test(source) || !SOURCE_STATES.has(state) || seen.has(source))
             continue;
         seen.add(source);
-        output.push({ source, state: state });
+        output.push({ source, state: state, observedAt: normalizeExplicitIsoTimestamp(item?.observedAt) });
         if (output.length >= MAX_BULK_SESSION_SOURCES)
             break;
     }
@@ -198,8 +200,11 @@ function nullableHash(value, expression) {
 }
 function normalizeRelationship(value) {
     const item = record(value);
+    if (item?.version !== undefined && item.version !== 2 && item.version !== RELATIONSHIP_EVIDENCE_VERSION) {
+        throw new TypeError('This Bulk relationship projection uses an unsupported version. No source evidence was interpreted.');
+    }
     return {
-        version: 2,
+        version: RELATIONSHIP_EVIDENCE_VERSION,
         nameservers: boundedStrings(item?.nameservers, 20),
         ipAddresses: boundedStrings(item?.ipAddresses, 50),
         trackingIdentifiers: boundedTrackingIdentifiers(item?.trackingIdentifiers),
@@ -207,6 +212,7 @@ function normalizeRelationship(value) {
         faviconHash: nullableHash(item?.faviconHash, HASH_64_RE),
         faviconPHash: nullableHash(item?.faviconPHash, PHASH_RE),
         certificateFingerprint: nullableHash(item?.certificateFingerprint, HASH_64_RE),
+        sourceEvidence: item?.version === RELATIONSHIP_EVIDENCE_VERSION ? normalizeRelationshipSourceProjection(item.sourceEvidence) : {},
         truncated: item?.truncated === true,
     };
 }
@@ -270,14 +276,14 @@ export function normalizeBulkComparisonEvidence(value) {
         },
     };
 }
-export function normalizeBulkSessionResult(value) {
+export function normalizeBulkSessionResult(value, inheritedProfileContext) {
     const item = record(value);
     const domain = normalizeDomain(item?.domain);
     const status = boundedText(item?.status, 20);
     const scanDepth = boundedText(item?.scanDepth, 10);
     if (!item || !domain || !RESULT_STATES.has(status) || !MODES.has(scanDepth))
         return null;
-    const rawProfileContext = record(item.profileContext);
+    const rawProfileContext = record(Object.hasOwn(item, 'profileContext') ? item.profileContext : inheritedProfileContext);
     if (!rawProfileContext || !['ready', 'unavailable'].includes(String(rawProfileContext.sourceState)))
         return null;
     const profileContext = normalizeBulkProfileContext(rawProfileContext);
@@ -311,6 +317,7 @@ export function normalizeBulkSessionResult(value) {
         trusted: profileClaimsUsable && !readyWithoutActiveProfile && TRUST_STATES.has(trusted) ? trusted : null,
         error: boundedText(item.error),
         scanDepth: scanDepth,
+        observedAt: normalizeExplicitIsoTimestamp(item.observedAt),
         createdDate: boundedText(item.createdDate, 64) || null,
         expiryDate: boundedText(item.expiryDate, 64) || null,
         privacyProtected: nullableBoolean(item.privacyProtected),
@@ -343,7 +350,7 @@ export function normalizeBulkSessionResult(value) {
         profileContext,
     };
 }
-export function normalizeBulkSession(value) {
+export function normalizeBulkSession(value, sourceStoreVersion) {
     const item = record(value);
     const id = boundedText(item?.id, 128);
     const name = boundedText(item?.name, MAX_BULK_SESSION_NAME_LENGTH);
@@ -367,23 +374,43 @@ export function normalizeBulkSession(value) {
         return null;
     if (!Array.isArray(item.results))
         return null;
+    const rawProfileContext = record(item.profileContext);
+    if (!rawProfileContext)
+        return null;
+    const declaredProfileContext = normalizeBulkProfileContext(rawProfileContext);
+    // Only an explicitly versioned current document may omit identical row
+    // context. Bare runtime rows and public schema 4 must carry their own context;
+    // an explicit invalid/null row value never falls back to the session.
+    const inheritedProfileContext = sourceStoreVersion === 5
+        && declaredProfileContext.sourceState !== 'mixed'
+        && rawProfileContext.sourceState === declaredProfileContext.sourceState
+        ? declaredProfileContext
+        : undefined;
     const allowed = new Set(domains);
     const results = [];
     const seen = new Set();
     for (const candidate of Array.isArray(item.results) ? item.results.slice(0, MAX_BULK_SESSION_ROWS * 2) : []) {
-        const result = normalizeBulkSessionResult(candidate);
+        const publicLegacyRow = sourceStoreVersion === 4;
+        if (publicLegacyRow && record(record(candidate)?.relationship)?.version === RELATIONSHIP_EVIDENCE_VERSION) {
+            throw new TypeError('Bulk schema 4 cannot contain newer relationship source evidence; no evidence was interpreted.');
+        }
+        const result = normalizeBulkSessionResult(candidate, inheritedProfileContext);
         if (!result || !allowed.has(result.domain) || seen.has(result.domain)) {
             return null;
         }
+        // Public schema 4 never recorded a row observation time or qualified
+        // relationship sources. Ignore added fields rather than backdating them.
+        if (publicLegacyRow) {
+            result.observedAt = null;
+            result.relationship.sourceEvidence = {};
+            result.sourceCoverage = result.sourceCoverage.map((source) => ({ ...source, observedAt: null }));
+        }
         seen.add(result.domain);
         results.push(result);
     }
     if ((state === 'complete') !== (results.length === domains.length))
         return null;
     const profileContext = summarizeBulkProfileContexts(results);
-    if (!record(item.profileContext))
-        return null;
-    const declaredProfileContext = normalizeBulkProfileContext(item.profileContext);
     if (!sameProfileContext(declaredProfileContext, profileContext))
         return null;
     return {
@@ -407,7 +434,9 @@ export function bulkSessionStoreVersion(raw) {
         : null;
 }
 export function normalizeBulkSessionStore(raw) {
-    assertWorkspaceInputGraph(raw, 'Bulk-session store');
+    // Preparation may combine an existing store and one incoming store before
+    // whole-session eviction. The persisted document still has its 4 MiB cap.
+    assertWorkspaceInputGraph(raw, 'Bulk-session store', { maximumBytes: MAX_BULK_SESSION_STORE_BYTES * 2 });
     assertWorkspaceDeclaredVersion(raw, 'Bulk-session store');
     const value = record(raw);
     if (value?.schema === BULK_SESSION_SCHEMA
@@ -423,7 +452,7 @@ export function normalizeBulkSessionStore(raw) {
             : [];
     const byId = new Map();
     for (const candidate of candidates.slice(0, MAX_BULK_SESSIONS * 4)) {
-        const session = normalizeBulkSession(candidate);
+        const session = normalizeBulkSession(candidate, bulkSessionStoreVersion(raw) ?? undefined);
         if (!session)
             continue;
         const existing = byId.get(session.id);
@@ -438,8 +467,21 @@ export function normalizeBulkSessionStore(raw) {
             .slice(0, MAX_BULK_SESSIONS),
     };
 }
+/** Current wire representation of an already-normalized session. */
+export function bulkSessionStorageValue(session) {
+    return {
+        ...session,
+        results: session.results.map(({ profileContext, ...row }) => sameProfileContext(profileContext, session.profileContext)
+            ? row
+            : { ...row, profileContext }),
+    };
+}
+/** Current wire bytes for sessions already admitted by the collection owner. */
+export function serializeNormalizedBulkSessions(sessions) {
+    return JSON.stringify({ schema: BULK_SESSION_SCHEMA, version: BULK_SESSION_SCHEMA_VERSION, sessions: sessions.map(bulkSessionStorageValue) });
+}
 export function serializeBulkSessionStore(raw) {
-    return JSON.stringify(normalizeBulkSessionStore(raw));
+    return serializeNormalizedBulkSessions(normalizeBulkSessionStore(raw).sessions);
 }
 function byteLength(value) {
     return new TextEncoder().encode(value).byteLength;
@@ -447,11 +489,16 @@ function byteLength(value) {
 export function enforceBulkSessionStoreBudget(raw) {
     const store = normalizeBulkSessionStore(raw);
     let pruned = 0;
-    while (byteLength(JSON.stringify(store)) > MAX_BULK_SESSION_STORE_BYTES && store.sessions.length > 1) {
+    const sessionBytes = store.sessions.map((session) => byteLength(JSON.stringify(bulkSessionStorageValue(session))));
+    let bytes = byteLength(JSON.stringify({ ...store, sessions: [] }))
+        + sessionBytes.reduce((total, size) => total + size, 0)
+        + Math.max(0, sessionBytes.length - 1);
+    while (bytes > MAX_BULK_SESSION_STORE_BYTES && store.sessions.length > 1) {
+        bytes -= sessionBytes.pop() + 1;
         store.sessions.pop();
         pruned += 1;
     }
-    if (byteLength(JSON.stringify(store)) > MAX_BULK_SESSION_STORE_BYTES) {
+    if (bytes > MAX_BULK_SESSION_STORE_BYTES) {
         throw new Error('This Bulk session exceeds the 4 MiB browser-local session limit.');
     }
     return { store, pruned };
@@ -474,9 +521,29 @@ export function upsertBulkSession(raw, sessionRaw) {
         sessions: bounded.store.sessions,
         session,
         added: index < 0,
-        pruned: bounded.pruned,
+        pruned: Math.max(0, next.length - bounded.store.sessions.length),
     };
 }
+/** Ephemeral retention preview, never part of the stored or exported format. */
+export function prepareBulkSessionSave(raw, sessionRaw) {
+    const current = normalizeBulkSessionStore(raw).sessions;
+    const result = upsertBulkSession(current, sessionRaw);
+    if (!result.sessions.some((session) => session.id === result.session.id)) {
+        throw new Error('This Bulk session cannot fit alongside the saved sessions. Export or remove saved sessions before trying again. Nothing was changed.');
+    }
+    const retained = new Set(result.sessions.map((session) => session.id));
+    const removed = current.filter((session) => !retained.has(session.id));
+    return {
+        ...result,
+        current,
+        removed,
+        removedBytes: removed.reduce((total, session) => total + byteLength(JSON.stringify(bulkSessionStorageValue(session))), 0),
+    };
+}
+/** Confirmation applies to the exact records displayed, not just their IDs. */
+export function bulkSessionSavePreviewIsCurrent(raw, preview) {
+    return serializeBulkSessionStore(raw) === serializeNormalizedBulkSessions(preview.current);
+}
 export function deleteBulkSession(raw, idRaw) {
     const id = boundedText(idRaw, 128);
     return normalizeBulkSessionStore({
@@ -488,10 +555,11 @@ export function deleteBulkSession(raw, idRaw) {
 function sourceStateMap(value) {
     return new Map(value.sourceCoverage.map((item) => [item.source, item.state]));
 }
-function comparableRisk(previous, current) {
+export function areBulkRiskScoresComparable(previous, current) {
     return previous.profileContext.sourceState === 'ready'
         && current.profileContext.sourceState === 'ready'
         && sameProfileContext(previous.profileContext, current.profileContext)
+        && previous.scanDepth === current.scanDepth
         && previous.risk !== null
         && current.risk !== null
         && previous.riskModelVersion !== null
@@ -501,7 +569,7 @@ function resultChanges(previous, current) {
     const changes = [];
     if (previous.availability !== current.availability)
         changes.push(`Registration: ${previous.availability} → ${current.availability}`);
-    if (comparableRisk(previous, current) && previous.risk !== current.risk) {
+    if (areBulkRiskScoresComparable(previous, current) && previous.risk !== current.risk) {
         changes.push(`Risk: ${previous.risk ?? 'unavailable'} → ${current.risk ?? 'unavailable'}`);
     }
     if (previous.registrar !== current.registrar)
@@ -554,7 +622,7 @@ export function compareBulkSessions(baselineRaw, currentRaw) {
             rows.push({ domain, changes: ['Absent from the later settled result set.'] });
         }
         else {
-            if (!comparableRisk(previous, next))
+            if (!areBulkRiskScoresComparable(previous, next))
                 riskIncomparable = true;
             const changes = resultChanges(previous, next);
             if (changes.length)
@@ -576,7 +644,7 @@ export function compareBulkSessions(baselineRaw, currentRaw) {
             'A source-state change may reflect collection availability rather than a change to the domain.',
             'A missing row means it was not completed in that saved session; it does not establish domain removal.',
             ...(riskIncomparable
-                ? ['Risk deltas are omitted unless both rows retain the same ready Brand Profile provenance and the same versioned Risk model.']
+                ? ['Risk deltas are omitted unless both rows retain the same ready Brand Profile provenance, scan depth, and versioned Risk model.']
                 : []),
         ],
     };
@@ -587,7 +655,7 @@ export function buildBulkSessionExport(sessions, generatedAt = new Date().toISOS
         schema: BULK_SESSION_SCHEMA,
         version: BULK_SESSION_SCHEMA_VERSION,
         generatedAt: timestamp(generatedAt, new Date().toISOString()),
-        sessions: store.sessions,
+        sessions: store.sessions.map(bulkSessionStorageValue),
         limitations: [
             'Compact Bulk results and source states only; raw source payloads and contact records are excluded.',
             'Import is non-destructive and does not resume network collection automatically.',
@@ -595,8 +663,8 @@ export function buildBulkSessionExport(sessions, generatedAt = new Date().toISOS
     };
 }
 export function mergeBulkSessions(localRaw, importedRaw) {
-    assertWorkspaceInputGraph(localRaw, 'Local Bulk-session store');
-    assertWorkspaceInputGraph(importedRaw, 'Imported Bulk-session document');
+    assertWorkspaceInputGraph(localRaw, 'Local Bulk-session store', { maximumBytes: MAX_BULK_SESSION_STORE_BYTES * 2 });
+    assertWorkspaceInputGraph(importedRaw, 'Imported Bulk-session document', { maximumBytes: MAX_BULK_SESSION_STORE_BYTES * 2 });
     assertWorkspacePortableVersion(importedRaw, BULK_SESSION_SCHEMA_VERSION, 'Imported Bulk-session document');
     const imported = record(importedRaw);
     if (!imported || imported.schema !== BULK_SESSION_SCHEMA || !Array.isArray(imported.sessions)) {
@@ -613,7 +681,7 @@ export function mergeBulkSessions(localRaw, importedRaw) {
     let updated = 0;
     let skipped = 0;
     for (const candidate of imported.sessions.slice(0, MAX_BULK_SESSIONS * 4)) {
-        const normalized = normalizeBulkSession(candidate);
+        const normalized = normalizeBulkSession(candidate, Number(imported.version));
         if (!normalized) {
             skipped += 1;
             continue;
@@ -648,8 +716,16 @@ export function mergeBulkSessions(localRaw, importedRaw) {
             skipped += 1;
             continue;
         }
+        // An import is additive: count and byte pressure must not silently remove
+        // a local session (or an earlier admitted import). The preview reports
+        // the skipped candidate and the analyst can export/remove data explicitly.
+        const merged = upsertBulkSession(sessions, session);
+        if (merged.pruned > 0 || !merged.sessions.some((item) => item.id === session.id)) {
+            skipped += 1;
+            continue;
+        }
         added += 1;
-        sessions = upsertBulkSession(sessions, session).sessions;
+        sessions = merged.sessions;
     }
     const bounded = enforceBulkSessionStoreBudget({
         schema: BULK_SESSION_SCHEMA,

package/packages/workspace/bulk-sort.mjs

@@ -1,3 +1,4 @@
+export const BULK_SORT_KEYS = ['domain', 'availability', 'confidence', 'risk', 'opportunity', 'activity', 'registrar', 'mutation'];
 /** Opportunity remains a retained data/export field, but is no longer a Bulk presentation sort. */
 export function normalizeBulkPresentationSortKey(key) {
     return key === 'opportunity' ? 'risk' : key;

package/packages/workspace/case-views.mjs

@@ -0,0 +1,102 @@
+import { CASE_VIEWS_SCHEMA, CASE_VIEWS_VERSION, CASE_VIEW_SORTS, MAX_CASE_VIEWS, MAX_CASE_VIEWS_BYTES, MAX_CASE_VIEW_NAME_LENGTH, MAX_CASE_VIEW_SEARCH_LENGTH, } from "../contracts/case-views-contract.mjs";
+import { isValidDisposition, isValidStatus } from "../cases/case-record-decisions.mjs";
+import { normalizeExplicitIsoTimestamp } from "../evidence/observation.mjs";
+import { assertWorkspaceInputGraph, ordinaryWorkspaceRecord } from "./hostile-input.mjs";
+const encoder = new TextEncoder();
+const control = /[\u0000-\u001f\u007f]/u;
+function object(raw, keys, label) {
+    const value = ordinaryWorkspaceRecord(raw, label);
+    if (!value || Object.keys(value).length !== keys.length || Object.keys(value).some(key => !keys.includes(key)))
+        throw new Error(`${label} has missing or unsupported fields.`);
+    return value;
+}
+function text(raw, maximum, label) {
+    if (typeof raw !== 'string' || raw.length > maximum || control.test(raw))
+        throw new Error(`${label} is invalid or exceeds ${maximum} characters.`);
+    return raw;
+}
+function time(raw) {
+    const value = normalizeExplicitIsoTimestamp(raw);
+    if (!value)
+        throw new Error('A saved Case view has an invalid timestamp.');
+    return value;
+}
+export function normalizeCaseViewFilters(raw) {
+    const value = object(raw, ['status', 'disposition', 'search', 'sort'], 'Case filters');
+    if (value.status !== '' && !isValidStatus(value.status))
+        throw new Error('Unsupported Case status filter.');
+    if (value.disposition !== '' && !isValidDisposition(value.disposition))
+        throw new Error('Unsupported Case disposition filter.');
+    const sort = CASE_VIEW_SORTS.find(option => option.value === value.sort)?.value;
+    if (!sort)
+        throw new Error('Unsupported Case sort order.');
+    return { status: value.status, disposition: value.disposition, search: text(value.search, MAX_CASE_VIEW_SEARCH_LENGTH, 'Case search'), sort };
+}
+export function emptyCaseViewsStore() {
+    return { schema: CASE_VIEWS_SCHEMA, version: CASE_VIEWS_VERSION, views: [] };
+}
+export function caseViewsStoreVersion(raw) {
+    const value = ordinaryWorkspaceRecord(raw, 'Case views');
+    return value?.schema === CASE_VIEWS_SCHEMA && Number.isSafeInteger(value.version) ? value.version : null;
+}
+/** Strict, lossless admission: invalid views and capacity excess never prune saved work. */
+export function normalizeCaseViewsStore(raw) {
+    if (raw === null || raw === undefined)
+        return emptyCaseViewsStore();
+    assertWorkspaceInputGraph(raw, 'Saved Case views', { maximumBytes: MAX_CASE_VIEWS_BYTES });
+    const store = object(raw, ['schema', 'version', 'views'], 'Case views');
+    if (store.schema !== CASE_VIEWS_SCHEMA || store.version !== CASE_VIEWS_VERSION)
+        throw new Error('Unsupported saved Case view format. No views were changed.');
+    if (!Array.isArray(store.views) || store.views.length > MAX_CASE_VIEWS)
+        throw new Error(`Keep at most ${MAX_CASE_VIEWS} saved Case views. Delete unwanted views explicitly before adding more.`);
+    const ids = new Set();
+    const views = [];
+    let bytes = encoder.encode(JSON.stringify(emptyCaseViewsStore())).byteLength;
+    for (const candidate of store.views) {
+        const value = object(candidate, ['id', 'name', 'filters', 'createdAt', 'updatedAt'], 'Saved Case view');
+        if (typeof value.id !== 'string' || !/^[A-Za-z0-9_-]{1,128}$/u.test(value.id) || ids.has(value.id))
+            throw new Error('Invalid or duplicate saved Case view identity.');
+        ids.add(value.id);
+        const name = text(value.name, MAX_CASE_VIEW_NAME_LENGTH, 'Case view name').trim();
+        if (!name)
+            throw new Error('Name this Case view.');
+        const createdAt = time(value.createdAt);
+        const updatedAt = time(value.updatedAt);
+        if (Date.parse(updatedAt) < Date.parse(createdAt))
+            throw new Error('A saved Case view update precedes its creation.');
+        const view = { id: value.id, name, filters: normalizeCaseViewFilters(value.filters), createdAt, updatedAt };
+        bytes += encoder.encode(JSON.stringify(view)).byteLength + (views.length ? 1 : 0);
+        if (bytes > MAX_CASE_VIEWS_BYTES)
+            throw new Error('Saved Case views exceed their storage limit. Existing views were not removed.');
+        views.push(view);
+    }
+    return { ...emptyCaseViewsStore(), views };
+}
+export function serializeCaseViewsStore(raw) {
+    return JSON.stringify(normalizeCaseViewsStore(raw));
+}
+export function serialiseCaseViewsJson(raw) {
+    return `${JSON.stringify(normalizeCaseViewsStore(raw), null, 2)}\n`;
+}
+export function mergeCaseViews(local, incoming) {
+    const current = normalizeCaseViewsStore(local);
+    const imported = normalizeCaseViewsStore(incoming);
+    const views = new Map(current.views.map(view => [view.id, view]));
+    let added = 0, updated = 0, skipped = 0;
+    for (const view of imported.views) {
+        const existing = views.get(view.id);
+        if (!existing) {
+            views.set(view.id, view);
+            added += 1;
+        }
+        else if (JSON.stringify(existing) === JSON.stringify(view))
+            continue;
+        else if (Date.parse(view.updatedAt) > Date.parse(existing.updatedAt) && view.createdAt === existing.createdAt) {
+            views.set(view.id, view);
+            updated += 1;
+        }
+        else
+            skipped += 1;
+    }
+    return { store: normalizeCaseViewsStore({ ...current, views: [...views.values()] }), added, updated, skipped };
+}

package/packages/workspace/detection-rule-model.mjs

@@ -2,6 +2,7 @@
 // small structured language: field names and operators come from allowlists,
 // so imported rules cannot execute code or reach outside bounded case evidence.
 import { latestCaseEvidence } from "../cases/case-model.mjs";
+import { CASE_DISPOSITIONS, CASE_STATUSES } from "../cases/case-record-contracts.mjs";
 import { assertWorkspaceDeclaredVersion, assertWorkspaceInputGraph, assertWorkspacePortableVersion, ordinaryWorkspaceRecord } from "./hostile-input.mjs";
 import { DETECTION_RULE_SCHEMA, DETECTION_RULE_SCHEMA_VERSION, MAX_CONDITION_VALUE_LENGTH, MAX_CUSTOM_RISK_TOTAL, MAX_DETECTION_RULES, MAX_RULE_CONDITIONS, MAX_RULE_INPUT_RECORDS, MAX_RULE_NAME_LENGTH, MAX_RULE_RISK_DELTA, MAX_RULE_STORE_BYTES, MAX_RULE_TAG_LENGTH, } from "../contracts/workspace-portability.mjs";
 export { DETECTION_RULE_SCHEMA, DETECTION_RULE_SCHEMA_VERSION, MAX_CONDITION_VALUE_LENGTH, MAX_CUSTOM_RISK_TOTAL, MAX_DETECTION_RULES, MAX_RULE_CONDITIONS, MAX_RULE_IMPORT_BYTES, MAX_RULE_INPUT_RECORDS, MAX_RULE_NAME_LENGTH, MAX_RULE_RISK_DELTA, MAX_RULE_STORE_BYTES, MAX_RULE_TAG_LENGTH, } from "../contracts/workspace-portability.mjs";
@@ -26,8 +27,8 @@ export const RULE_FIELD_DEFINITIONS = Object.freeze([
     { value: 'mutationTypes', label: 'Mutation type', kind: 'list' },
     { value: 'nameservers', label: 'Nameserver', kind: 'list' },
     { value: 'httpSecurityHeaders', label: 'HTTP security header', kind: 'list' },
-    { value: 'status', label: 'Case status', kind: 'enum', values: ['new', 'investigating', 'monitoring', 'escalated', 'closed'] },
-    { value: 'disposition', label: 'Case disposition', kind: 'enum', values: ['unreviewed', 'benign', 'suspicious', 'confirmed_abuse', 'false_positive'] },
+    { value: 'status', label: 'Case status', kind: 'enum', values: CASE_STATUSES.map((item) => item.value) },
+    { value: 'disposition', label: 'Case disposition', kind: 'enum', values: CASE_DISPOSITIONS.map((item) => item.value) },
     { value: 'tags', label: 'Case tag', kind: 'list' },
 ]);
 const FIELD_BY_VALUE = new Map(RULE_FIELD_DEFINITIONS.map((field) => [field.value, field]));
@@ -103,13 +104,14 @@ export function normalizeDetectionRule(raw, { generateId = false } = {}) {
         return null;
     const conditions = [];
     const rawConditions = Array.isArray(item.conditions) ? item.conditions : [];
-    for (const item of rawConditions.slice(0, MAX_RULE_CONDITIONS)) {
-        const condition = normalizeRuleCondition(item);
-        if (condition)
-            conditions.push(condition);
-    }
-    if (!conditions.length)
+    if (!rawConditions.length || rawConditions.length > MAX_RULE_CONDITIONS)
         return null;
+    for (const rawCondition of rawConditions) {
+        const condition = normalizeRuleCondition(rawCondition);
+        if (!condition)
+            return null;
+        conditions.push(condition);
+    }
     const riskDelta = normalizeInteger(item.riskDelta, 0, MAX_RULE_RISK_DELTA);
     return {
         id: safeId(item.id) || (generateId ? makeId() : null),
@@ -121,6 +123,30 @@ export function normalizeDetectionRule(raw, { generateId = false } = {}) {
         tag: normalizedText(item.tag, MAX_RULE_TAG_LENGTH).toLowerCase(),
     };
 }
+function validateDetectionRule(raw, { generateId = false } = {}) {
+    const item = record(raw);
+    if (!Array.isArray(item.conditions) || !item.conditions.length) {
+        throw new Error('A custom rule needs at least one condition.');
+    }
+    if (item.conditions.length > MAX_RULE_CONDITIONS) {
+        throw new Error(`Custom rules are limited to ${MAX_RULE_CONDITIONS} conditions.`);
+    }
+    for (const [index, condition] of item.conditions.entries()) {
+        if (!normalizeRuleCondition(condition)) {
+            throw new Error(`Condition ${index + 1} is invalid or outside the allowed bounds.`);
+        }
+    }
+    if (item.match !== undefined && item.match !== 'all' && item.match !== 'any') {
+        throw new Error('Choose whether all or any conditions must match.');
+    }
+    if (item.riskDelta !== undefined && normalizeInteger(item.riskDelta, 0, MAX_RULE_RISK_DELTA) === null) {
+        throw new Error(`Custom contribution must be a whole number from 0 to ${MAX_RULE_RISK_DELTA}.`);
+    }
+    const normalized = normalizeDetectionRule(item, { generateId });
+    if (!normalized)
+        throw new Error('Enter a rule name and valid conditions.');
+    return normalized;
+}
 function ruleList(raw) {
     if (Array.isArray(raw))
         return raw;
@@ -133,23 +159,32 @@ export function detectionRuleStoreVersion(raw) {
     const item = record(raw);
     return typeof item.version === 'number' && Number.isFinite(item.version) ? item.version : null;
 }
-export function normalizeDetectionRuleStore(raw) {
+export function recoverDetectionRuleStore(raw) {
     assertWorkspaceInputGraph(raw, 'Detection-rule store');
     assertWorkspaceDeclaredVersion(raw, 'Detection-rule store');
     const byId = new Map();
-    for (const item of ruleList(raw).slice(0, MAX_RULE_INPUT_RECORDS)) {
+    const source = ruleList(raw);
+    let rejected = Math.max(0, source.length - MAX_RULE_INPUT_RECORDS);
+    for (const item of source.slice(0, MAX_RULE_INPUT_RECORDS)) {
         const rule = normalizeDetectionRule(item);
-        if (!rule?.id || byId.has(rule.id))
+        if (!rule?.id || byId.has(rule.id)) {
+            rejected += 1;
             continue;
+        }
+        if (byId.size >= MAX_DETECTION_RULES) {
+            rejected += 1;
+            continue;
+        }
         byId.set(rule.id, { ...rule, id: rule.id });
-        if (byId.size >= MAX_DETECTION_RULES)
-            break;
     }
-    return { version: DETECTION_RULE_SCHEMA_VERSION, rules: [...byId.values()] };
+    return { store: { version: DETECTION_RULE_SCHEMA_VERSION, rules: [...byId.values()] }, rejected };
+}
+export function normalizeDetectionRuleStore(raw) {
+    return recoverDetectionRuleStore(raw).store;
 }
 export function createDetectionRule(rules, input) {
-    const normalized = normalizeDetectionRule(input, { generateId: true });
-    if (!normalized?.id)
+    const normalized = validateDetectionRule(input, { generateId: true });
+    if (!normalized.id)
         throw new Error('Enter a rule name and one valid condition.');
     const existing = normalizeDetectionRuleStore(rules).rules;
     if (existing.length >= MAX_DETECTION_RULES)
@@ -162,8 +197,8 @@ export function updateDetectionRule(rules, id, patch) {
     const current = normalizedRules.find((rule) => rule.id === id);
     if (!current)
         throw new Error('That custom rule no longer exists.');
-    const updated = normalizeDetectionRule({ ...current, ...record(patch), id });
-    if (!updated?.id)
+    const updated = validateDetectionRule({ ...current, ...record(patch), id });
+    if (!updated.id)
         throw new Error('A custom rule needs a name and at least one valid condition.');
     return normalizeDetectionRuleStore(normalizedRules.map((rule) => rule.id === id ? updated : rule)).rules;
 }
@@ -245,8 +280,14 @@ function ruleSignature(rule) {
     });
 }
 export function previewDetectionRule(records, existingRules, rawCandidate) {
-    const normalized = normalizeDetectionRule({ ...record(rawCandidate), id: 'preview-rule', enabled: true });
-    if (!normalized?.id)
+    let normalized;
+    try {
+        normalized = validateDetectionRule({ ...record(rawCandidate), id: 'preview-rule', enabled: true });
+    }
+    catch {
+        return null;
+    }
+    if (!normalized.id)
         return null;
     const candidate = { ...normalized, id: normalized.id };
     const sourceRecords = Array.isArray(records) ? records.slice(0, 500) : [];
@@ -295,8 +336,15 @@ export function mergeDetectionRules(localRaw, importedRaw) {
     let updated = 0;
     let skipped = Math.max(0, importedList.length - MAX_RULE_INPUT_RECORDS);
     for (const item of importedList.slice(0, MAX_RULE_INPUT_RECORDS)) {
-        const rule = normalizeDetectionRule(item);
-        if (!rule?.id) {
+        let rule;
+        try {
+            rule = validateDetectionRule(item);
+        }
+        catch {
+            skipped++;
+            continue;
+        }
+        if (!rule.id) {
             skipped++;
             continue;
         }

package/packages/workspace/hostile-input.mjs

@@ -1,4 +1,5 @@
 import { MAX_WORKSPACE_INPUT_ARRAY_LENGTH, MAX_WORKSPACE_INPUT_GRAPH_DEPTH, MAX_WORKSPACE_INPUT_GRAPH_NODES, MAX_WORKSPACE_INPUT_OBJECT_KEYS, MAX_WORKSPACE_INPUT_STRING_CODE_UNITS, } from "../contracts/workspace-portability.mjs";
+import { boundedJsonLimitsForBytes } from "../../lib/bounded-json.mjs";
 function inputError(label, detail) {
     return new TypeError(`${label} must be bounded ordinary JSON data; ${detail}.`);
 }
@@ -27,9 +28,7 @@ function ownDataDescriptors(value, label) {
         return [key, descriptor];
     });
 }
-export function ordinaryWorkspaceRecord(value, label = 'Workspace input') {
-    if (!value || typeof value !== 'object' || Array.isArray(value))
-        return null;
+function ordinaryRecordDescriptors(value, label) {
     let prototype;
     try {
         prototype = Object.getPrototypeOf(value);
@@ -47,19 +46,33 @@ export function ordinaryWorkspaceRecord(value, label = 'Workspace input') {
     if (descriptors.some(([, descriptor]) => !descriptor.enumerable)) {
         throw inputError(label, 'non-enumerable object fields are not supported');
     }
+    return descriptors;
+}
+export function ordinaryWorkspaceRecord(value, label = 'Workspace input') {
+    if (!value || typeof value !== 'object' || Array.isArray(value))
+        return null;
+    ordinaryRecordDescriptors(value, label);
     return value;
 }
-export function assertWorkspaceInputGraph(value, label = 'Workspace input') {
+export function assertWorkspaceInputGraph(value, label = 'Workspace input', options = {}) {
+    const limits = options.maximumBytes === undefined ? null : boundedJsonLimitsForBytes(options.maximumBytes);
+    const maximumStringCodeUnits = limits?.maximumStringCodeUnits ?? MAX_WORKSPACE_INPUT_STRING_CODE_UNITS;
     const pending = [{ value, depth: 0, label }];
     const seen = new WeakSet();
     let nodes = 0;
+    let values = 0;
+    let keys = 0;
     let stringCodeUnits = 0;
     while (pending.length) {
         const current = pending.pop();
         const candidate = current.value;
+        values += 1;
+        if (limits && values > limits.maximumValues) {
+            throw inputError(label, 'the graph exceeds the byte-budgeted value ceiling');
+        }
         if (typeof candidate === 'string') {
             stringCodeUnits += candidate.length;
-            if (stringCodeUnits > MAX_WORKSPACE_INPUT_STRING_CODE_UNITS) {
+            if (stringCodeUnits > maximumStringCodeUnits) {
                 throw inputError(label, 'aggregate text exceeds the string ceiling');
             }
             continue;
@@ -76,7 +89,7 @@ export function assertWorkspaceInputGraph(value, label = 'Workspace input') {
             throw inputError(label, 'the nesting depth exceeds the graph ceiling');
         }
         nodes += 1;
-        if (nodes > MAX_WORKSPACE_INPUT_GRAPH_NODES) {
+        if (!limits && nodes > MAX_WORKSPACE_INPUT_GRAPH_NODES) {
             throw inputError(label, 'the graph exceeds the node ceiling');
         }
         if (seen.has(candidate))
@@ -118,8 +131,16 @@ export function assertWorkspaceInputGraph(value, label = 'Workspace input') {
             }
             continue;
         }
-        const record = ordinaryWorkspaceRecord(candidate, current.label);
-        const descriptors = ownDataDescriptors(record, current.label);
+        const descriptors = ordinaryRecordDescriptors(candidate, current.label);
+        if (limits) {
+            keys += descriptors.length;
+            if (keys > limits.maximumKeys)
+                throw inputError(label, 'the graph exceeds the byte-budgeted key ceiling');
+            stringCodeUnits += descriptors.reduce((total, [key]) => total + key.length, 0);
+            if (stringCodeUnits > maximumStringCodeUnits) {
+                throw inputError(label, 'aggregate text exceeds the string ceiling');
+            }
+        }
         for (const [key, descriptor] of descriptors) {
             pending.push({
                 value: descriptor.value,