openmausbot 0.1.91 → 0.1.93

package/dist/novnc-NOTICE.txt

@@ -0,0 +1,118 @@
+noVNC 1.7.0
+Copyright (C) 2022 The noVNC authors
+
+OpenMausBot bundles the unmodified noVNC core library under the Mozilla
+Public License 2.0 (MPL-2.0). The corresponding source, including its
+original copyright and license notices, is available at:
+https://github.com/novnc/noVNC/tree/v1.7.0
+
+MPL-2.0 license: https://www.mozilla.org/MPL/2.0/
+Authors: https://github.com/novnc/noVNC/blob/v1.7.0/AUTHORS
+
+The bundled library also includes the following third-party components.
+Their notices are reproduced below.
+
+Pako (vendor/pako/LICENSE)
+=========================
+
+(The MIT License)
+
+Copyright (C) 2014-2016 by Vitaly Puzrin
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+DES (core/crypto/des.js)
+========================
+
+/*
+ * Ported from Flashlight VNC ActionScript implementation:
+ *     http://www.wizhelp.com/flashlight-vnc/
+ *
+ * Full attribution follows:
+ *
+ * -------------------------------------------------------------------------
+ *
+ * This DES class has been extracted from package Acme.Crypto for use in VNC.
+ * The unnecessary odd parity code has been removed.
+ *
+ * These changes are:
+ *  Copyright (C) 1999 AT&T Laboratories Cambridge.  All Rights Reserved.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+
+ * DesCipher - the DES encryption method
+ *
+ * The meat of this code is by Dave Zimmerman <dzimm@widget.com>, and is:
+ *
+ * Copyright (c) 1996 Widget Workshop, Inc. All Rights Reserved.
+ *
+ * Permission to use, copy, modify, and distribute this software
+ * and its documentation for NON-COMMERCIAL or COMMERCIAL purposes and
+ * without fee is hereby granted, provided that this copyright notice is kept
+ * intact.
+ *
+ * WIDGET WORKSHOP MAKES NO REPRESENTATIONS OR WARRANTIES ABOUT THE SUITABILITY
+ * OF THE SOFTWARE, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+ * TO THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE, OR NON-INFRINGEMENT. WIDGET WORKSHOP SHALL NOT BE LIABLE
+ * FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.
+ *
+ * THIS SOFTWARE IS NOT DESIGNED OR INTENDED FOR USE OR RESALE AS ON-LINE
+ * CONTROL EQUIPMENT IN HAZARDOUS ENVIRONMENTS REQUIRING FAIL-SAFE
+ * PERFORMANCE, SUCH AS IN THE OPERATION OF NUCLEAR FACILITIES, AIRCRAFT
+ * NAVIGATION OR COMMUNICATION SYSTEMS, AIR TRAFFIC CONTROL, DIRECT LIFE
+ * SUPPORT MACHINES, OR WEAPONS SYSTEMS, IN WHICH THE FAILURE OF THE
+ * SOFTWARE COULD LEAD DIRECTLY TO DEATH, PERSONAL INJURY, OR SEVERE
+ * PHYSICAL OR ENVIRONMENTAL DAMAGE ("HIGH RISK ACTIVITIES").  WIDGET WORKSHOP
+ * SPECIFICALLY DISCLAIMS ANY EXPRESS OR IMPLIED WARRANTY OF FITNESS FOR
+ * HIGH RISK ACTIVITIES.
+ *
+ *
+ * The rest is:
+ *
+ * Copyright (C) 1996 by Jef Poskanzer <jef@acme.com>.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * Visit the ACME Labs Java page for up-to-date versions of this and other
+ * fine Java utilities: http://www.acme.com/java/
+ */

package/dist-server/cloud-home-start.js

@@ -14635,10 +14635,26 @@ var sessionSchema = external_exports.object({
   userId: external_exports.string().max(256).optional(),
   email: external_exports.string().max(320).optional(),
   /** Set only by the internal verified-portal issuance path, never by email or pairing input. */
-  membershipAuthority: external_exports.literal("portal").optional()
+  membershipAuthority: external_exports.literal("portal").optional(),
+  /** A browser sign-in (PairingCode `browser`): accepted only as its browser's cookie, never as a bearer token. */
+  cookieOnly: external_exports.literal(true).optional(),
+  /** Whose OMB Cloud a browser sign-in signed in to (its PairingCode `owner`). */
+  owner: external_exports.string().max(254).optional()
 });
 var fileSchema = external_exports.object({ version: external_exports.literal(1), sessions: external_exports.array(sessionSchema) });
 
