centralu 0.1.0-beta.44 → 0.1.0-beta.46

package/bin/centralu.mjs

@@ -48,6 +48,7 @@ import {
   parseServeArgs,
   printConnection,
   rotateToken,
+  revokeCredential,
   runAutostart,
   runDetach,
   runDetachedChild,
@@ -621,6 +622,11 @@ switch (cmd) {
       break
     }
     try {
+      // One full credential withdrawn (#1405): like --rotate-token, nothing to start or describe
+      if (args.mode === 'revoke') {
+        process.exitCode = revokeCredential({ env: process.env, home: HOME, id: args.revoke })
+        break
+      }
       if (args.mode === 'rotate') {
         process.exitCode = rotateToken({ env: process.env, home: HOME })
         break
@@ -655,7 +661,7 @@ switch (cmd) {
       if (spec) Object.assign(process.env, spec.env)
       // realpath: npm's bin is a symlink to this file, and the launcher must not depend on the link
       const opts = { env: process.env, home: HOME, entry: requireHostEntry(), version: pkg.version, cliPath: realpathSync(process.argv[1]) }
-      if (args.mode === 'connection') process.exitCode = await printConnection(opts)
+      if (args.mode === 'connection') process.exitCode = await printConnection({ ...opts, pair: args.pair ?? null, pairKey: args.pairKey ?? null, keyPaired: args.keyPaired === true })
       else if (args.mode === 'detach') process.exitCode = await runDetach({ ...opts, port: args.port, from: args.from })
       else if (args.mode === 'stop') process.exitCode = await runStop(opts)
       else if (args.mode === 'window') process.exitCode = await runWindow(opts)

package/bin/serve-args.mjs

@@ -1,5 +1,6 @@
 /** The arguments after `centralu serve`, and its help */
 import { DEFAULT_SERVE_PORT } from './serve-port.mjs'
+import { parseLinkPublicKey } from './serve-keys.mjs'
 
 export const SERVE_HELP = `centralu serve: run the Centralu host on this machine, without a window
 
@@ -8,10 +9,17 @@ export const SERVE_HELP = `centralu serve: run the Centralu host on this machine
   centralu serve --detach         Start it in the background, outside this session; return once it answers
   centralu serve --stop           Ask the running host to stop, and wait until it has
   centralu serve --window         What the Centralu window on Windows runs here: start the host if
-                                  none runs, print its port and token as a ready line, stay until
-                                  stdin ends, and leave the host running
-  centralu serve --connection     Print how to reach it as one JSON line, then exit
-  centralu serve --rotate-token   Replace the token (a running serve keeps the old one until restarted)
+                                  none runs, print its port and a full credential for the window as
+                                  a ready line, stay until stdin ends, and leave the host running
+  centralu serve --connection     Print how to reach it as one JSON line, then exit. It carries the
+                                  limited credential (everyday calls) and lists the full ones
+  centralu serve --connection --pair <label>
+                                  ... and a new full credential for <label>, printed once and kept
+                                  here only as its hash; it replaces <label>'s earlier one. What the
+                                  app on another computer runs at each link
+  centralu serve --revoke <id>    Withdraw one full credential (--connection lists their ids)
+  centralu serve --rotate-token   A new key, and every full credential withdrawn (a running serve
+                                  keeps its old key until restarted)
   centralu serve --from <hub>     With serve or --detach: the name of the computer whose link asks,
                                   said by a second Centralu on this data folder when it is refused
   centralu serve --autostart on|off|remove|status
@@ -32,7 +40,16 @@ from an install the app made over SSH, which has a launcher of its own.`
 
 /** The flags that each make serve a different command */
 const MODE_FLAGS = { '--connection': 'connection', '--rotate-token': 'rotate', '--detach': 'detach', '--stop': 'stop', '--window': 'window' }
-const FLAG_OF = { ...Object.fromEntries(Object.entries(MODE_FLAGS).map(([f, m]) => [m, f])), autostart: '--autostart' }
+const FLAG_OF = { ...Object.fromEntries(Object.entries(MODE_FLAGS).map(([f, m]) => [m, f])), autostart: '--autostart', revoke: '--revoke' }
+
+/**
+ * What `--pair` takes (#1405): who the full credential is for, said back in `--connection`'s `others` and on the hub's
+ * machine row. A hub sends `hub:<its machine id>`
+ */
+export const PAIR_LABEL_RE = /^[A-Za-z0-9:._-]{1,80}$/
+
+/** What `--revoke` takes: a full credential's id, as `--connection` lists it (8 hex characters) */
+export const CREDENTIAL_ID_RE = /^[0-9a-f]{8}$/
 
 /** What `--autostart` takes */
 export const AUTOSTART_ACTIONS = ['on', 'off', 'remove', 'status']
@@ -66,9 +83,36 @@ export function parseServeArgs(argv) {
   let child = null
   let autostart = null
   let from = null
+  let pair = null
+  let pairKey = null
+  let keyPaired = false
+  let revoke = null
   for (let i = 0; i < argv.length; i++) {
     const a = argv[i]
-    if (a === '--autostart' || a.startsWith('--autostart=')) {
+    if (a === '--pair' || a.startsWith('--pair=')) {
+      const raw = a === '--pair' ? argv[++i] : a.slice('--pair='.length)
+      if (typeof raw !== 'string' || !PAIR_LABEL_RE.test(raw)) return { error: `--pair needs a label: letters, digits, ':', '.', '_' and '-' (got ${raw === undefined ? 'nothing' : JSON.stringify(raw)})` }
+      pair = raw
+    } else if (a === '--pair-key') {
+      /*
+       * `--pair-key <label> <public key>` (#1711, docs/plans/key-pairing.md §4.2): a hub's key pairing, at each link in
+       * place of `--pair`. The key is checked as the host checks it (§4.1): a refused one writes nothing
+       */
+      const label = argv[++i]
+      const publicKey = argv[++i]
+      if (typeof label !== 'string' || !PAIR_LABEL_RE.test(label)) return { error: `--pair-key needs a label: letters, digits, ':', '.', '_' and '-' (got ${label === undefined ? 'nothing' : JSON.stringify(label)})` }
+      if (!parseLinkPublicKey(publicKey)) return { error: `--pair-key needs an Ed25519 public key after the label, as 43 characters of base64url (got ${publicKey === undefined ? 'nothing' : JSON.stringify(String(publicKey).slice(0, 64))})` }
+      pairKey = { label, publicKey }
+    } else if (a === '--key-paired') {
+      // The hub has paired by key with this machine before (#1711, §4.2): a key line removes the label's verifier entry
+      keyPaired = true
+    } else if (a === '--revoke' || a.startsWith('--revoke=')) {
+      const raw = a === '--revoke' ? argv[++i] : a.slice('--revoke='.length)
+      if (typeof raw !== 'string' || !CREDENTIAL_ID_RE.test(raw)) return { error: `--revoke needs a credential's id, as --connection lists it (got ${raw === undefined ? 'nothing' : JSON.stringify(raw)})` }
+      if (mode !== 'serve' && mode !== 'revoke') return { error: `${FLAG_OF[mode]} and --revoke are separate commands; pass one` }
+      mode = 'revoke'
+      revoke = raw
+    } else if (a === '--autostart' || a.startsWith('--autostart=')) {
       const raw = a === '--autostart' ? argv[++i] : a.slice('--autostart='.length)
       if (!AUTOSTART_ACTIONS.includes(raw)) return { error: `--autostart needs on, off, remove or status (got ${raw === undefined ? 'nothing' : JSON.stringify(raw)})` }
       if (mode !== 'serve' && mode !== 'autostart') return { error: `${FLAG_OF[mode]} and --autostart are separate commands; pass one` }
@@ -76,7 +120,7 @@ export function parseServeArgs(argv) {
       autostart = raw
     } else if (Object.hasOwn(MODE_FLAGS, a)) {
       const m = MODE_FLAGS[a]
-      if (mode !== 'serve' && mode !== m) return { error: `${FLAG_OF[mode]} and ${a} are separate commands; pass one` }
+      if (mode !== 'serve' && mode !== m) return { error: `${FLAG_OF[mode] ?? mode} and ${a} are separate commands; pass one` }
       mode = m
     } else if (a === '--help' || a === '-h') help = true
     else if (a.startsWith(CHILD_FLAG)) child = a.slice(CHILD_FLAG.length)
@@ -92,6 +136,11 @@ export function parseServeArgs(argv) {
     } else return { error: `unknown option for serve: ${a}\n\n${SERVE_HELP}` }
   }
   if (help) return { mode: 'help', port }
+  if (pair !== null && mode !== 'connection') return { error: '--pair goes with --connection' }
+  if (pairKey !== null && mode !== 'connection') return { error: '--pair-key goes with --connection' }
+  if (pair !== null && pairKey !== null) return { error: '--pair and --pair-key are two ways of pairing; pass one' }
+  if (keyPaired && pairKey === null) return { error: '--key-paired goes with --pair-key' }
+  if (mode === 'revoke') return port !== null ? { error: '--revoke takes no --port' } : { mode, port, revoke }
   if (from !== null && mode !== 'serve' && mode !== 'detach') return { error: `--from goes with \`centralu serve\` and --detach, which start a host; not with ${FLAG_OF[mode]}` }
   if (child !== null) {
     if (mode !== 'serve') return { error: `${CHILD_FLAG.slice(0, -1)} is how --detach starts serve, not an option of ${FLAG_OF[mode]}` }
@@ -106,7 +155,7 @@ export function parseServeArgs(argv) {
     if (port !== null) return { error: '--autostart takes no --port: the entry it writes starts serve on the port serve recorded' }
     return { mode, port, autostart }
   }
-  return { mode, port, ...(from !== null ? { from } : {}) }
+  return { mode, port, ...(from !== null ? { from } : {}), ...(pair !== null ? { pair } : {}), ...(pairKey !== null ? { pairKey, keyPaired } : {}) }
 }
 
 function parsePort(raw) {

package/bin/serve-autostart.mjs

@@ -384,10 +384,10 @@ async function systemdAutostart(action, { dataDir, env, home, name, run, user })
   return { ...base, on: true, linger, ...(linger === true ? {} : { message: lingerMessage(user) }) }
 }
 
-async function taskAutostart(action, { dataDir, env, home, name, run, user, platform, interop }) {
+async function taskAutostart(action, { dataDir, env, home, name, run, user, platform, interop, mounts }) {
   const legacy = legacyTaskName({ dataDir, home, env, platform })
   const detach = detachHow(platform, env, interop)
-  const ps = windowsPowershell(detach, env)
+  const ps = windowsPowershell(detach, env, mounts)
   const base = { ok: true, how: 'task', linger: null }
   if (!ps) return { ...base, ok: false, on: false, message: 'Windows PowerShell is not reachable from this WSL distro' }
   const ask = (script) => askPowershell(ps, script, env, parseTaskAnswer, run)
@@ -456,8 +456,8 @@ export async function startInSignIn({ dataDir, env, home, platform = process.pla
  * hub asks (the link started it), and the entry is for the next boot.
  *
  * stdout: one line, `{ v: 1, autostart: { ok, on, how, linger, message? } }`; `how` null where this
- * machine offers nothing (`autostartHow`). `run` (a command runner) and `how` are parameters so
- * tests never reach the real systemd or Task Scheduler.
+ * machine offers nothing (`autostartHow`). `run` (a command runner), `how` and `mounts` (what /proc/mounts says, where WSL finds
+ * the Windows drive) are parameters so tests never reach the real systemd or Task Scheduler, nor depend on the drives of the machine.
  */
 export async function runAutostart({
   env,
@@ -467,6 +467,7 @@ export async function runAutostart({
   platform = process.platform,
   interop = wslInterop,
   how = autostartHow(platform, env, { interop }),
+  mounts = undefined,
   run = runCaptured,
   user = userInfo().username,
   write = (line) => process.stdout.write(line),
@@ -481,7 +482,7 @@ export async function runAutostart({
   }
   try {
     const name = autostartName(how, { dataDir, home, env, platform, user })
-    const opts = { dataDir, env, home, name, run, user, platform, interop }
+    const opts = { dataDir, env, home, name, run, user, platform, interop, mounts }
     return report(how === 'systemd' ? await systemdAutostart(action, opts) : await taskAutostart(action, opts))
   } catch (e) {
     return report({ ok: false, on: readAutostartMark(dataDir)?.how === how, how, linger: null, message: e?.message ?? String(e) })

package/bin/serve-detach.mjs

@@ -8,7 +8,7 @@ import { userInfo } from 'node:os'
 import { join } from 'node:path'
 import { answerLine, isAlive, say, sayTo, runCaptured, tail, sleep } from './serve-util.mjs'
 import { SERVE_LOG_FILE, serveDataDir, ensureServeState, markStopped, rotateServeLog } from './serve-files.mjs'
-import { askPowershell, detachHow, windowsArg, wmiScript, parseWmiAnswer, wmiBlockedMessage, windowsPowershell, windowsTool, wslDistro, wslUser } from './serve-windows.mjs'
+import { askPowershell, detachHow, windowsArg, wmiScript, parseWmiAnswer, wmiBlockedMessage, windowsPowershell, windowsTool, wslCommandLine } from './serve-windows.mjs'
 import { CHILD_FLAG } from './serve-args.mjs'
 import { startInSignIn } from './serve-autostart.mjs'
 import { stopServedHost } from './serve-handover.mjs'
@@ -72,11 +72,7 @@ export async function startDetached({ how, execPath, args, env, cwd }) {
   let commandLine
   try {
     if (how === 'wmi') commandLine = [execPath, ...args].map(windowsArg).join(' ')
-    else {
-      const distro = wslDistro(env.WSL_DISTRO_NAME ?? '')
-      const user = wslUser(userInfo().username)
-      commandLine = ['wsl.exe', '-d', distro, '-u', user, '--cd', cwd, '--exec', execPath, ...args].map(windowsArg).join(' ')
-    }
+    else commandLine = wslCommandLine({ distro: env.WSL_DISTRO_NAME ?? '', user: userInfo().username, cwd, execPath, args })
   } catch (e) {
     return { ok: false, blocked: false, message: e.message }
   }