Merge pull request #8738 from Agoric/mhofman/explicit-harden

Explicitly harden some shared prototypes

packages/SwingSet/src/kernel/state/kernelKeeper.js

@@ -548,6 +548,7 @@ export default function makeKernelKeeper(kernelStorage, kernelSlog) {
       }
     }
   }
+  harden(enumerateNonDurableObjectExports);
 
   /**
    * Allocate a new koid.
@@ -936,6 +937,7 @@ export default function makeKernelKeeper(kernelStorage, kernelSlog) {
       }
     }
   }
+  harden(enumeratePromisesByDecider);
 
   function addSubscriberToPromise(kernelSlot, vatID) {
     insistKernelType('promise', kernelSlot);

packages/SwingSet/src/kernel/state/storageHelper.js

@@ -25,6 +25,7 @@ export function* enumeratePrefixedKeys(kvStore, prefix, exclusiveEnd) {
     yield key;
   }
 }
+harden(enumeratePrefixedKeys);
 
 /**
  * @param {KVStore} kvStore
@@ -45,6 +46,7 @@ function* enumerateNumericPrefixedKeys(kvStore, prefix) {
     }
   }
 }
+harden(enumerateNumericPrefixedKeys);
 
 /**
  * @param {KVStore} kvStore
@@ -55,6 +57,7 @@ export function* getPrefixedValues(kvStore, prefix) {
     yield kvStore.get(key) || Fail`enumerate ensures get`;
   }
 }
+harden(getPrefixedValues);
 
 /**
  * @param {KVStore} kvStore

packages/SwingSet/src/kernel/state/vatKeeper.js

@@ -487,6 +487,7 @@ export function makeVatKeeper(
       deliveryNum += 1;
     }
   }
+  harden(getTranscript);
 
   /**
    * Append an entry to the vat's transcript.

packages/casting/src/follower-cosmjs.js

@@ -10,6 +10,15 @@ import { MAKE_DEFAULT_DECODER, MAKE_DEFAULT_UNSERIALIZER } from './defaults.js';
 import { makeCastingSpec } from './casting-spec.js';
 import { makeLeader as defaultMakeLeader } from './leader-netconfig.js';
 
+// A lot of cosmjs classes end up hardened through instances shared by this
+// package so preemptively harden them all.
+// However we cannot directly harden a module namespace object (exotic behavior
+// for bindings) so spread the namespace instead
+harden({
+  tendermint34: { ...tendermint34 },
+  stargateStar: { ...stargateStar },
+});
+
 const { QueryClient } = stargateStar;
 const { Tendermint34Client } = tendermint34;
 const { details: X, quote: q, Fail } = assert;
@@ -357,6 +366,7 @@ export const makeCosmjsFollower = (
       );
     }
   }
+  harden(allValuesFromCell);
 
   /**
    * @param {import('./types.js').StreamCell<T>} streamCell
@@ -372,6 +382,7 @@ export const makeCosmjsFollower = (
       );
     }
   }
+  harden(reverseValuesFromCell);
 
   /**
    * @param {import('./types.js').StreamCell<T>} streamCell
@@ -389,6 +400,7 @@ export const makeCosmjsFollower = (
       );
     }
   }
+  harden(lastValueFromCell);
 
   /**
    * @yields {ValueFollowerElement<T>}
@@ -434,6 +446,7 @@ export const makeCosmjsFollower = (
       lastValue = latest.value;
     }
   }
+  harden(getLatestIterable);
 
   /**
    * @param {number} [cursorBlockHeight]
@@ -552,6 +565,7 @@ export const makeCosmjsFollower = (
       cursorData = currentData;
     }
   }
+  harden(getEachIterableAtHeight);
 
   /**
    * @param {number} [cursorBlockHeight]
@@ -575,6 +589,7 @@ export const makeCosmjsFollower = (
       cursorBlockHeight = cursorStreamCell.blockHeight - 1;
     }
   }
+  harden(getReverseIterableAtHeight);
 
   /** @type {ValueFollower<T>} */
   return Far('chain follower', {

packages/casting/src/iterable.js

@@ -15,6 +15,7 @@ export const mapAsyncIterable = (iterable, transform) => {
       yield transform(value);
     }
   }
+  harden(transformGenerator);
   return transformGenerator();
 };
 

packages/internal/test/test-utils.js

