instabox 0.5.3 → 0.5.4

package/bin/instabox.mjs

@@ -23,7 +23,7 @@ import { orderBoxes } from '../lib/boxes.mjs';
 import { guestUserNote, localGuestUser } from '../lib/guestuser.mjs';
 import { checkCli, findCli, installCli, installCommand, isOnboarding, real, runCli } from '../lib/cli.mjs';
 import { browserCommand, callbackHandler } from '../lib/login.mjs';
-import { sessionArgs } from '../lib/ssh.mjs';
+import { makeDirPrivate, sessionArgs } from '../lib/ssh.mjs';
 import { loadCredentials, saveCredentials } from '../lib/credentials.mjs';
 
 // Same variables, same order as the instabox CLI, so both talk to one server.
@@ -448,6 +448,8 @@ async function onboard(wantBox) {
       rmSync(dir, { recursive: true, force: true });
     } catch {}
   });
+  // before ssh-keygen, so the key inherits only the owner's access
+  if (!makeDirPrivate(dir)) console.log(dim(`  could not make ${dir} private (icacls failed); ssh may refuse the key`));
   const key = join(dir, 'id_ed25519');
   const kg = spawnSync('ssh-keygen', ['-q', '-t', 'ed25519', '-N', '', '-C', 'instabox', '-f', key], {
     stdio: 'ignore',

package/lib/cli.mjs

@@ -201,7 +201,7 @@ async function installWindows(
       version: v,
       pathHint: onPath
         ? null
-        : `[Environment]::SetEnvironmentVariable('Path', [Environment]::GetEnvironmentVariable('Path', 'User') + ';${to.replaceAll("'", "''")}', 'User')`,
+        : `[Environment]::SetEnvironmentVariable('Path', ([string][Environment]::GetEnvironmentVariable('Path', 'User')).TrimEnd(';') + ';${to.replaceAll("'", "''")}', 'User')`,
     };
   } catch (e) {
     rmSync(tmp, { force: true });

package/lib/ssh.mjs

@@ -1,4 +1,5 @@
 // ssh's argv for a session with this run's throwaway key, certificate and known_hosts.
+import { spawnSync } from 'node:child_process';
 import { join } from 'node:path';
 
 // ssh splits an -o value at whitespace and reads ' as an open quote; Windows profile paths often have either.
@@ -24,3 +25,12 @@ export function sessionArgs({ dir, key, port, username, host }) {
     `${username}@${host}`,
   ];
 }
+
+// Windows OpenSSH rejects a key that anyone but its owner may read, and a temp dir can pass on other users' ACEs.
+export function makeDirPrivate(dir, { platform = process.platform, run = spawnSync } = {}) {
+  if (platform !== 'win32') return true;
+  const who = run('whoami', ['/user', '/fo', 'csv', '/nh'], { encoding: 'utf8' });
+  const sid = String(who.stdout || '').match(/"(S-1-[0-9-]+)"/)?.[1];
+  if (!sid) return false;
+  return run('icacls', [dir, '/inheritance:r', '/grant:r', `*${sid}:(OI)(CI)F`], { stdio: 'ignore' }).status === 0;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "instabox",
-  "version": "0.5.3",
+  "version": "0.5.4",
   "description": "A cloud box for your coding agent, the instabox CLI and its agent skills in one command: npx instabox@latest",
   "type": "module",
   "bin": {