diff --git a/resources/xkey_helper b/resources/xkey_helper index 1c9b951..ada9a32 100755 Binary files a/resources/xkey_helper and b/resources/xkey_helper differ diff --git a/resources/xkey_helper.sha256 b/resources/xkey_helper.sha256 new file mode 100644 index 0000000..e69d8a2 --- /dev/null +++ b/resources/xkey_helper.sha256 @@ -0,0 +1 @@ +f1bbd88584075c0e6d3487357a06424949de26d7e6dcad803d210aab83b0cbda xkey_helper diff --git a/src/main/index.ts b/src/main/index.ts index 73d5248..a84f495 100644 --- a/src/main/index.ts +++ b/src/main/index.ts @@ -895,7 +895,7 @@ app.whenReady().then(async () => { wechatVersion: await detectWechatVersion(), dataStructureVersion: detectDataStructureVersion(settings.dbRoot), dataDirectoryDetected: validateDbRoot(settings.dbRoot).valid, - autoDetectSupported: process.platform === 'win32' || intelMac, + autoDetectSupported: process.platform === 'win32' || process.platform === 'darwin', wechatRunning: await isWechatRunning(), accountIdentified: Boolean(self?.wxid), dbConnected: chat.isReady(), diff --git a/src/main/key-service-mac.ts b/src/main/key-service-mac.ts index 7a88fa4..b71f3fe 100644 --- a/src/main/key-service-mac.ts +++ b/src/main/key-service-mac.ts @@ -24,6 +24,83 @@ export interface ImageKeyResult { error?: string } +export function buildXkeyHelperArguments(pid: number, timeoutMs: number): string[] { + return [String(pid), String(timeoutMs), '--profile', 'wechat-4.1.13', '--account'] +} + +export function mapXkeyHelperFailure( + rawError: string, + fallbackCode = 'HELPER_RESULT_INVALID' +): DatabaseKeyResult { + const normalizedError = rawError.trim().toLowerCase() + const parsedError = rawError.match(/(?:^|[\s"])(?:\\?"?)ERROR:([^:\s"}]+):?([^"}\r\n]*)/i) + const code = parsedError?.[1]?.toUpperCase() + const detail = parsedError?.[2]?.trim() || '' + + if ( + code === 'CAPTURE_TIMEOUT' || + normalizedError.includes('timeout waiting for breakpoint hit') || + normalizedError.includes('timeout waiting for sink hit') || + normalizedError.includes('no_breakpoint_hit') + ) { + return { + success: false, + code: 'CAPTURE_TIMEOUT', + error: + '已完成管理员授权，但监听期间微信没有触发账号密钥派生。请先停留在微信登录界面，在 TraceMemo 点击“自动获取密钥”，授权后点击微信“登录”；已有登录凭据时通常不需要扫码。' + } + } + if (code === 'SCAN_FAILED' && detail.toLowerCase().includes('sink pattern not found')) { + return { + success: false, + code, + error: + '内存扫描失败：未匹配到目标函数特征（Sink pattern not found），当前微信版本可能暂未适配。\n' + + '建议步骤：降级微信到 4.1.8 (点击顶部"上手教程"获取下载链接) -> 重启电脑（冷启动） -> 自动获取密钥 -> 成功后再升级微信。\n' + + '请不要连续重试，以免触发微信安全模式或系统内存保护。' + } + } + if (code === 'SCAN_FAILED') { + return { + success: false, + code, + error: '内存扫描失败：当前微信版本或运行状态暂未适配。' + } + } + if (normalizedError.includes('permission denied') || code === 'PERMISSION_DENIED') { + return { + success: false, + code: code || 'PERMISSION_DENIED', + error: '管理员授权不足，无法读取微信进程内存。' + } + } + return { + success: false, + code: code || fallbackCode, + error: code + ? `密钥工具执行未完成（${code}），请确认微信仍在运行后重试。` + : '密钥工具未返回有效密钥，请确认微信仍在运行后重试。' + } +} + +export function parseXkeyHelperOutput(output: string): DatabaseKeyResult { + const payloads: Record[] = [] + for (const match of output.matchAll(/\{[^{}]*\}/g)) { + try { + payloads.push(JSON.parse(match[0]) as Record) + } catch { + // Ignore helper progress that is not JSON. + } + } + const payload = payloads.find((item) => item.success === true && typeof item.key === 'string') + const rawKey = typeof payload?.key === 'string' ? payload.key.trim().replace(/^0x/i, '') : '' + if (isValidDatabaseKey(rawKey)) return { success: true, key: rawKey } + + const errorPayload = payloads.find((item) => typeof item.result === 'string') + const rawError = typeof errorPayload?.result === 'string' ? errorPayload.result.trim() : '' + return mapXkeyHelperFailure(rawError) +} + export class KeyServiceMac { private getMacKeyRuntimeDir(): string { return path.join(app.getPath('userData'), 'key-runtime') @@ -219,50 +296,7 @@ export class KeyServiceMac { // Try the next process lookup strategy. } } - throw new Error('未找到微信主进程，请先启动并登录微信') - } - - private parseHelperOutput(output: string): DatabaseKeyResult { - const payloads: Record[] = [] - for (const match of output.matchAll(/\{[^{}]*\}/g)) { - try { - payloads.push(JSON.parse(match[0]) as Record) - } catch { - // Ignore helper progress that is not JSON. - } - } - const payload = payloads.find((item) => item.success === true && typeof item.key === 'string') - const rawKey = typeof payload?.key === 'string' ? payload.key.trim().replace(/^0x/i, '') : '' - if (!isValidDatabaseKey(rawKey)) { - const errorPayload = payloads.find((item) => typeof item.result === 'string') - const rawError = typeof errorPayload?.result === 'string' ? errorPayload.result.trim() : '' - const parsedError = rawError.match(/^ERROR:([^:]+):?(.*)$/i) - const code = parsedError?.[1]?.toUpperCase() - const detail = parsedError?.[2]?.trim() || '' - if (code === 'SCAN_FAILED' && detail.toLowerCase().includes('sink pattern not found')) { - return { - success: false, - code, - error: - '内存扫描失败：未匹配到目标函数特征（Sink pattern not found），当前微信版本可能暂未适配。\n' + - '建议步骤：降级微信到 4.1.8 (点击顶部"上手教程"获取下载链接) -> 重启电脑（冷启动） -> 自动获取密钥 -> 成功后再升级微信。\n' + - '请不要连续重试，以免触发微信安全模式或系统内存保护。' - } - } - if (code === 'SCAN_FAILED') { - return { - success: false, - code, - error: `内存扫描失败：${detail || '未匹配到可用特征，当前微信版本可能暂未适配。'}` - } - } - return { - success: false, - code, - error: rawError || '密钥工具未返回有效的 64 位密钥' - } - } - return { success: true, key: rawKey } + throw new Error('未找到微信主进程，请先启动微信并停留在登录界面') } async autoGetDbKey( @@ -295,12 +329,13 @@ export class KeyServiceMac { onStatus?.('正在查找微信进程...') const pid = await this.getWeChatPid() const helperPath = this.getHelperPath() - const waitMs = Math.max(30_000, timeoutMs) - const timeoutSeconds = Math.ceil(waitMs / 1000) + 30 + const waitMs = Math.max(120_000, timeoutMs) + const timeoutSeconds = Math.ceil(waitMs / 1000) + 10 + const helperArguments = buildXkeyHelperArguments(pid, waitMs) onStatus?.('正在请求管理员授权...') const scriptLines = [ `set helperPath to ${JSON.stringify(helperPath)}`, - `set cmd to quoted form of helperPath & " ${pid} ${waitMs}"`, + `set cmd to quoted form of helperPath & " ${helperArguments.join(' ')}"`, `set timeoutSec to ${timeoutSeconds}`, 'try', 'with timeout of timeoutSec seconds', @@ -311,25 +346,53 @@ export class KeyServiceMac { 'return "ERR::" & errNum & "::" & errMsg', 'end try' ] - onStatus?.('授权后 需要在微信登录界面 点击登录微信') + onStatus?.('授权后请在微信登录界面点击“登录”，已有登录凭据时通常不需要扫码') const { stdout } = await execFileAsync( '/usr/bin/osascript', scriptLines.flatMap((line) => ['-e', line]), - { timeout: waitMs + 20_000 } + { timeout: timeoutSeconds * 1000 + 5_000 } ) const output = String(stdout).trim() - if (output.startsWith('ERR::-128')) return { success: false, error: '已取消管理员授权' } - if (output.startsWith('ERR::')) { - return { - success: false, - error: output.split('::').slice(2).join('::') || '密钥工具执行失败' - } + if (output.startsWith('ERR::-128')) { + return { success: false, error: '已取消管理员授权' } } - const result = this.parseHelperOutput(output.startsWith('OK::') ? output.slice(4) : output) + if (output.startsWith('ERR::')) { + const [, errorNumber = 'UNKNOWN', ...errorParts] = output.split('::') + const result = mapXkeyHelperFailure(errorParts.join('::'), `OSASCRIPT_${errorNumber}`) + onStatus?.('密钥获取失败') + return result + } + const result = parseXkeyHelperOutput(output.startsWith('OK::') ? output.slice(4) : output) onStatus?.(result.success ? '密钥获取成功' : '密钥获取失败') return result } catch (error) { - return { success: false, error: error instanceof Error ? error.message : String(error) } + const processError = error as NodeJS.ErrnoException & { + killed?: boolean + signal?: NodeJS.Signals | null + } + if (processError.message?.includes('未找到微信主进程')) { + return { + success: false, + code: 'WECHAT_NOT_RUNNING', + error: '未找到微信主进程，请先启动微信并停留在登录界面。' + } + } + if ( + processError.killed || + processError.code === 'ETIMEDOUT' || + processError.signal === 'SIGTERM' + ) { + return { + success: false, + code: 'AUTH_TIMEOUT', + error: '管理员授权等待超时，请点击“自动获取密钥”后及时完成系统授权。' + } + } + return { + success: false, + code: typeof processError.code === 'string' ? processError.code : 'HELPER_EXEC_FAILED', + error: '密钥工具执行失败，请确认微信仍在运行后重试。' + } } } diff --git a/tests/unit/key-service-mac.test.ts b/tests/unit/key-service-mac.test.ts new file mode 100644 index 0000000..3d8b894 --- /dev/null +++ b/tests/unit/key-service-mac.test.ts @@ -0,0 +1,96 @@ +import { beforeEach, describe, expect, it, vi } from 'vitest' + +vi.mock('electron', () => ({ + app: { + getPath: vi.fn(() => '/tmp/tracememo-key-service-test') + } +})) + +import { + buildXkeyHelperArguments, + mapXkeyHelperFailure, + parseXkeyHelperOutput +} from '../../src/main/key-service-mac' + +describe('parseXkeyHelperOutput', () => { + beforeEach(() => { + vi.clearAllMocks() + }) + + it('returns a valid helper key without exposing progress output', () => { + const key = 'ab'.repeat(32) + expect( + parseXkeyHelperOutput(`progress line\n${JSON.stringify({ success: true, key })}`) + ).toEqual({ success: true, key }) + }) + + it('maps a login-time capture timeout to an actionable message', () => { + const result = parseXkeyHelperOutput( + JSON.stringify({ + success: false, + result: + 'sink found at 0x1234\nsoftware breakpoint unavailable\nhardware breakpoint armed\ntimeout waiting for breakpoint hit' + }) + ) + + expect(result).toEqual({ + success: false, + code: 'CAPTURE_TIMEOUT', + error: + '已完成管理员授权，但监听期间微信没有触发账号密钥派生。请先停留在微信登录界面，在 TraceMemo 点击“自动获取密钥”，授权后点击微信“登录”；已有登录凭据时通常不需要扫码。' + }) + }) + + it('does not expose raw helper diagnostics for an unknown failure', () => { + const result = parseXkeyHelperOutput( + JSON.stringify({ + success: false, + result: 'private diagnostic /Users/example/source/xkey.mm:123' + }) + ) + + expect(result).toEqual({ + success: false, + code: 'HELPER_RESULT_INVALID', + error: '密钥工具未返回有效密钥，请确认微信仍在运行后重试。' + }) + expect(result.error).not.toContain('/Users/example') + }) + + it('sanitizes diagnostics returned through an AppleScript command error', () => { + const result = mapXkeyHelperFailure( + 'sink found at 0x1234\nhardware breakpoint armed on 81/81 threads\nWAIT_FAILED:no_breakpoint_hit', + 'OSASCRIPT_1' + ) + + expect(result).toEqual({ + success: false, + code: 'CAPTURE_TIMEOUT', + error: + '已完成管理员授权，但监听期间微信没有触发账号密钥派生。请先停留在微信登录界面，在 TraceMemo 点击“自动获取密钥”，授权后点击微信“登录”；已有登录凭据时通常不需要扫码。' + }) + }) + + it('uses the verified 4.1.13 account-key capture contract', () => { + expect(buildXkeyHelperArguments(60037, 120_000)).toEqual([ + '60037', + '120000', + '--profile', + 'wechat-4.1.13', + '--account' + ]) + }) + + it('extracts a helper error embedded in AppleScript diagnostics', () => { + expect( + mapXkeyHelperFailure( + 'hardware breakpoint armed\n{"success":false,"result":"ERROR:HOOK_FAILED:ptrace"}', + 'OSASCRIPT_1' + ) + ).toEqual({ + success: false, + code: 'HOOK_FAILED', + error: '密钥工具执行未完成（HOOK_FAILED），请确认微信仍在运行后重试。' + }) + }) +})