@@ -182,6 +182,7 @@ const consumeStreamInto = async (stream, output, maxItems) => {
 const generateStream = async function* generateStream(items) {
   yield* items;
 };
+harden(generateStream);
 
 test('synchronizedTee - consumeAll - 1 reader', async t => {
   const sourceData = [1, 2, 3];
@@ -251,6 +252,7 @@ test('synchronizedTee - consume synchronized', async t => {
       }
     }
   }
+  harden(generate);
   const source = generate();
   const [reader1, reader2] = synchronizedTee(source, 2);
   await Promise.all([

packages/swing-store/src/bundleStore.js

@@ -267,6 +267,7 @@ export function makeBundleStore(db, ensureTxn, noteExport = () => {}) {
     const rawBundle = row.bundle || Fail`bundle ${q(bundleID)} pruned`;
     yield* Readable.from(Buffer.from(rawBundle));
   }
+  harden(exportBundle);
 
   const sqlGetBundleIDs = db.prepare(`
     SELECT bundleID
@@ -286,12 +287,14 @@ export function makeBundleStore(db, ensureTxn, noteExport = () => {}) {
       yield [bundleArtifactName(bundleID), bundleID];
     }
   }
+  harden(getExportRecords);
 
   async function* getArtifactNames() {
     for (const bundleID of sqlGetBundleIDs.iterate()) {
       yield bundleArtifactName(bundleID);
     }
   }
+  harden(getArtifactNames);
 
   function computeSha512(bytes) {
     const hash = createHash('sha512');
@@ -364,6 +367,7 @@ export function makeBundleStore(db, ensureTxn, noteExport = () => {}) {
   function* getBundleIDs() {
     yield* sqlListBundleIDs.iterate();
   }
+  harden(getBundleIDs);
 
   return harden({
     importBundleRecord,

packages/swing-store/src/exporter.js

@@ -164,6 +164,7 @@ export function makeSwingStoreExporter(dirPath, options = {}) {
     yield* transcriptStore.getExportRecords(true);
     yield* bundleStore.getExportRecords();
   }
+  harden(getExportData);
 
   /**
    * @returns {AsyncIterableIterator<string>}
@@ -174,6 +175,7 @@ export function makeSwingStoreExporter(dirPath, options = {}) {
     yield* transcriptStore.getArtifactNames(artifactMode);
     yield* bundleStore.getArtifactNames();
   }
+  harden(getArtifactNames);
 
   /**
    * @param {string} name

packages/swing-store/src/snapStore.js

@@ -306,6 +306,7 @@ export function makeSnapStore(
       const snapshotReader = gzReader.pipe(unzipper);
       yield* snapshotReader;
     }
+    harden(exporter);
     return exporter();
   }
 
@@ -344,6 +345,7 @@ export function makeSnapStore(
         Fail`actual hash ${q(hash)} !== expected ${q(snapshotID)}`;
     }
   }
+  harden(loadSnapshot);
 
   const sqlDeleteVatSnapshots = db.prepare(`
     DELETE FROM snapshots
@@ -481,6 +483,7 @@ export function makeSnapStore(
       }
     }
   }
+  harden(getExportRecords);
 
   async function* getArtifactNames(artifactMode) {
     for (const rec of sqlGetAvailableSnapshots.iterate(1)) {
@@ -492,6 +495,7 @@ export function makeSnapStore(
       }
     }
   }
+  harden(getArtifactNames);
 
   const sqlAddSnapshotRecord = db.prepare(`
     INSERT INTO snapshots (vatID, snapPos, hash, inUse)
@@ -640,6 +644,7 @@ export function makeSnapStore(
   function* listAllSnapshots() {
     yield* sqlListAllSnapshots.iterate();
   }
+  harden(listAllSnapshots);
 
   const sqlDumpCurrentSnapshots = db.prepare(`
     SELECT vatID, snapPos, hash, compressedSnapshot, inUse

packages/swing-store/src/transcriptStore.js

@@ -43,6 +43,7 @@ import { createSHA256 } from './hasher.js';
 function* empty() {
   // Yield nothing
 }
+harden(empty);
 
 /**
  * @param {number} position
@@ -158,6 +159,7 @@ export function makeTranscriptStore(
       }
     }
   }
+  harden(readFullVatTranscript);
 
   function spanArtifactName(rec) {
     return `transcript.${rec.vatID}.${rec.startPos}.${rec.endPos}`;
@@ -393,6 +395,7 @@ export function makeTranscriptStore(
       }
     }
   }
+  harden(getExportRecords);
 
   const sqlCountSpanItems = db.prepare(`
     SELECT COUNT(*) FROM transcriptItems
@@ -447,6 +450,7 @@ export function makeTranscriptStore(
       }
     }
   }
+  harden(getArtifactNames);
 
   const sqlGetSpanEndPos = db.prepare(`
     SELECT endPos
@@ -501,6 +505,7 @@ export function makeTranscriptStore(
           expectedCount,
         )})`;
     }
+    harden(reader);
 
     if (startPos === endPos) {
       return empty();
@@ -541,6 +546,7 @@ export function makeTranscriptStore(
       yield Buffer.from(`${entry}\n`);
     }
   }
+  harden(exportSpan);
 
   const sqlAddItem = db.prepare(`
     INSERT INTO transcriptItems (vatID, item, position, incarnation)

packages/swing-store/test/test-deletion.js

@@ -6,6 +6,7 @@ import { initSwingStore } from '../src/swingStore.js';
 async function* getSnapshotStream() {
   yield Buffer.from('abc');
 }
+harden(getSnapshotStream);
 
 test('delete snapshots with export callback', async t => {
   const exportLog = [];

packages/swing-store/test/test-exportImport.js

@@ -83,6 +83,7 @@ async function fakeAVatSnapshot(vat, ks) {
   async function* getSnapshotStream() {
     yield Buffer.from(`snapshot of vat ${vat.vatID} as of ${vat.endPos}`);
   }
+  harden(getSnapshotStream);
   await ks.snapStore.saveSnapshot(vat.vatID, vat.endPos, getSnapshotStream());
   ks.transcriptStore.addItem(vat.vatID, 'save-snapshot');
   vat.endPos += 1;

packages/swing-store/test/test-snapstore.js

@@ -26,6 +26,7 @@ function ensureTxn() {}
 async function* getSnapshotStream(payload) {
   yield Buffer.from(payload);
 }
+harden(getSnapshotStream);
 
 test('compress to cache file; closes snapshot stream', async t => {
   const db = sqlite3(':memory:');

packages/swing-store/test/test-state.js

@@ -47,6 +47,7 @@ function* iterate(kvStore, start, end) {
     prev = next;
   }
 }
+harden(iterate);
 
 function makeExportLog() {
   const exportLog = [];

packages/swing-store/test/util.js

@@ -20,6 +20,7 @@ export const tmpDir = prefix =>
 export async function* getSnapshotStream(contents) {
   yield Buffer.from(contents);
 }
+harden(getSnapshotStream);
 
 export function makeB0ID(bundle) {
   return `b0-${createSHA256(JSON.stringify(bundle)).finish()}`;

packages/swingset-liveslots/src/collectionManager.js

@@ -518,7 +518,7 @@ export function makeCollectionManager(
           yield [yieldKeys ? key : undefined, yieldValues ? value : undefined];
         }
       }
-
+      harden(iter);
       return iter();
     }
 
@@ -528,6 +528,7 @@ export function makeCollectionManager(
           yield entry[0];
         }
       }
+      harden(iter);
       return iter();
     }
 
@@ -592,6 +593,7 @@ export function makeCollectionManager(
           yield entry[1];
         }
       }
+      harden(iter);
       return iter();
     }
 
@@ -601,6 +603,7 @@ export function makeCollectionManager(
           yield entry;
         }
       }
+      harden(iter);
       return iter();
     }
 

packages/swingset-liveslots/src/vatstore-iterators.js

@@ -18,6 +18,7 @@ export function* enumerateKeysStartEnd(syscall, start, end, checkF) {
     dbKey = syscall.vatstoreGetNextKey(dbKey);
   }
 }
+harden(enumerateKeysStartEnd);
 
 // return an iterator of all existing keys that start with 'prefix'
 // (excluding the prefix itself)
@@ -32,6 +33,7 @@ export function* enumerateKeysWithPrefix(syscall, prefix) {
     yield key;
   }
 }
+harden(enumerateKeysWithPrefix);
 
 export function prefixedKeysExist(syscall, prefix) {
   const nextKey = syscall.vatstoreGetNextKey(prefix);

packages/swingset-liveslots/test/gc-helpers.js

@@ -168,6 +168,7 @@ export function* enumerateKeysWithPrefix(fakestore, prefix) {
     }
   }
 }
+harden(enumerateKeysWithPrefix);
 
 export function recognizersOf(v, baseref) {
   // the | is followed by the collectionID that can recognize baseref

packages/vats/src/vat-bank.js

@@ -229,6 +229,7 @@ async function* concatAsyncIterables(iterables) {
     yield* asyncIterable;
   }
 }
+harden(concatAsyncIterables);
 
 /**
  * TODO: This should be absorbed and zone-ified into the existing publish kit.

packages/wallet/api/src/wallet.js

@@ -165,6 +165,7 @@ export function buildRootObject(vatPowers) {
         yield state;
       }
     }
+    harden(makeApprovedNotifier);
 
     /** @type {WalletBridge} */
     const bridge = Far('bridge', {

packages/xsnap/api.js

@@ -43,6 +43,7 @@ export class ErrorSignal extends Error {
     this.code = signal;
   }
 }
+harden(ErrorSignal);
 
 export class ErrorCode extends Error {
   /**
@@ -55,3 +56,4 @@ export class ErrorCode extends Error {
     this.code = code;
   }
 }
+harden(ErrorCode);