@aikdna/kdna-core 0.20.0 → 0.22.0

package/src/asset-reader.js

@@ -7,6 +7,7 @@ const crypto = require('crypto');
 const zlib = require('zlib');
 const cbor = require('cbor-x');
 const { loaderVersionUnsupportedMessage } = require('./loader-compatibility');
+const { SIGNATURE_ENTRY_NAME } = require('./signature');
 
 const KDNA_MEDIA_TYPE = 'application/vnd.kdna.asset';
 const ASSET_SOURCE_BYTES = Symbol.for('@aikdna/kdna-core.asset-source-bytes');
@@ -46,10 +47,6 @@ function compareEntryNamesByUtf8(left, right) {
   return Buffer.compare(Buffer.from(left, 'utf8'), Buffer.from(right, 'utf8'));
 }
 
-function sortedEntryNames(entries) {
-  return [...entries.keys()].sort(compareEntryNamesByUtf8);
-}
-
 function parseJson(buf, entryName) {
   try {
     return JSON.parse(Buffer.isBuffer(buf) ? buf.toString('utf8') : String(buf));
@@ -190,7 +187,6 @@ function normalizeInput(input) {
 
 function manifestForDigest(manifest) {
   const copy = { ...(manifest || {}) };
-  delete copy.signature;
   delete copy.asset_digest;
   delete copy.container_sha256;
   delete copy.content_digest;
@@ -203,13 +199,23 @@ function manifestForDigest(manifest) {
   return copy;
 }
 
-function buildContentDigest(asset) {
+// Entries excluded from the canonical content tree (docs/CANONICALIZATION.md).
+// signature.kdsig can never be part of the content it signs.
+const CONTENT_DIGEST_EXCLUDED_ENTRIES = new Set(['.DS_Store', 'build-receipt.json', 'signature.kdsig']);
+
+/**
+ * Compute the canonical content digest over a map of entry name → Buffer.
+ * Shared by the asset reader and the container signature gate so both always
+ * hash the same canonical bytes.
+ */
+function contentDigestFromEntryBuffers(buffers) {
+  const names = buffers instanceof Map ? [...buffers.keys()] : Object.keys(buffers);
+  const readBuffer = (name) => (buffers instanceof Map ? buffers.get(name) : buffers[name]);
   const parts = [];
-  const excluded = new Set(['.DS_Store', 'signature.json', 'build-receipt.json']);
-  for (const entryName of sortedEntryNames(asset.entries)) {
-    if (excluded.has(entryName)) continue;
+  for (const entryName of names.sort(compareEntryNamesByUtf8)) {
+    if (CONTENT_DIGEST_EXCLUDED_ENTRIES.has(entryName)) continue;
     if (entryName.startsWith('reports/')) continue;
-    const entryBuf = asset.readEntry(entryName);
+    const entryBuf = readBuffer(entryName);
     let digestBuf = entryBuf;
     if (JSON_ENTRY_RE.test(entryName)) {
       const parsed = parseJson(entryBuf, entryName);
@@ -221,90 +227,12 @@ function buildContentDigest(asset) {
   return `sha256:${sha256Hex(Buffer.from(parts.join('\n')))}`;
 }
 
-function manifestForSignature(manifest, { stripDigestFields = true } = {}) {
-  // Mirrors manifestForDigest above. The two must agree on every field
-  // they strip, or the signing and digest paths will hash different
-  // representations of the same manifest and verifiers will report a
-  // mismatch on otherwise-valid assets.
-  //
-  // Bug: prior version omitted the `authoring.content_digest` strip
-  // that manifestForDigest performs, so the signing payload included
-  // a digest field that the digest payload did not.
-  const copy = { ...(manifest || {}) };
-  delete copy.signature;
-  delete copy._source;
-  if (stripDigestFields) {
-    delete copy.asset_digest;
-    delete copy.container_sha256;
-    delete copy.content_digest;
-    if (copy.authoring && typeof copy.authoring === 'object') {
-      const auth = { ...copy.authoring };
-      delete auth.content_digest;
-      copy.authoring = auth;
-    }
-  }
-  return copy;
-}
-
-function canonicalJsonEntry(entryName, entryBuf, options = {}) {
-  const parsed = parseJson(entryBuf, entryName);
-  const value = entryName === 'kdna.json' ? manifestForSignature(parsed, options) : parsed;
-  return Buffer.from(stableStringify(value));
-}
-
-function buildSigningPayload(asset, options = {}) {
-  // Bug (#147): the prior version only excluded `.DS_Store` and
-  // `signature.json`, while `buildContentDigest` above also excludes
-  // `build-receipt.json` and any entry under `reports/`. A producer
-  // that signed with this code and a verifier that digested the
-  // asset with `buildContentDigest` would compute two different
-  // byte strings and the signature would fail to verify. The fix
-  // mirrors `buildContentDigest`'s exclusion set exactly.
-  const parts = [];
-  for (const entryName of sortedEntryNames(asset.entries)) {
-    if (entryName === '.DS_Store' || entryName === 'signature.json') continue;
-    if (entryName === 'build-receipt.json') continue;
-    if (entryName.startsWith('reports/')) continue;
-    const entryBuf = asset.readEntry(entryName);
-    let payloadBuf = entryBuf;
-    if (JSON_ENTRY_RE.test(entryName)) {
-      payloadBuf = canonicalJsonEntry(entryName, entryBuf, options);
-    }
-    parts.push(`${entryName}:${sha256Hex(payloadBuf)}`);
-  }
-  return parts.join('\n');
-}
-
-function verifySignature(asset, manifest, errors, warnings) {
-  if (!manifest.signature) {
-    warnings.push('kdna.json.signature missing');
-    return null;
-  }
-  if (!manifest.author?.public_key_pem) {
-    errors.push('kdna.json.author.public_key_pem missing');
-    return false;
-  }
-  if (!manifest.author?.pubkey) {
-    errors.push('kdna.json.author.pubkey missing');
-    return false;
-  }
-
-  const fingerprint = `ed25519:${sha256Hex(Buffer.from(manifest.author.public_key_pem))}`;
-  if (fingerprint !== manifest.author.pubkey) {
-    errors.push('author.public_key_pem fingerprint does not match author.pubkey');
-    return false;
-  }
-
-  try {
-    const signature = Buffer.from(String(manifest.signature).replace(/^ed25519:/, ''), 'hex');
-    const publicKey = crypto.createPublicKey(manifest.author.public_key_pem);
-    const ok = crypto.verify(null, Buffer.from(buildSigningPayload(asset)), publicKey, signature);
-    if (!ok) errors.push('Ed25519 signature invalid');
-    return ok;
-  } catch (e) {
-    errors.push(`signature verification failed: ${e.message}`);
-    return false;
+function buildContentDigest(asset) {
+  const buffers = new Map();
+  for (const entryName of asset.entries.keys()) {
+    buffers.set(entryName, asset.readEntry(entryName));
   }
+  return contentDigestFromEntryBuffers(buffers);
 }
 
 function verifyMediaType(asset, errors) {
@@ -464,9 +392,12 @@ function verifySync(asset, options = {}) {
 
   // The current implementation is the sole authority for container,
   // manifest, CBOR payload, checksum, and load-contract validity. The reader
-  // adds transport identity and legacy signature hooks; it must not maintain a
-  // second manifest or payload dialect.
+  // adds transport identity; it must not maintain a second manifest or payload
+  // dialect.
   appendCurrentValidationErrors(asset, errors);
+  if (options.requireSignature === true && !asset.entries.has(SIGNATURE_ENTRY_NAME)) {
+    errors.push(`required asset signature is absent: missing entry ${SIGNATURE_ENTRY_NAME}`);
+  }
 
   if (!asset.entries.has('kdna.json')) errors.push('required entry missing: kdna.json');
   verifyMediaType(asset, errors);
@@ -484,7 +415,6 @@ function verifySync(asset, options = {}) {
   }
 
   let manifest = null;
-  let signature_valid = null;
   if (asset.entries.has('kdna.json')) {
     try {
       manifest = readManifest(asset);
@@ -515,9 +445,6 @@ function verifySync(asset, options = {}) {
           }
         }
       }
-      if (options.requireSignature || manifest.signature) {
-        signature_valid = verifySignature(asset, manifest, errors, warnings);
-      }
       // ── Human Lock signature verification ──────────────────
       if (asset.entries.has('KDNA_Core.json')) {
         try {
@@ -540,7 +467,6 @@ function verifySync(asset, options = {}) {
     manifest,
     asset_digest,
     content_digest,
-    signature_valid,
   };
 }
 
@@ -630,6 +556,9 @@ function createKdnaAssetReader() {
       const entries = [...asset.entries.keys()].sort();
 
       appendCurrentValidationErrors(asset, errors);
+      if (options.requireSignature === true && !asset.entries.has(SIGNATURE_ENTRY_NAME)) {
+        errors.push(`required asset signature is absent: missing entry ${SIGNATURE_ENTRY_NAME}`);
+      }
 
       if (!asset.entries.has('kdna.json')) errors.push('required entry missing: kdna.json');
       verifyMediaType(asset, errors);
@@ -647,7 +576,6 @@ function createKdnaAssetReader() {
       }
 
       let manifest = null;
-      let signature_valid = null;
       if (asset.entries.has('kdna.json')) {
         try {
           manifest = parseJson(asset.readEntry('kdna.json'), 'kdna.json');
@@ -678,9 +606,6 @@ function createKdnaAssetReader() {
               }
             }
           }
-          if (options.requireSignature || manifest.signature) {
-            signature_valid = verifySignature(asset, manifest, errors, warnings);
-          }
         } catch (e) {
           errors.push(e.message);
         }
@@ -694,7 +619,6 @@ function createKdnaAssetReader() {
         manifest,
         asset_digest,
         content_digest,
-        signature_valid,
       };
     },
 
@@ -708,5 +632,6 @@ function createKdnaAssetReader() {
 
 module.exports = {
   STANDARD_ENTRIES,
+  contentDigestFromEntryBuffers,
   createKdnaAssetReader,
 };