+// server/cloud-secrets.ts
+var CLOUD_HOME_SECRET_KEYS = ["OMB_CLOUD_BOOTSTRAP_SECRET", "OMB_CLOUD_BOAT_TOKEN", "OMB_CLOUD_VOICE_TOKEN", "OMB_CLOUD_DECIDER_TOKEN"];
+var CLOUD_SECRETS_FD_ENV = "OMB_CLOUD_SECRETS_FD";
+function cloudHomeSecrets(env) {
+  return Object.fromEntries(CLOUD_HOME_SECRET_KEYS.flatMap((key) => env[key] ? [[key, env[key]]] : []));
+}
+function withoutCloudSecrets(env) {
+  const kept = { ...env };
+  for (const key of CLOUD_HOME_SECRET_KEYS) delete kept[key];
+  return kept;
+}
+
 // server/cloud-home.ts
 var CLOUD_HOME_KEYS = ["OMB_CLOUD_ROLE", "OMB_CLOUD_MACHINE_ID", "OMB_CLOUD_ADMIN_URL", "OMB_CLOUD_BOOTSTRAP_SECRET"];
 var CLOUD_IGNORED_KEYS = ["OMB_HOSTED_MODEL_URL", "OMB_HOSTED_MODEL_TOKEN", "OMB_HOSTED_MODELS"];
