Skip to content

feat(macOS): fix V4 image decryption and HEVC transcoding #515

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
qicai21 wants to merge 2 commits into
base: main
Choose a base branch
from
+37 −17
Open

feat(macOS): fix V4 image decryption and HEVC transcoding #515

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f58b214
feat(macOS): fix V4 image decryption and HEVC transcoding
Mar 21, 2026
6983c4d
fix(macOS): harden AES key validation with 4-byte signatures
Mar 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 13 additions & 5 deletions electron/services/imageDecryptService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { app, BrowserWindow } from 'electron'
import { app, BrowserWindow } from 'electron'
import { basename, dirname, extname, join } from 'path'
import { pathToFileURL } from 'url'
import { existsSync, mkdirSync, readdirSync, readFileSync, statSync, appendFileSync } from 'fs'
Expand Down Expand Up @@ -1772,13 +1772,21 @@ export class ImageDecryptService {
*/
private getFfmpegPath(): string {
const staticPath = getStaticFfmpegPath()
this.logInfo('ffmpeg 路径检测', { staticPath, exists: staticPath ? existsSync(staticPath) : false })

if (staticPath) {

if (staticPath && existsSync(staticPath)) {
return staticPath
}

// 回退到系统 ffmpeg
// Fallback to common system paths, especially for Homebrew on Apple Silicon
const commonPaths = [
'/opt/homebrew/bin/ffmpeg',
'/usr/local/bin/ffmpeg',
'/usr/bin/ffmpeg'
]
for (const path of commonPaths) {
if (existsSync(path)) return path
}

return 'ffmpeg'
}

Expand Down
36 changes: 24 additions & 12 deletions electron/services/keyServiceMac.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -878,9 +878,13 @@ export class KeyServiceMac {
const trimmed = String(value || '').trim()
if (!trimmed) return ''

// Handle wxid_xxx_yyyy -> wxid_xxx
if (trimmed.toLowerCase().startsWith('wxid_')) {
const match = trimmed.match(/^(wxid_[^_]+)/i)
return match?.[1] || trimmed
const parts = trimmed.split('_')
if (parts.length >= 2) {
return parts[0] + '_' + parts[1]
}
return trimmed
}

const suffixMatch = trimmed.match(/^(.+)_([a-zA-Z0-9]{4})$/)
Expand Down Expand Up @@ -1021,11 +1025,11 @@ export class KeyServiceMac {
const decipher = crypto.createDecipheriv('aes-128-ecb', keyBytes, null)
decipher.setAutoPadding(false)
const dec = Buffer.concat([decipher.update(ciphertext), decipher.final()])
if (dec[0] === 0xFF && dec[1] === 0xD8 && dec[2] === 0xFF) return true
if (dec[0] === 0xFF && dec[1] === 0xD8 && dec[2] === 0xFF && (dec[3] === 0xE0 || dec[3] === 0xE1 || dec[3] === 0xDB || dec[3] === 0xEE)) return true
if (dec[0] === 0x89 && dec[1] === 0x50 && dec[2] === 0x4E && dec[3] === 0x47) return true
if (dec[0] === 0x52 && dec[1] === 0x49 && dec[2] === 0x46 && dec[3] === 0x46) return true
if (dec[0] === 0x77 && dec[1] === 0x78 && dec[2] === 0x67 && dec[3] === 0x66) return true
if (dec[0] === 0x47 && dec[1] === 0x49 && dec[2] === 0x46) return true
if (dec[0] === 0x47 && dec[1] === 0x49 && dec[2] === 0x46 && dec[3] === 0x38) return true
return false
} catch {
return false
Expand All @@ -1034,18 +1038,26 @@ export class KeyServiceMac {

private collectKvcommCodes(accountPath?: string): number[] {
const codeSet = new Set<number>()
const pattern = /^key_(\d+)_.+\.statistic$/i
// Patterns: key_1234.statistic, monitordata_1234, etc.
const patterns = [
/^key_(\d+)/i,
/^monitordata_(\d+)/i
]

for (const kvcommDir of this.getKvcommCandidates(accountPath)) {
if (!existsSync(kvcommDir)) continue
try {
const files = readdirSync(kvcommDir)
for (const file of files) {
const match = file.match(pattern)
if (!match) continue
const code = Number(match[1])
if (!Number.isFinite(code) || code <= 0 || code > 0xFFFFFFFF) continue
codeSet.add(code)
for (const pattern of patterns) {
const match = file.match(pattern)
if (match) {
const code = Number(match[1])
if (Number.isFinite(code) && code > 0 && code <= 0xFFFFFFFF) {
codeSet.add(code)
}
}
}
}
} catch {
// 忽略不可读目录，继续尝试其他候选路径
Expand Down Expand Up @@ -1125,11 +1137,11 @@ export class KeyServiceMac {
const decipher = crypto.createDecipheriv('aes-128-ecb', keyBytes.subarray(0, 16), null)
decipher.setAutoPadding(false)
const dec = Buffer.concat([decipher.update(ciphertext), decipher.final()])
if (dec[0] === 0xFF && dec[1] === 0xD8 && dec[2] === 0xFF) return true
if (dec[0] === 0xFF && dec[1] === 0xD8 && dec[2] === 0xFF && (dec[3] === 0xE0 || dec[3] === 0xE1 || dec[3] === 0xDB || dec[3] === 0xEE)) return true
if (dec[0] === 0x89 && dec[1] === 0x50 && dec[2] === 0x4E && dec[3] === 0x47) return true
if (dec[0] === 0x52 && dec[1] === 0x49 && dec[2] === 0x46 && dec[3] === 0x46) return true
if (dec[0] === 0x77 && dec[1] === 0x78 && dec[2] === 0x67 && dec[3] === 0x66) return true
if (dec[0] === 0x47 && dec[1] === 0x49 && dec[2] === 0x46) return true
if (dec[0] === 0x47 && dec[1] === 0x49 && dec[2] === 0x46 && dec[3] === 0x38) return true
return false
} catch {
return false
Expand Down