@slicedearth/whoisleuth-cli 2.2.0 → 2.4.0

package/lib/domain-control-manifest.mjs

@@ -1,21 +1,20 @@
 import { createHash } from 'node:crypto';
 import { domainToASCII } from 'node:url';
 import { canonicalArtifactJsonFor, } from "../packages/evidence/artifact-integrity.mjs";
-import { DOMAIN_CONTROL_MANIFEST_CURRENT_CANONICALIZATION, DOMAIN_CONTROL_MANIFEST_INPUT_SCHEMA, DOMAIN_CONTROL_MANIFEST_VERSION, DOMAIN_CONTROL_MANIFEST_SCHEMA, DOMAIN_CONTROL_TEXT_INPUT_BOUND_FACTOR, MAX_DOMAIN_CONTROL_CAA_PRESENTATION_LENGTH, MAX_CANONICAL_DOMAIN_CONTROL_RECORDS, MAX_DOMAIN_CONTROL_DS_PRESENTATION_LENGTH, MAX_DOMAIN_CONTROL_INPUT_RECORDS, MAX_DOMAIN_CONTROL_MANIFEST_ENTRIES, MAX_DOMAIN_CONTROL_TIMESTAMP_LENGTH, } from "../packages/contracts/domain-control-manifest.mjs";
-import { DOMAIN_CONTROL_REVIEW_FIELDS, DOMAIN_CONTROL_REVIEW_COMPARISON_KEYS, DOMAIN_CONTROL_REVIEW_COUNT_KEYS, DOMAIN_CONTROL_REVIEW_DOMAIN_KEYS, DOMAIN_CONTROL_REVIEW_INPUT_KEYS, DOMAIN_CONTROL_REVIEW_INPUT_SCHEMA, DOMAIN_CONTROL_REVIEW_LIMITATIONS, DOMAIN_CONTROL_REVIEW_MANIFEST_SUMMARY_KEYS, DOMAIN_CONTROL_REVIEW_OBSERVATION_FIELD_KEYS, DOMAIN_CONTROL_REVIEW_OBSERVATION_KEYS, DOMAIN_CONTROL_REVIEW_ROOT_KEYS, DOMAIN_CONTROL_REVIEW_SCHEMA, DOMAIN_CONTROL_REVIEW_VERSION, MAX_DOMAIN_CONTROL_REVIEW_OBSERVATIONS, MAX_DOMAIN_CONTROL_REVIEW_SOURCE_LENGTH, MAX_DOMAIN_CONTROL_REVIEW_TEXT_LENGTH, } from "../packages/contracts/domain-control-review.mjs";
-import { assertDomainControlManifestByteBudget, buildUnsignedDomainControlManifest, canonicalDomainControlRecordList, normalizeDomainControlManifestDocument, } from "../packages/evidence/domain-control-runtime.mjs";
+import { DOMAIN_CONTROL_MANIFEST_CURRENT_CANONICALIZATION, DOMAIN_CONTROL_MANIFEST_INPUT_SCHEMA, DOMAIN_CONTROL_MANIFEST_VERSION, DOMAIN_CONTROL_MANIFEST_SCHEMA, DOMAIN_CONTROL_TEXT_INPUT_BOUND_FACTOR, MAX_DOMAIN_CONTROL_CAA_PRESENTATION_LENGTH, MAX_CANONICAL_DOMAIN_CONTROL_RECORDS, MAX_CURRENT_DOMAIN_CONTROL_RECORDS, DOMAIN_CONTROL_RECORD_LIST_FIELDS, DOMAIN_CONTROL_RECORD_MODE_OPTIONS, PUBLIC_DOMAIN_CONTROL_MANIFEST_VERSION, MAX_DOMAIN_CONTROL_DS_PRESENTATION_LENGTH, MAX_DOMAIN_CONTROL_INPUT_RECORDS, MAX_DOMAIN_CONTROL_MANIFEST_ENTRIES, MAX_DOMAIN_CONTROL_TIMESTAMP_LENGTH, } from "../packages/contracts/domain-control-manifest.mjs";
+import { DOMAIN_CONTROL_REVIEW_FIELDS, DOMAIN_CONTROL_REVIEW_COMPARISON_KEYS, DOMAIN_CONTROL_REVIEW_COUNT_KEYS, DOMAIN_CONTROL_REVIEW_DOMAIN_KEYS, DOMAIN_CONTROL_REVIEW_INPUT_KEYS, DOMAIN_CONTROL_REVIEW_INPUT_SCHEMA, DOMAIN_CONTROL_REVIEW_LIMITATIONS, DOMAIN_CONTROL_REVIEW_MANIFEST_SUMMARY_KEYS, DOMAIN_CONTROL_REVIEW_OBSERVATION_FIELD_KEYS, DOMAIN_CONTROL_REVIEW_OBSERVATION_KEYS, DOMAIN_CONTROL_REVIEW_ROOT_KEYS, DOMAIN_CONTROL_REVIEW_SCHEMA, DOMAIN_CONTROL_REVIEW_VERSION, PUBLIC_DOMAIN_CONTROL_REVIEW_VERSION, SUPPORTED_DOMAIN_CONTROL_REVIEW_VERSIONS, PUBLIC_DOMAIN_CONTROL_REVIEW_COUNT_KEYS, PUBLIC_DOMAIN_CONTROL_REVIEW_COMPARISON_KEYS, PUBLIC_DOMAIN_CONTROL_REVIEW_LIMITATIONS, MAX_DOMAIN_CONTROL_REVIEW_OBSERVATIONS, MAX_DOMAIN_CONTROL_REVIEW_SOURCE_LENGTH, MAX_DOMAIN_CONTROL_REVIEW_TEXT_LENGTH, } from "../packages/contracts/domain-control-review.mjs";
+import { assertDomainControlManifestByteBudget, buildUnsignedDomainControlManifest, canonicalDomainControlRecordList, domainControlRecordMode, domainControlEvidenceAdmission, normalizeDomainControlManifestDocument, } from "../packages/evidence/domain-control-runtime.mjs";
 import { exactKeys } from "./bounded-contract-normalizers.mjs";
 import { normalizeExplicitIsoTimestamp, normalizeLegacyIsoTimestamp } from "../packages/evidence/observation.mjs";
 export { DOMAIN_CONTROL_MANIFEST_INPUT_SCHEMA, DOMAIN_CONTROL_MANIFEST_SCHEMA, DOMAIN_CONTROL_MANIFEST_VERSION, DOMAIN_CONTROL_REVIEW_INPUT_SCHEMA, DOMAIN_CONTROL_REVIEW_SCHEMA, DOMAIN_CONTROL_REVIEW_VERSION, };
 export const MAX_DOMAIN_CONTROL_ENTRIES = MAX_DOMAIN_CONTROL_MANIFEST_ENTRIES;
