Merge pull request #2194 from dckc/xs-vat-lockdown

 bootstrap SES shim on xsnap

Author: dckc

.github/workflows/test-all-packages.yml

@@ -313,12 +313,6 @@ jobs:
       if: steps.built.outputs.cache-hit != 'true'
     # END-RESTORE-BOILERPLATE
 
-    - name: install XS dependencies
-      working-directory: ./packages/xs-vat-worker
-      run: yarn install:xs-lin
-    - name: yarn build XS worker
-      working-directory: ./packages/xs-vat-worker
-      run: yarn build:xs-lin
     - name: yarn test (SwingSet)
       run: cd packages/SwingSet && yarn test
       env:

packages/xs-vat-worker/Makefile

@@ -8,10 +8,8 @@
   "main": "src/locate.js",
   "module": "src/locate.js",
   "scripts": {
-    "install:xs-lin": "make install-deps",
-    "build:xs-lin": "make",
     "test": "ava",
-    "build": "exit 0",
+    "build": "rollup --config rollup.config.js",
     "lint-fix": "eslint --fix '**/*.{js,jsx}'",
     "lint-check": "eslint '**/*.{js,jsx}'",
     "lint-fix-jessie": "eslint -c '.eslintrc-jessie.js' --fix '**/*.{js,jsx}'",
@@ -27,6 +25,8 @@
     "timeout": "2m"
   },
   "devDependencies": {
+    "@rollup/plugin-commonjs": "^11.0.2",
+    "@rollup/plugin-node-resolve": "^7.1.1",
     "ava": "^3.12.1",
     "detective-es6": "^2.2.0",
     "eslint": "^6.8.0",
@@ -38,7 +38,8 @@
     "eslint-plugin-prettier": "^3.1.2",
     "filing-cabinet": "^2.5.1",
     "nyc": "^15.1.0",
-    "prettier": "^1.18.2"
+    "prettier": "^1.18.2",
+    "rollup": "^1.23.1"
   },
   "dependencies": {
     "@agoric/assert": "^0.2.0",
@@ -49,8 +50,10 @@
     "@agoric/marshal": "^0.3.0",
     "@agoric/promise-kit": "^0.2.0",
     "@agoric/swingset-vat": "^0.11.0",
+    "@agoric/xsnap": "^0.1.0",
     "anylogger": "^0.21.0",
-    "esm": "^3.2.5"
+    "esm": "^3.2.5",
+    "ses": "^0.11.0"
   },
   "keywords": [],
   "files": [

packages/xs-vat-worker/manifest.json

@@ -0,0 +1,14 @@
+import resolve from '@rollup/plugin-node-resolve';
+import commonjs from '@rollup/plugin-commonjs';
+
+export default [
+  {
+    input: 'src/bootstrap.js',
+    output: {
+      file: `dist/bootstrap.umd.js`,
+      format: 'umd',
+      name: 'Bootstrap',
+    },
+    plugins: [resolve(), commonjs()],
+  },
+];

packages/xs-vat-worker/package.json

@@ -0,0 +1,5 @@
+import './console-shim';
+import './text-shim';
+import './lockdown-shim';
+
+harden(console);

packages/xs-vat-worker/rollup.config.js

@@ -0,0 +1,9 @@
+const noop = _ => undefined;
+
+globalThis.console = {
+  debug: noop,
+  log: noop,
+  info: noop,
+  warn: noop,
+  error: noop,
+};

packages/xs-vat-worker/src-native/fdchan.c

@@ -0,0 +1,5 @@
+/* global lockdown */
+
+import 'ses/lockdown';
+
+lockdown();

packages/xs-vat-worker/src-native/fdchan.js

@@ -0,0 +1,12 @@
+/* eslint-disable class-methods-use-this */
+
+// Save this XS extension before SES shim deletes it.
+const { fromString } = ArrayBuffer;
+
+class TextEncoder {
+  encode(s) {
+    return new Uint8Array(fromString(s));
+  }
+}
+
+globalThis.TextEncoder = TextEncoder;

packages/xs-vat-worker/src/bootstrap.js

@@ -0,0 +1,39 @@
+import test from 'ava';
+import * as childProcess from 'child_process';
+import * as os from 'os';
+import * as fs from 'fs';
+import * as path from 'path';
+import { xsnap } from '@agoric/xsnap';
+
+const dist = async name =>
+  fs.promises.readFile(path.join(__filename, '..', '..', 'dist', name));
+
+const decoder = new TextDecoder();
+
+const xsnapOptions = {
+  spawn: childProcess.spawn,
+  os: os.type(),
+};
+
+test('bootstrap to SES lockdown', async t => {
+  const bootScript = await dist('bootstrap.umd.js');
+  const messages = [];
+  async function handleCommand(message) {
+    messages.push(decoder.decode(message));
+    return new Uint8Array();
+  }
+  const name = 'SES lockdown worker';
+  const vat = xsnap({ ...xsnapOptions, handleCommand, name });
+  await vat.evaluate(bootScript);
+  t.deepEqual([], messages);
+
+  await vat.evaluate(`
+    const encoder = new TextEncoder();
+    globalThis.send = msg => issueCommand(encoder.encode(JSON.stringify(msg)).buffer);
+  `);
+  await vat.evaluate(`
+    send([ typeof harden, typeof Compartment ]);
+  `);
+  await vat.close();
+  t.deepEqual(['["function","function"]'], messages);
+});

packages/xs-vat-worker/src/console-shim.js

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/xsnap",
-  "version": "0.0.0+1-dev",
+  "version": "0.1.0",
   "description": "Description forthcoming.",
   "author": "Agoric",
   "license": "Apache-2.0",

packages/xs-vat-worker/src/console.js

@@ -322,19 +322,18 @@ int main(int argc, char* argv[])
 				xsBeginHost(machine);
 				{
 					xsVars(3);
-					xsVar(1) = xsArrayBuffer(nsbuf + 1, nslen - 1);
 					xsTry {
 						if (command == '?') {
+							xsVar(1) = xsArrayBuffer(nsbuf + 1, nslen - 1);
 							xsVar(2) = xsCall1(xsGlobal, xsID("handleCommand"), xsVar(1));
 							if (xsTypeOf(xsVar(2)) != xsUndefinedType) {
 								responseLength = fxGetArrayBufferLength(machine, &xsVar(2));
 								response = malloc(responseLength);
 								fxGetArrayBufferData(machine, &xsVar(2), 0, response, responseLength);
 							}
 						} else {
-							xsVar(0) = xsGet(xsGlobal, xsID("String"));
-							xsVar(2) = xsCall1(xsVar(0), xsID("fromArrayBuffer"), xsVar(1));
-							xsCall1(xsGlobal, xsID("eval"), xsVar(2));
+							xsVar(1) = xsStringBuffer(nsbuf + 1, nslen - 1);
+							xsCall1_noResult(xsGlobal, xsID("eval"), xsVar(1));
 						}
 					}
 					xsCatch {