← Commit history

Fix the credential-import 'never worked' root cause: AD renamed the elevated decrypt verb from desktop_decrypt_pup_credentials to desktop_decrypt_browser_credentials, but pup still called the old name so every import died with unknown_verb (silently, from the dashboard). Pup now calls the current name first and falls back to the old one for older AD builds, via a shared decryptBrowserCreds helper used by both the new pup_import_browser_logins verb and the dashboard import-run action.

John Lauer ·e47b7585b3 ·2mo ago ·parent c848cce
4 files changed +26−9
adom-bridge-puppeteer-manifest.json+4−4
@@ -1,10 +1,10 @@ {   "manifest_version": 1,   "name": "puppeteer",-  "version": "2.0.143",-  "url": "https://wiki.adom.inc/download/adom/pup-bridge/2.0.143/adom-bridge-puppeteer-v2.0.143.zip",-  "sha256": "7510be90937793f0a2bc2b4fb58f9c5dc52fbc9478d6f425927a3fd97b1b604c",-  "size": 896754,+  "version": "2.0.143.1",+  "url": "https://wiki.adom.inc/download/adom/pup-bridge/2.0.143.1/adom-bridge-puppeteer-v2.0.143.1.zip",+  "sha256": "a86155383e4e1401ec9224b8d6eb06ec37967f9ab4ce1d3237e04a9798ef07f0",+  "size": 897187,   "verbPrefixes": [     "browser_",     "desktop_recorder_",
src/BRIDGE_VERSION+1−1
@@ -1 +1 @@-2.0.143+2.0.143.1
src/bridge.json+1−1
@@ -2,7 +2,7 @@   "manifest_version": 1,   "name": "puppeteer",   "displayName": "Puppeteer (Chrome for Testing + Native)",-  "version": "2.0.143",+  "version": "2.0.143.1",   "description": "Drives a browser ALREADY on the machine \u2014 installed Chrome, else Microsoft Edge (every Windows PC ships with Edge) \u2014 launched with a FRESH isolated profile, so the common case has NO ~150 MB Chrome-for-Testing download and it never touches the user's real tabs/logins. Binds its local server to LOOPBACK (127.0.0.1) only, so no Windows Firewall 'allow Node through the firewall' prompt ever pops. Chrome for Testing is fetched only as a LAST RESORT if the machine has no Chromium browser at all. SPAWN-VERIFIED fallback: pup tries each detected browser (Chrome \u2192 Edge \u2192 CfT) and actually launches it, falling through to the next if one won't start (and handling browsers like Edge that relaunch onto another PID), so a corrupt/partial install never hard-fails an open. The browser that launches is cached as the default (persisted across restarts) so it isn't re-probed each time. On spawn the bridge SELF-WARMS: detects browsers + disk, and only if the box has no Chrome/Edge and no cached CfT does it background-fetch CfT so the first open is instant. pup_use pins a specific browser (chrome | edge | cft | auto); {browser:'chrome',install:true} downloads & installs REAL Google Chrome (user-scoped, no admin) on an Edge-only box. pup_readiness (READ-ONLY) reports which browser will be used + the full candidate list + the default + free disk. Every failure returns a specific errorCode + _hint (chrome_install_no_disk, chrome_download_network, chrome_install_permission, chrome_stable_not_detected, \u2026). Launches with FULL browser permissions by default for full debug (strictPermissions:true opts out). Headful automation: open/close windows+tabs, navigate, screenshot, eval JS, record. pup is a GENERIC, non-profile browser only \u2014 every session is a fresh isolated Chrome/Edge process, never the user's real signed-in browser; profile defaults to sessionId. To drive the user's REAL Chrome/Edge (their profile, cookies, SSO), use the Adom browser EXTENSION's nbrowser_* verbs \u2014 a separate bridge, not pup's job. macOS (v1.9.74+): full parity with mac-native mechanics \u2014 background-by-default is the app-level hide (windows stay drivable/screenshottable while hidden), raise/lower map to unhide+activate/hide, pup_alert_window posts a native toast whose click focuses the window, pup_use {browser:'chrome',install:true} installs Chrome from the official dmg, and taskbar identity/badging remains Windows-only.",   "homepage": "https://wiki.adom.inc/adom/adom-bridge",   "author": "Adom Inc.",
src/server.js+20−3
@@ -647,6 +647,24 @@ async function applyConsumerUA(page) {     await page.setUserAgent(o.ua, o.metadata);   } catch (e) { /* best-effort — a page that refuses the override just keeps CfT's brands */ } }+// v2.0.143 (John's "the import never worked" — traced): AD RENAMED the SYSTEM-elevated decrypt+// verb from desktop_decrypt_pup_credentials to desktop_decrypt_browser_credentials, but pup still+// called the OLD name, so every import died with unknown_verb (which the dashboard swallowed —+// exactly why it looked like it never worked). Call the CURRENT name first; fall back to the old+// one on unknown_verb so pup keeps working on an older AD. Both are LOCAL-only (relay_forbidden);+// pup calls over the loopback direct API so it is allowed, and AD fires its own consent + UAC.+async function decryptBrowserCreds(argsObj) {+  const names = ['desktop_decrypt_browser_credentials', 'desktop_decrypt_pup_credentials'];+  let last = null;+  for (const n of names) {+    const resp = await chrome.abCommand(n, argsObj, { timeoutMs: 180000 });+    const p = abPayload(resp) || {};+    const ec = p.errorCode || (resp && resp.errorCode);+    if (ec === 'unknown_verb') { last = resp; continue; }   // wrong name on this AD — try the next+    return resp;+  }+  return last;+} function attachTab(session, sessionId, page, { makeActive = true, opener = 'user', openerTabId = null } = {}) {   const tabId = nextTabId(session);   const errors = [];@@ -11284,8 +11302,7 @@ const server = http.createServer(async (req, res) => {           console.log(`[import] decrypt requested for ${sel.length} profile(s) across ${browsers.join(', ')} — calling AD helper locally (consent + UAC will prompt on the desktop)`);           let resp;           try {-            resp = await chrome.abCommand('desktop_decrypt_pup_credentials',-              { browsers, include: ['passwords'] }, { timeoutMs: 180000 });+            resp = await decryptBrowserCreds({ browsers, include: ['passwords'] });           } catch (e) { return done({ ok: false, error: 'decrypt helper call failed: ' + (e && e.message || e) }); }           const payload = abPayload(resp) || {};           const ec = payload.errorCode || (resp && resp.errorCode);@@ -15959,7 +15976,7 @@ const server = http.createServer(async (req, res) => {           // 2) the SYSTEM-elevated decrypt, called LOCALLY (consent + UAC prompt on the desktop).           console.log(`[import-verb] decrypt requested for browsers=[${browsers.join(', ')}] — AD helper, consent + UAC will prompt on the desktop`);           let resp;-          try { resp = await chrome.abCommand('desktop_decrypt_pup_credentials', { browsers, include: ['passwords'] }, { timeoutMs: 180000 }); }+          try { resp = await decryptBrowserCreds({ browsers, include: ['passwords'] }); }           catch (e) { sendJSON(res, { success: false, errorCode: 'decrypt_call_failed', error: 'decrypt helper call failed: ' + (e && e.message || e) }); return; }           const payload = abPayload(resp) || {};           const ec = payload.errorCode || (resp && resp.errorCode);