@@ -14713,6 +14729,7 @@ function cloudHomeHost(config2) {
 
 // server/cloud-home-start.ts
 var SERVICE_USER = "maus";
+var SECRETS_FD = 3;
 function passwdIds(passwd, name) {
   for (const line of passwd.split("\n")) {
     const [user, , uid, gid] = line.split(":");
@@ -14720,15 +14737,50 @@ function passwdIds(passwd, name) {
   }
   return null;
 }
+var SERVER_ENV_NAMES = /* @__PURE__ */ new Set([
+  "PATH",
+  "SHELL",
+  "HOSTNAME",
+  "LANG",
+  "LANGUAGE",
+  "TZ",
+  "TERM",
+  "TMPDIR",
+  "NO_COLOR",
+  "NODE_ENV",
+  "NODE_EXTRA_CA_CERTS",
+  "SSL_CERT_FILE",
+  "SSL_CERT_DIR",
+  "AGENT_BROWSER_EXECUTABLE_PATH",
+  "OMB_STATIC_DIR",
+  "OMB_DATA_DIR",
+  "OMB_CLOUD_ROLE",
+  "OMB_CLOUD_MACHINE_ID",
+  "OMB_CLOUD_ADMIN_URL",
+  "OMB_CLOUD_IMAGE",
+  "OMB_PUBLIC_URL",
+  "OMB_WEBHOOK_PUBLIC_URL",
+  "OMB_CLOUD_BOAT_URL",
+  "OMB_CLOUD_VOICE_URL",
+  "OMB_CLOUD_DECIDER_URL",
+  "OMB_TTS_DEFAULT_VOICE"
+]);
+function serverEnvironmentAllowed(name) {
+  return SERVER_ENV_NAMES.has(name) || name.startsWith("LC_");
+}
 function cloudHomeChildEnvironments(config2, env, home) {
+  const offered = withoutCloudSecrets(withoutIgnoredCloudKeys(env));
+  const allowed = Object.fromEntries(Object.entries(offered).filter(([name, value]) => value !== void 0 && serverEnvironmentAllowed(name)));
+  const dropped = Object.keys(offered).filter((name) => !serverEnvironmentAllowed(name) && name !== "HOME").sort();
   const server = {
-    ...withoutIgnoredCloudKeys(env),
+    ...allowed,
     HOME: home,
     OMB_DATA_DIR: env.OMB_DATA_DIR || posix.join(home, ".openmausbot"),
     OMB_PORT: "8799",
     OMB_WEBHOOK_PORT: "8800",
     OMB_PUBLIC_URL: config2.publicOrigin,
-    OMB_WEBHOOK_PUBLIC_URL: env.OMB_WEBHOOK_PUBLIC_URL || config2.publicOrigin
+    OMB_WEBHOOK_PUBLIC_URL: env.OMB_WEBHOOK_PUBLIC_URL || config2.publicOrigin,
+    [CLOUD_SECRETS_FD_ENV]: String(SECRETS_FD)
   };
   const edge = {
     PATH: env.PATH ?? "/usr/local/bin:/usr/bin:/bin",
@@ -14737,7 +14789,33 @@ function cloudHomeChildEnvironments(config2, env, home) {
     XDG_CONFIG_HOME: "/tmp/omb-edge/config",
     OMB_CLOUD_PUBLIC_HOST: cloudHomeHost(config2)
   };
-  return { server, edge };
+  return { server, edge, secrets: cloudHomeSecrets(env), dropped };
+}
+function codeTrustProblem(files, home, stat = statSync) {
+  const volume = posix.join(home, "/");
+  for (const file2 of files) {
+    if (file2 === home || file2.startsWith(volume)) return `${file2} is on the volume`;
+    for (let path = file2; ; path = dirname2(path)) {
+      let owner;
+      try {
+        owner = stat(path);
+      } catch {
+        return `${path} cannot be checked`;
+      }
+      if (owner.uid !== 0) return `${path} is not root's`;
+      if (owner.mode & 18 && !(path !== file2 && owner.mode & 512)) return `${path} is writable by others than root`;
+      if (dirname2(path) === path) break;
+    }
+  }
+  return null;
+}
+function spawnWithSecrets(command, args, env, secrets, ids) {
+  const child = spawn(command, args, { env, stdio: ["inherit", "inherit", "inherit", "pipe"], ...ids ? { uid: ids.uid, gid: ids.gid } : {} });
+  const pipe2 = child.stdio[SECRETS_FD];
+  pipe2?.on("error", () => {
+  });
+  pipe2?.end(JSON.stringify(secrets));
+  return child;
 }
 function serverExitAction(code, stopping, restarts) {
   return !stopping && code === CLOUD_HOME_RESTART_EXIT_CODE && restarts < 5 ? "restart" : "stop";
@@ -14748,19 +14826,33 @@ function startCloudHome(env = process.env) {
   if (!config2) throw new Error("This image runs an OMB Cloud home machine; set its boot contract (docs/cloud-pro.md).");
   for (const warning of config2.warnings) console.warn(`cloud home: ${warning}`);
   const home = env.HOME || "/data";
+  let ids = null;
   if (process.getuid?.() === 0) {
-    const ids = passwdIds(readFileSync2("/etc/passwd", "utf8"), SERVICE_USER);
+    ids = passwdIds(readFileSync2("/etc/passwd", "utf8"), SERVICE_USER);
     if (!ids) throw new Error(`The ${SERVICE_USER} user is missing from this image.`);
     const stat = statSync(home);
     if (stat.uid !== ids.uid || stat.gid !== ids.gid) chownSync(home, ids.uid, ids.gid);
     process.setgroups?.([]);
-    process.setgid(ids.gid);
-    process.setuid(ids.uid);
+    process.setegid(ids.gid);
+    process.seteuid(ids.uid);
+    try {
+      prepareCloudHomeVolume(home, config2.machineId);
+    } finally {
+      process.seteuid(0);
+      process.setegid(0);
+    }
+  } else {
+    prepareCloudHomeVolume(home, config2.machineId);
   }
-  if (process.getuid?.() === 0) throw new Error("The Cloud home must run as an unprivileged user.");
-  prepareCloudHomeVolume(home, config2.machineId);
   const here = dirname2(fileURLToPath2(import.meta.url));
-  const { server, edge } = cloudHomeChildEnvironments(config2, env, home);
+  const edgeBin = env.OMB_CLOUD_EDGE_BIN || "/usr/local/bin/caddy";
+  const edgeConfig = env.OMB_CLOUD_EDGE_CONFIG || "/app/cloud/Caddyfile";
+  if (ids) {
+    const problem = codeTrustProblem([process.execPath, fileURLToPath2(import.meta.url), join3(here, "index.js"), edgeBin, edgeConfig], home);
+    if (problem) throw new Error(`This image's code is not safe to run as root: ${problem}. Rebuild it from deploy/fly/Dockerfile.`);
+  }
+  const { server, edge, secrets, dropped } = cloudHomeChildEnvironments(config2, env, home);
+  if (dropped.length) console.log(`cloud home: not passed to the server: ${dropped.join(", ")}`);
   const children = [];
   let stopping = false;
   const stop = (failed) => {
@@ -14773,8 +14865,7 @@ function startCloudHome(env = process.env) {
     }, 2e4);
     force.unref();
   };
-  const run = (command, args, childEnv, again) => {
-    const child = spawn(command, args, { env: childEnv, stdio: "inherit" });
+  const watch = (child, again) => {
     children.push(child);
     child.once("error", () => stop(true));
     child.once("exit", (code) => {
@@ -14783,14 +14874,18 @@ function startCloudHome(env = process.env) {
     });
   };
   let restarts = 0;
-  const runServer = () => run(process.execPath, [join3(here, "index.js")], server, (code) => {
+  const runServer = () => watch(spawnWithSecrets(process.execPath, [join3(here, "index.js")], server, secrets, ids), (code) => {
     if (serverExitAction(code, stopping, restarts) !== "restart") return false;
     restarts++;
     runServer();
     return true;
   });
   runServer();
-  run(env.OMB_CLOUD_EDGE_BIN || "/usr/local/bin/caddy", ["run", "--config", env.OMB_CLOUD_EDGE_CONFIG || "/app/cloud/Caddyfile", "--adapter", "caddyfile"], edge);
+  watch(spawn(
+    edgeBin,
+    ["run", "--config", edgeConfig, "--adapter", "caddyfile"],
+    { env: edge, stdio: "inherit", ...ids ? { uid: ids.uid, gid: ids.gid } : {} }
+  ));
   process.once("SIGTERM", () => stop(false));
   process.once("SIGINT", () => stop(false));
 }
@@ -14804,7 +14899,10 @@ if (process.argv[1] && import.meta.url === pathToFileURL(resolve(process.argv[1]
 }
 export {
   cloudHomeChildEnvironments,
+  codeTrustProblem,
   passwdIds,
+  serverEnvironmentAllowed,
   serverExitAction,
+  spawnWithSecrets,
   startCloudHome
 };

package/dist-server/companion/src/routes.js

@@ -35,15 +35,32 @@ export const CLOUD_DESKTOP_CONTROL_ROUTE = {
     method: "POST",
     path: /^\/api\/bots\/[\w-]+\/computer\/(?:control|screenshot|viewer-close)$/,
 };
+/** The Local VM's live desktop, relayed by the sidecar like a VPS viewer.
+ * The harness grants it only while a person holds that bot's computer. */
+export const LOCAL_VM_JOIN_ROUTE = {
+    method: "POST",
+    path: /^\/api\/bots\/[\w-]+\/local-computer\/join$/,
+};
+/** A still of a bot's Local VM, on demand. The VM's lifecycle stays on the
+ * host; this only reads a picture of it, behind the same per-device
+ * computer-access capability as the cloud desktop. */
+export const LOCAL_VM_SCREENSHOT_ROUTE = {
+    method: "POST",
+    path: /^\/api\/bots\/[\w-]+\/local-computer\/screenshot$/,
+};
 export function isCloudDesktopJoin(method, path) {
     return method === CLOUD_DESKTOP_JOIN_ROUTE.method && CLOUD_DESKTOP_JOIN_ROUTE.path.test(path);
 }
 export function isMessageFileDownload(method, path) {
     return method === MESSAGE_FILE_ROUTE.method && MESSAGE_FILE_ROUTE.path.test(path);
 }
+/** Every route that shows or drives a bot's computer — cloud or Local VM —
+ * and so needs the device's computer-access capability, not just a token. */
 export function isCloudDesktopAccess(method, path) {
     return isCloudDesktopJoin(method, path)
-        || (method === CLOUD_DESKTOP_CONTROL_ROUTE.method && CLOUD_DESKTOP_CONTROL_ROUTE.path.test(path));
+        || (method === CLOUD_DESKTOP_CONTROL_ROUTE.method && CLOUD_DESKTOP_CONTROL_ROUTE.path.test(path))
+        || (method === LOCAL_VM_SCREENSHOT_ROUTE.method && LOCAL_VM_SCREENSHOT_ROUTE.path.test(path))
+        || (method === LOCAL_VM_JOIN_ROUTE.method && LOCAL_VM_JOIN_ROUTE.path.test(path));
 }
 /** Every request the iOS app makes, and nothing else.
  *
@@ -106,6 +123,12 @@ const ALLOWED = [
     // second, per-device capability check before it reaches the harness.
     CLOUD_DESKTOP_JOIN_ROUTE,
     CLOUD_DESKTOP_CONTROL_ROUTE,
+    // A picture of the Local VM — not its lifecycle, which stays on the host.
+    // Gated per device by the proxy like the cloud desktop above.
+    LOCAL_VM_SCREENSHOT_ROUTE,
+    // Its live desktop while a person holds the computer, relayed like the
+    // VPS viewer and behind the same per-device capability.
+    LOCAL_VM_JOIN_ROUTE,
     // rooms — making one, and talking in one
     { method: "POST", path: /^\/api\/groups$/ },
     { method: "POST", path: /^\/api\/groups\/[\w-]+\/messages$/ },