-export const MAX_DOMAIN_CONTROL_RECORDS = MAX_CANONICAL_DOMAIN_CONTROL_RECORDS;
+export const MAX_DOMAIN_CONTROL_RECORDS = MAX_CURRENT_DOMAIN_CONTROL_RECORDS;
 const REVIEW_INPUT_KEYS = new Set(DOMAIN_CONTROL_REVIEW_INPUT_KEYS);
 const OBSERVATION_KEYS = new Set(DOMAIN_CONTROL_REVIEW_OBSERVATION_KEYS);
 const OBSERVATION_FIELDS = new Set(DOMAIN_CONTROL_REVIEW_FIELDS);
 const OBSERVATION_FIELD_KEYS = new Set(DOMAIN_CONTROL_REVIEW_OBSERVATION_FIELD_KEYS);
 const REVIEW_ROOT_KEYS = new Set(DOMAIN_CONTROL_REVIEW_ROOT_KEYS);
 const REVIEW_MANIFEST_KEYS = new Set(DOMAIN_CONTROL_REVIEW_MANIFEST_SUMMARY_KEYS);
-const REVIEW_COUNT_KEYS = new Set(DOMAIN_CONTROL_REVIEW_COUNT_KEYS);
 const REVIEW_DOMAIN_KEYS = new Set(DOMAIN_CONTROL_REVIEW_DOMAIN_KEYS);
 const REVIEW_COMPARISON_KEYS = new Set(DOMAIN_CONTROL_REVIEW_COMPARISON_KEYS);
 function record(value) {
@@ -115,15 +114,13 @@ function hostnameList(value) {
     return [...new Set(value
             .map(domain)
             .filter((item) => item !== null))]
-        .sort()
-        .slice(0, MAX_DOMAIN_CONTROL_RECORDS);
+        .sort();
 }
 function textList(value, maximum = 300) {
     return [...new Set(value
             .map((item) => boundedText(item, maximum)?.toLowerCase() ?? null)
             .filter((item) => item !== null))]
-        .sort()
-        .slice(0, MAX_DOMAIN_CONTROL_RECORDS);
+        .sort();
 }
 function spkiFingerprint(value) {
     if (typeof value !== 'string'
@@ -188,24 +185,25 @@ function boundedDataArray(value, maximum) {
         return null;
     }
 }
-function fieldValues(field, value) {
+function fieldValues(field, value, maximum) {
     if (field === 'nameservers') {
         const normalized = value.map(domain);
-        return normalized.some((item) => item === null)
-            ? null
-            : hostnameList(normalized);
+        if (normalized.some((item) => item === null))
+            return null;
+        const values = hostnameList(normalized);
+        return values.length <= maximum ? values : null;
     }
     if (field === 'mx' || field === 'caa' || field === 'ds') {
         const normalized = value.flatMap((item) => canonicalDomainControlRecordList([item], field));
-        return normalized.length === value.length
-            ? [...new Set(normalized)].sort().slice(0, MAX_DOMAIN_CONTROL_RECORDS)
-            : null;
+        const values = [...new Set(normalized)].sort();
+        return normalized.length === value.length && values.length <= maximum ? values : null;
     }
     if (field === 'tlsSpkiSha256') {
         const normalized = value.map(spkiFingerprint);
-        return normalized.some((item) => item === null)
-            ? null
-            : [...new Set(normalized)].sort().slice(0, MAX_DOMAIN_CONTROL_RECORDS);
+        if (normalized.some((item) => item === null))
+            return null;
+        const values = [...new Set(normalized)].sort();
+        return values.length <= maximum ? values : null;
     }
     if (field === 'registrarLock') {
         return value.every((item) => item === 'required' || item === 'not_required')
@@ -213,11 +211,12 @@ function fieldValues(field, value) {
             : null;
     }
     const normalized = value.map((item) => boundedText(item, MAX_DOMAIN_CONTROL_REVIEW_TEXT_LENGTH)?.toLowerCase() ?? null);
-    return normalized.some((item) => item === null)
-        ? null
-        : textList(normalized, MAX_DOMAIN_CONTROL_REVIEW_TEXT_LENGTH);
+    if (normalized.some((item) => item === null))
+        return null;
+    const values = textList(normalized, MAX_DOMAIN_CONTROL_REVIEW_TEXT_LENGTH);
+    return values.length <= maximum ? values : null;
 }
-function normalizeObservation(value) {
+function normalizeObservation(value, legacy) {
     const source = record(value);
     const normalizedDomain = domain(source?.domain);
     const rawFields = record(source?.fields);
@@ -242,12 +241,12 @@ function normalizeObservation(value) {
         const values = boundedDataArray(raw.values, MAX_DOMAIN_CONTROL_INPUT_RECORDS);
         if (!sourceLabel || !values)
             return null;
-        const normalizedValues = fieldValues(field, values);
-        const observedAt = raw.observedAt === null ? null : timestamp(raw.observedAt, true);
+        const normalizedValues = fieldValues(field, values, legacy ? MAX_CANONICAL_DOMAIN_CONTROL_RECORDS : MAX_DOMAIN_CONTROL_RECORDS);
+        const observedAt = raw.observedAt === null ? null : timestamp(raw.observedAt, legacy);
         if (!normalizedValues || (raw.observedAt !== null && !observedAt))
             return null;
         fields[field] = Object.freeze({
-            state,
+            state: field === 'registrarLock' && state === 'observed' && normalizedValues.length !== 1 ? 'partial' : state,
             values: Object.freeze(normalizedValues),
             source: sourceLabel,
             observedAt,
@@ -264,18 +263,22 @@ function desiredValues(entry, field) {
         return entry.registrarLock ? [entry.registrarLock] : [];
     return [...entry[field]];
 }
-function compareField(entry, observation, field) {
+function compareField(entry, observation, field, now) {
     const desired = desiredValues(entry, field);
-    if (!desired.length)
+    const expectation = DOMAIN_CONTROL_RECORD_LIST_FIELDS.includes(field)
+        ? domainControlRecordMode(entry, field) : desired.length ? 'expect_records' : 'unconfigured';
+    if (expectation === 'unconfigured')
         return Object.freeze({
             field, state: 'not_configured', desired: Object.freeze([]), observed: Object.freeze([]), source: null, observedAt: null,
             explanation: 'No desired value was configured for this field.',
+            expectation,
         });
     const evidence = observation?.fields[field];
     if (!evidence)
         return Object.freeze({
             field, state: 'unavailable', desired: Object.freeze(desired), observed: Object.freeze([]), source: null, observedAt: null,
             explanation: 'No separately attributed observation was supplied for this field.',
+            expectation,
         });
     if (evidence.state !== 'observed')
         return Object.freeze({
@@ -288,7 +291,13 @@ function compareField(entry, observation, field) {
             explanation: evidence.state === 'partial'
                 ? 'The supplied observation was partial, so a difference is inconclusive.'
                 : `The supplied source reported this field as ${evidence.state}.`,
+            expectation,
         });
+    const limitation = domainControlEvidenceAdmission(evidence.observedAt, now);
+    if (limitation)
+        return Object.freeze({ field, state: 'partial', desired: Object.freeze(desired), observed: evidence.values, source: evidence.source, observedAt: evidence.observedAt, explanation: limitation, expectation });
+    if (expectation === 'observe_only')
+        return Object.freeze({ field, state: 'observed', desired: Object.freeze([]), observed: evidence.values, source: evidence.source, observedAt: evidence.observedAt, explanation: 'Observation only: no required record set is compared.', expectation });
     const aligned = desired.length === evidence.values.length && desired.every((item, index) => item === evidence.values[index]);
     return Object.freeze({
         field,
@@ -297,9 +306,12 @@ function compareField(entry, observation, field) {
         observed: evidence.values,
         source: evidence.source,
         observedAt: evidence.observedAt,
-        explanation: aligned
-            ? 'The complete supplied observation matches the desired value.'
-            : 'The complete supplied observation differs from the desired value.',
+        explanation: expectation === 'expect_none'
+            ? aligned ? 'The complete source observation contains no records, as expected.' : 'The complete source observation contains records where none are expected.'
+            : aligned
+                ? 'The complete supplied observation matches the desired value.'
+                : 'The complete supplied observation differs from the desired value.',
+        expectation,
     });
 }
 function renewalComparison(entry, now) {
@@ -307,16 +319,36 @@ function renewalComparison(entry, now) {
         return Object.freeze({
             field: 'renewalReviewAt', state: 'not_configured', desired: Object.freeze([]), observed: Object.freeze([]), source: null, observedAt: null,
             explanation: 'No renewal review date was configured.',
+            expectation: 'unconfigured',
         });
     const due = Date.parse(entry.renewalReviewAt) <= Date.parse(now);
     return Object.freeze({
         field: 'renewalReviewAt', state: due ? 'due' : 'aligned', desired: Object.freeze([entry.renewalReviewAt]), observed: Object.freeze([]), source: null, observedAt: null,
         explanation: due ? 'The configured renewal review date is due.' : 'The configured renewal review date is still in the future.',
+        expectation: 'expect_records',
     });
 }
+function aggregateComparisonState(comparisons, legacy = false) {
+    if (comparisons.some((item) => item.state === 'drift' || item.state === 'due'))
+        return 'drift';
+    if (comparisons.some((item) => ['partial', 'unavailable', 'unsupported'].includes(item.state)))
+        return 'partial';
+    if (legacy || comparisons.some((item) => item.state === 'aligned'))
+        return 'aligned';
+    return comparisons.some((item) => item.state === 'observed') ? 'observed' : 'not_configured';
+}
+function aggregateDomainState(domains, legacy = false) {
+    if (domains.some((item) => item.state === 'drift'))
+        return 'drift';
+    if (domains.some((item) => item.state === 'partial'))
+        return 'partial';
+    if (legacy || domains.some((item) => item.state === 'aligned'))
+        return 'aligned';
+    return domains.some((item) => item.state === 'observed') ? 'observed' : 'not_configured';
+}
 export function reviewDomainControlManifest(input, generatedAtValue = new Date().toISOString()) {
     const source = record(input);
-    if (!source || source.schema !== DOMAIN_CONTROL_REVIEW_INPUT_SCHEMA || source.version !== DOMAIN_CONTROL_REVIEW_VERSION) {
+    if (!source || source.schema !== DOMAIN_CONTROL_REVIEW_INPUT_SCHEMA || !SUPPORTED_DOMAIN_CONTROL_REVIEW_VERSIONS.includes(source.version)) {
         throw new TypeError(`Domain control review input must use ${DOMAIN_CONTROL_REVIEW_INPUT_SCHEMA} version ${DOMAIN_CONTROL_REVIEW_VERSION}.`);
     }
     exactKeys(source, REVIEW_INPUT_KEYS, 'Domain control review input');
@@ -324,11 +356,14 @@ export function reviewDomainControlManifest(input, generatedAtValue = new Date()
     if (!generatedAt)
         throw new TypeError('Domain control review time must be valid and include an explicit timezone.');
     const manifest = verifyDomainControlManifest(source.manifest);
+    const legacy = source.version === PUBLIC_DOMAIN_CONTROL_REVIEW_VERSION;
+    if (legacy && manifest.version !== PUBLIC_DOMAIN_CONTROL_MANIFEST_VERSION)
+        throw new TypeError('Public review input requires its published manifest contract; use the current review input version for explicit expectations.');
     const rawObservations = boundedDataArray(source.observations, MAX_DOMAIN_CONTROL_REVIEW_OBSERVATIONS);
     if (!rawObservations) {
         throw new TypeError('Domain control observations must be a bounded array.');
     }
-    const observations = rawObservations.map(normalizeObservation);
+    const observations = rawObservations.map((value) => normalizeObservation(value, legacy));
     if (observations.some((item) => item === null))
         throw new TypeError('Domain control review contains an invalid observation.');
     const normalizedObservations = observations;
@@ -339,23 +374,19 @@ export function reviewDomainControlManifest(input, generatedAtValue = new Date()
     const fields = DOMAIN_CONTROL_REVIEW_FIELDS;
     const domains = manifest.entries.map((entry) => {
         const observation = observationMap.get(entry.domain) ?? null;
-        const comparisons = [...fields.map((field) => compareField(entry, observation, field)), renewalComparison(entry, generatedAt)];
-        const state = comparisons.some((item) => item.state === 'drift' || item.state === 'due')
-            ? 'drift'
-            : comparisons.some((item) => item.state === 'partial' || item.state === 'unavailable' || item.state === 'unsupported')
-                ? 'partial'
-                : 'aligned';
+        const comparisons = [...fields.map((field) => compareField(entry, observation, field, generatedAt)), renewalComparison(entry, generatedAt)];
+        const state = aggregateComparisonState(comparisons);
         return Object.freeze({ domain: entry.domain, state, comparisons: Object.freeze(comparisons) });
     });
     const comparisons = domains.flatMap((item) => item.comparisons);
-    const counts = Object.fromEntries(['aligned', 'drift', 'partial', 'unavailable', 'unsupported', 'not_configured', 'due']
+    const counts = Object.fromEntries(DOMAIN_CONTROL_REVIEW_COUNT_KEYS
         .map((state) => [state, comparisons.filter((item) => item.state === state).length]));
     const expired = Date.parse(manifest.expiresAt) <= Date.parse(generatedAt);
     return Object.freeze({
         schema: DOMAIN_CONTROL_REVIEW_SCHEMA,
         version: DOMAIN_CONTROL_REVIEW_VERSION,
         generatedAt,
-        state: expired ? 'expired' : domains.some((item) => item.state === 'drift') ? 'drift' : domains.some((item) => item.state === 'partial') ? 'partial' : 'aligned',
+        state: expired ? 'expired' : aggregateDomainState(domains),
         manifest: Object.freeze({
             generatedAt: manifest.generatedAt,
             expiresAt: manifest.expiresAt,
@@ -370,9 +401,14 @@ export function reviewDomainControlManifest(input, generatedAtValue = new Date()
 }
 export function validateDomainControlReviewDocument(value) {
     const root = exactReviewRecord(value, REVIEW_ROOT_KEYS, 'Domain control review document');
-    if (root.schema !== DOMAIN_CONTROL_REVIEW_SCHEMA || root.version !== DOMAIN_CONTROL_REVIEW_VERSION) {
+    if (root.schema !== DOMAIN_CONTROL_REVIEW_SCHEMA || !SUPPORTED_DOMAIN_CONTROL_REVIEW_VERSIONS.includes(root.version)) {
         throw new TypeError(`Domain control review document must use ${DOMAIN_CONTROL_REVIEW_SCHEMA} version ${DOMAIN_CONTROL_REVIEW_VERSION}.`);
     }
+    const legacy = root.version === PUBLIC_DOMAIN_CONTROL_REVIEW_VERSION;
+    const countKeys = legacy ? PUBLIC_DOMAIN_CONTROL_REVIEW_COUNT_KEYS : DOMAIN_CONTROL_REVIEW_COUNT_KEYS;
+    const comparisonKeys = legacy ? new Set(PUBLIC_DOMAIN_CONTROL_REVIEW_COMPARISON_KEYS) : REVIEW_COMPARISON_KEYS;
+    const recordMaximum = legacy ? MAX_CANONICAL_DOMAIN_CONTROL_RECORDS : MAX_DOMAIN_CONTROL_RECORDS;
+    const limitations = legacy ? PUBLIC_DOMAIN_CONTROL_REVIEW_LIMITATIONS : DOMAIN_CONTROL_REVIEW_LIMITATIONS;
     const generatedAt = exactReviewTimestamp(root.generatedAt, 'Domain control review document generatedAt');
     const manifestInput = exactReviewRecord(root.manifest, REVIEW_MANIFEST_KEYS, 'Domain control review document manifest');
     const manifestGeneratedAt = exactReviewTimestamp(manifestInput.generatedAt, 'Domain control review document manifest generatedAt');
@@ -390,9 +426,9 @@ export function validateDomainControlReviewDocument(value) {
         digestSha256: manifestInput.digestSha256,
         expired,
     });
-    const countInput = exactReviewRecord(root.counts, REVIEW_COUNT_KEYS, 'Domain control review document counts');
+    const countInput = exactReviewRecord(root.counts, new Set(countKeys), 'Domain control review document counts');
     const maximumComparisons = MAX_DOMAIN_CONTROL_MANIFEST_ENTRIES * (DOMAIN_CONTROL_REVIEW_FIELDS.length + 1);
-    const suppliedCounts = Object.fromEntries(DOMAIN_CONTROL_REVIEW_COUNT_KEYS.map((state) => [
+    const suppliedCounts = Object.fromEntries(countKeys.map((state) => [
         state,
         exactReviewInteger(countInput[state], maximumComparisons, `Domain control review document count ${state}`),
     ]));
@@ -401,8 +437,8 @@ export function validateDomainControlReviewDocument(value) {
         throw new TypeError('Domain control review document domains must be a bounded non-empty array.');
     }
     const comparisonFields = [...DOMAIN_CONTROL_REVIEW_FIELDS, 'renewalReviewAt'];
-    const comparisonStates = new Set(DOMAIN_CONTROL_REVIEW_COUNT_KEYS);
-    const calculatedCounts = Object.fromEntries(DOMAIN_CONTROL_REVIEW_COUNT_KEYS.map((state) => [state, 0]));
+    const comparisonStates = new Set(countKeys);
+    const calculatedCounts = Object.fromEntries(countKeys.map((state) => [state, 0]));
     const domains = domainInput.map((domainValue, domainIndex) => {
         const item = exactReviewRecord(domainValue, REVIEW_DOMAIN_KEYS, `Domain control review document domain ${domainIndex + 1}`);
         const normalizedDomain = domain(item.domain);
@@ -414,7 +450,7 @@ export function validateDomainControlReviewDocument(value) {
             throw new TypeError(`Domain control review document domain ${domainIndex + 1} comparisons are incomplete.`);
         }
         const comparisons = comparisonsInput.map((comparisonValue, comparisonIndex) => {
-            const comparison = exactReviewRecord(comparisonValue, REVIEW_COMPARISON_KEYS, `Domain control review document domain ${domainIndex + 1} comparison ${comparisonIndex + 1}`);
+            const comparison = exactReviewRecord(comparisonValue, comparisonKeys, `Domain control review document domain ${domainIndex + 1} comparison ${comparisonIndex + 1}`);
             const expectedField = comparisonFields[comparisonIndex];
             if (comparison.field !== expectedField
                 || typeof comparison.state !== 'string'
@@ -428,8 +464,8 @@ export function validateDomainControlReviewDocument(value) {
                 : expectedField === 'caa'
                     ? MAX_DOMAIN_CONTROL_CAA_PRESENTATION_LENGTH
                     : MAX_DOMAIN_CONTROL_REVIEW_TEXT_LENGTH;
-            const desired = exactReviewStringArray(comparison.desired, MAX_DOMAIN_CONTROL_RECORDS, maximumValueCharacters, `Domain control review document domain ${domainIndex + 1} comparison ${comparisonIndex + 1} desired values`);
-            const observed = exactReviewStringArray(comparison.observed, MAX_DOMAIN_CONTROL_RECORDS, maximumValueCharacters, `Domain control review document domain ${domainIndex + 1} comparison ${comparisonIndex + 1} observed values`);
+            const desired = exactReviewStringArray(comparison.desired, recordMaximum, maximumValueCharacters, `Domain control review document domain ${domainIndex + 1} comparison ${comparisonIndex + 1} desired values`);
+            const observed = exactReviewStringArray(comparison.observed, recordMaximum, maximumValueCharacters, `Domain control review document domain ${domainIndex + 1} comparison ${comparisonIndex + 1} observed values`);
             const source = comparison.source === null
                 ? null
                 : exactReviewText(comparison.source, MAX_DOMAIN_CONTROL_REVIEW_SOURCE_LENGTH, `Domain control review document domain ${domainIndex + 1} comparison ${comparisonIndex + 1} source`);
@@ -439,6 +475,41 @@ export function validateDomainControlReviewDocument(value) {
             if (expectedField === 'renewalReviewAt' && (observed.length || source !== null || observedAt !== null)) {
                 throw new TypeError(`Domain control review document domain ${domainIndex + 1} renewal comparison is inconsistent.`);
             }
+            let expectation;
+            if (!legacy) {
+                if (expectedField !== 'renewalReviewAt') {
+                    for (const values of [desired, observed]) {
+                        const canonical = fieldValues(expectedField, values, recordMaximum);
+                        if (!canonical || canonical.length !== values.length || canonical.some((value, index) => value !== values[index]))
+                            throw new TypeError('Domain control review values are not canonical for their field.');
+                    }
+                }
+                if (!DOMAIN_CONTROL_RECORD_MODE_OPTIONS.some((mode) => mode.value === comparison.expectation))
+                    throw new TypeError('Domain control review comparison expectation is invalid.');
+                expectation = comparison.expectation;
+                if ((expectation === 'expect_records') !== (desired.length > 0)
+                    || (!DOMAIN_CONTROL_RECORD_LIST_FIELDS.includes(expectedField) && !['unconfigured', 'expect_records'].includes(expectation))
+                    || (expectation === 'unconfigured' && (state !== 'not_configured' || observed.length || source !== null || observedAt !== null))
+                    || (state === 'not_configured' && expectation !== 'unconfigured')
+                    || (state === 'observed' && expectation !== 'observe_only')
+                    || (['aligned', 'drift', 'due'].includes(state) && ['unconfigured', 'observe_only'].includes(expectation))) {
+                    throw new TypeError('Domain control review comparison expectation is inconsistent.');
+                }
+                if (expectedField === 'renewalReviewAt' && expectation === 'expect_records') {
+                    if (desired.length !== 1 || normalizeExplicitIsoTimestamp(desired[0]) !== desired[0]
+                        || state !== (Date.parse(desired[0]) <= Date.parse(generatedAt) ? 'due' : 'aligned'))
+                        throw new TypeError('Domain control renewal review state is inconsistent.');
+                }
+                else if (state === 'due')
+                    throw new TypeError('Only renewal review dates can be due.');
+                if (expectedField !== 'renewalReviewAt' && ['aligned', 'drift', 'observed'].includes(state)) {
+                    if (!source || domainControlEvidenceAdmission(observedAt, generatedAt))
+                        throw new TypeError('Domain control review requires current source timing for a conclusive comparison.');
+                    const equal = desired.length === observed.length && desired.every((value, index) => value === observed[index]);
+                    if ((state === 'aligned' && !equal) || (state === 'drift' && equal))
+                        throw new TypeError('Domain control review comparison result does not match its records.');
+                }
+            }
             return Object.freeze({
                 field: expectedField,
                 state,
@@ -447,15 +518,10 @@ export function validateDomainControlReviewDocument(value) {
                 source,
                 observedAt,
                 explanation: exactReviewText(comparison.explanation, MAX_DOMAIN_CONTROL_REVIEW_TEXT_LENGTH, `Domain control review document domain ${domainIndex + 1} comparison ${comparisonIndex + 1} explanation`),
+                ...(expectation !== undefined ? { expectation } : {}),
             });
         });
-        const expectedState = comparisons.some((comparison) => comparison.state === 'drift' || comparison.state === 'due')
-            ? 'drift'
-            : comparisons.some((comparison) => comparison.state === 'partial'
-                || comparison.state === 'unavailable'
-                || comparison.state === 'unsupported')
-                ? 'partial'
-                : 'aligned';
+        const expectedState = aggregateComparisonState(comparisons, legacy);
         if (item.state !== expectedState) {
             throw new TypeError(`Domain control review document domain ${domainIndex + 1} state is inconsistent.`);
         }
@@ -464,37 +530,31 @@ export function validateDomainControlReviewDocument(value) {
     if (new Set(domains.map((item) => item.domain)).size !== domains.length) {
         throw new TypeError('Domain control review document domains must be unique.');
     }
-    for (const state of DOMAIN_CONTROL_REVIEW_COUNT_KEYS) {
+    for (const state of countKeys) {
         if (suppliedCounts[state] !== calculatedCounts[state]) {
             throw new TypeError('Domain control review document counts are inconsistent.');
         }
     }
-    const expectedState = expired
-        ? 'expired'
-        : domains.some((item) => item.state === 'drift')
-            ? 'drift'
-            : domains.some((item) => item.state === 'partial')
-                ? 'partial'
-                : 'aligned';
+    const expectedState = expired ? 'expired' : aggregateDomainState(domains, legacy);
     if (root.state !== expectedState)
         throw new TypeError('Domain control review document state is inconsistent.');
     const ignoredObservationCount = exactReviewInteger(root.ignoredObservationCount, MAX_DOMAIN_CONTROL_REVIEW_OBSERVATIONS, 'Domain control review document ignored observation count');
-    const limitationsInput = boundedDataArray(root.limitations, DOMAIN_CONTROL_REVIEW_LIMITATIONS.length);
+    const limitationsInput = boundedDataArray(root.limitations, limitations.length);
     if (!limitationsInput
-        || limitationsInput.length !== DOMAIN_CONTROL_REVIEW_LIMITATIONS.length
-        || limitationsInput.some((item, index) => item !== DOMAIN_CONTROL_REVIEW_LIMITATIONS[index])) {
+        || limitationsInput.length !== limitations.length
+        || limitationsInput.some((item, index) => item !== limitations[index])) {
         throw new TypeError('Domain control review document limitations are invalid.');
     }
     return Object.freeze({
         schema: DOMAIN_CONTROL_REVIEW_SCHEMA,
-        version: DOMAIN_CONTROL_REVIEW_VERSION,
+        version: root.version,
         generatedAt,
         state: expectedState,
         manifest,
         counts: Object.freeze(suppliedCounts),
         domains: Object.freeze(domains),
         ignoredObservationCount,
-        limitations: DOMAIN_CONTROL_REVIEW_LIMITATIONS,
+        limitations,
     });
 }
 export function formatDomainControlResult(value) {

package/lib/domain-posture-analysis.mjs

@@ -2,7 +2,7 @@
 // injected so every traversal can be fixture-tested and the caller retains the
 // existing DNS timeout and missing/error semantics.
 import { parse as parseDomain } from 'tldts';
-import { parseDmarcRecords, parseSpfRecords } from "./domain-posture-parsers.mjs";
+import { parseDmarcRecords, parseDmarcReportingAuthorization, parseReportingDestination, parseSpfRecords } from "./domain-posture-parsers.mjs";
 const SPF_LOOKUP_LIMIT = 10;
 const SPF_VOID_LOOKUP_LIMIT = 2;
 const SPF_MAX_DEPTH = 5;
@@ -158,12 +158,15 @@ async function expandSpfPolicy(rootDomain, rootQuery, resolveTxt) {
     };
 }
 function reportDestinationDomain(value) {
-    const raw = String(value || '').trim();
-    if (!/^mailto:/iu.test(raw))
+    if (typeof value !== 'string')
         return null;
-    const address = raw.slice(7).split('!')[0] || '';
-    const at = address.lastIndexOf('@');
-    return at > 0 ? strictHostname(address.slice(at + 1)) : null;
+    // The obsolete DMARC report-size suffix remains readable, but arbitrary
+    // text after an exclamation mark must not repair a malformed destination.
+    const uri = value.trim().replace(/![0-9]+[kmgt]?$/iu, '');
+    if (/[!,;]/u.test(uri))
+        return null;
+    const destination = parseReportingDestination(uri);
+    return destination?.scheme === 'mailto' ? strictHostname(destination.host) : null;
 }
 async function validateDmarcExternalReporting(ownerDomain, dmarcQuery, resolveTxt) {
     if (dmarcQuery.error)
@@ -200,12 +203,22 @@ async function validateDmarcExternalReporting(ownerDomain, dmarcQuery, resolveTx
             continue;
         }
         const recordName = `${ownerDomain}._report._dmarc.${destinationDomain}`;
+        if (recordName.length > 253) {
+            results.push({ destination: destinationDomain, reportType: item.reportType, recordName: null, state: 'unavailable', error: 'The reporting authorisation query exceeds the DNS name limit.' });
+            continue;
+        }
         let query = cache.get(recordName);
         if (!query) {
             query = await resolveTxt(recordName);
             cache.set(recordName, query);
         }
-        const authorized = query.records.some((record) => (String(Array.isArray(record) ? record.join('') : record || '').trim().toUpperCase().startsWith('V=DMARC1')));
+        const authorized = query.records.some((record) => {
+            const tags = parseDmarcReportingAuthorization(record);
+            if (!tags)
+                return false;
+            // A recipient override cannot redirect authorisation to another host.
+            return tags.rua === undefined || tags.rua.split(',').every((destination) => reportDestinationDomain(destination) === destinationDomain);
+        });
         results.push({
             destination: destinationDomain,
             reportType: item.reportType,