fix(lockdown): Begin working toward lockdown-style SES API

Author: michaelfig

package.json

@@ -53,7 +53,7 @@
     "prettier": "yarn workspaces run prettier",
     "link-cli": "node ./scripts/link-cli.js",
     "lint-fix": "yarn workspaces run lint-fix",
-    "lint-check": "cd packages/marshal && yarn lint-check && cd ../SwingSet && yarn lint-check && cd ../ERTP && yarn lint-check && cd ../zoe && yarn lint-check && cd ../acorn-eventual-send && yarn lint-check && cd ../eventual-send && yarn lint-check && cd ../transform-eventual-send && yarn lint-check && cd ../transform-metering && yarn lint-check && cd ../default-evaluate-options && yarn lint-check && cd ../evaluate && yarn lint-check && cd ../bundle-source && yarn lint-check && cd ../captp && yarn lint-check",
+    "lint-check": "cd packages/marshal && yarn lint-check && cd ../SwingSet && yarn lint-check && cd ../ERTP && yarn lint-check && cd ../zoe && yarn lint-check && cd ../acorn-eventual-send && yarn lint-check && cd ../eventual-send && yarn lint-check && cd ../transform-eventual-send && yarn lint-check && cd ../tame-metering && yarn lint-check && cd ../transform-metering && yarn lint-check && cd ../default-evaluate-options && yarn lint-check && cd ../evaluate && yarn lint-check && cd ../bundle-source && yarn lint-check && cd ../captp && yarn lint-check",
     "lint-check-all": "yarn workspaces run lint-check",
     "test": "yarn workspaces run test",
     "build": "yarn workspaces run build"

packages/tame-metering/src/tame.js

@@ -4,8 +4,9 @@ import * as c from './constants';
 const {
   defineProperties,
   entries,
-  fromEntries,
   getOwnPropertyDescriptors,
+  getPrototypeOf,
+  setPrototypeOf,
 } = Object;
 const { apply, construct, get } = Reflect;
 const { get: wmGet, set: wmSet } = WeakMap.prototype;
@@ -29,16 +30,16 @@ export default function tameMetering() {
   setWrapped(Error, Error); // FIGME: debugging
   setWrapped(console, console); // FIGME
   */
-  const wrapDescriptor = desc => {
+  const wrapDescriptor = (desc, pname = undefined) => {
     const newDesc = {};
     for (const [k, v] of entries(desc)) {
       // eslint-disable-next-line no-use-before-define
-      newDesc[k] = wrap(v);
+      newDesc[k] = wrap(v, pname && `${pname}.${k}`);
     }
     return newDesc;
   };
 
-  function wrap(target) {
+  function wrap(target, pname) {
     if (ObjectConstructor(target) !== target) {
       return target;
     }
@@ -63,7 +64,7 @@ export default function tameMetering() {
 
           // Track the entry of the stack frame.
           globalMeter = null;
-          // savedMeter && savedMeter[c.METER_ENTER](undefined, false);
+          /* savedMeter && savedMeter[c.METER_ENTER](undefined, false); */
           savedMeter && savedMeter[c.METER_COMPUTE](undefined, false);
           let ret;
 
@@ -105,25 +106,37 @@ export default function tameMetering() {
       wrapper = target;
     }
 
-    // We have a wrapper identity, so prevent recursion.
+    // We have a wrapper identity, so prevent recursion by installing it now.
     setWrapped(target, wrapper);
     setWrapped(wrapper, wrapper);
 
     if (isFunction) {
-      // Replace the constructor.
       const proto = get(target, 'prototype');
+
       if (proto) {
-        const wproto = wrap(proto);
+        // Replace the constructor.
+        const wproto = wrap(proto, pname && `${pname}.prototype`);
         wproto.constructor = wrapper;
       }
     }
 
+    // Ensure the prototype chain is also wrapped.
+    setPrototypeOf(
+      wrapper,
+      wrap(getPrototypeOf(target), pname && `${pname}.__proto__`),
+    );
+
     // Assign the wrapped descriptors to the wrapper.
-    const props = entries(
-      getOwnPropertyDescriptors(target),
-    ).map(([p, desc]) => [p, wrapDescriptor(desc)]);
-    defineProperties(wrapper, fromEntries(props));
+    const descs = {};
+    for (const [p, desc] of entries(getOwnPropertyDescriptors(target))) {
+      const desc2 = wrapDescriptor(desc, pname && `${pname}.${p}`);
+      if (isFunction && p === 'name') {
+        desc2.value = target.name;
+      }
+      descs[p] = desc2;
+    }
 
+    defineProperties(wrapper, descs);
     return wrapper;
   }
 

packages/transform-metering/test/test-zzz-eval.js

@@ -1,16 +1,73 @@
-import replaceGlobalMeter from '@agoric/tame-metering/src/install-global-metering';
+// import replaceGlobalMeter from '@agoric/tame-metering/src/install-global-metering';
+import * as tamer from '@agoric/tame-metering/src/install-global-metering';
+import * as c from '@agoric/tame-metering/src/constants';
 
 import test from 'tape-promise/tape';
 import * as babelCore from '@babel/core';
-import SES from 'ses';
+import * as ses from 'ses';
 
 import { makeMeter, makeMeteredEvaluator } from '../src/index';
 
 let sesRealm;
+let replaceGlobalMeter;
 if (!sesRealm) {
-  // FIXME: lockdown() approach is the only way to both secure
+  // FIXME: lockdown() approach appears to be the only way to both secure
   // this realm and make meters available to evaluators.
-  sesRealm = SES.makeSESRootRealm();
+  const { lockdown, default: SES } = ses;
+  const { tameMetering, default: globalReplaceGlobalMeter } = tamer;
+  if (tameMetering && !lockdown) {
+    const shim = `\
+(() => {
+  const globalThis = this;
+
+  const c = ${JSON.stringify(c)}
+  let replaceGlobalMeter;
+  const ObjectConstructor = Object;
+  const {
+    create,
+    defineProperties,
+    entries,
+    isExtensible,
+    getOwnPropertyDescriptors,
+    getPrototypeOf,
+    setPrototypeOf,
+  } = Object;
+  const { apply, construct, get } = Reflect;
+  const { get: wmGet, set: wmSet } = WeakMap.prototype;
+  
+  (${tamer.tameMetering})();
+
+  let neutered;
+  this.Q = () => {
+    if (!neutered) {
+      neutered = true;
+      return replaceGlobalMeter;
+    }
+    throw Error('Cannot execute twice');
+  };
+})()`;
+    sesRealm = SES.makeSESRootRealm({
+      consoleMode: 'allow',
+      errorStackMode: 'allow',
+      shims: [shim],
+    });
+    replaceGlobalMeter = sesRealm.evaluate('Q()');
+  } else if (!lockdown) {
+    // We already tamed globally.
+    sesRealm = SES.makeSESRootRealm({
+      consoleMode: 'allow',
+      errorStackMode: 'allow',
+    });
+    replaceGlobalMeter = globalReplaceGlobalMeter;
+  } else if (tameMetering) {
+    // FIXME: How to get sesRealm?
+    replaceGlobalMeter = tameMetering();
+    lockdown();
+  } else {
+    // FIXME: How to get sesRealm?
+    replaceGlobalMeter = tamer.default;
+    lockdown();
+  }
 }
 
 export const makeSESEvaluator = opts =>