mirror of
https://github.com/moonD4rk/HackBrowserData.git
synced 2026-05-19 18:58:03 +02:00
Roger
1a3aea553e
* feat: add Firefox Browser implementation with new v2 architecture Add Firefox NewBrowsers + Extract pipeline following the Chromium v2 pattern. Firefox-specific differences handled: - Profile discovery: random directory names (e.g. abc123.default-release) - Master key: NSS/ASN1PBE from key4.db (platform-agnostic, no DPAPI/Keychain) - Key validation: reuse logins.json from acquireFiles tempPaths - Extract: only Password needs masterKey; Cookie is plaintext - No CreditCard or SessionStorage support Files: - firefox_new.go: Browser struct, NewBrowsers, Extract, getMasterKey, extractCategory, deriveKeys, validateKeyWithLogins, profile discovery - masterkey.go: extracted shared NSS logic (processMasterKey, queryMetaData, queryNssPrivateCandidates, parseLoginCipherPairs, canDecryptAnyLoginCipherPair) - firefox_new_test.go: table-driven tests with shared fixtures - source.go: remove dataSource wrapper, use []sourcePath directly - firefox.go: remove functions moved to masterkey.go * fix: address Copilot review feedback on Firefox v2 - Fix stale comment referencing removed readLoginCipherPairs - Rename finallyKey to derivedKey for clarity in processMasterKey - Add sqlite driver import to masterkey.go for self-containedness * refactor: rewrite Firefox masterkey and improve naming Masterkey rewrite: - Replace raw SQL functions with structured key4DB type (globalSalt, passwordCheck, privateKeys) for clear data modeling - Split processMasterKey into verifyPasswordCheck + decryptPrivateKey - Add nssKeyTypeTag constant for the magic bytes - Rename finallyKey to derivedKey - Add sqlite driver import for self-containedness - Return error (not fallback) when logins validation explicitly fails Naming cleanup: - loginPair → encryptedLogin (clarify these are encrypted blobs) - parseLoginPairs → sampleEncryptedLogins (clarify sampling purpose) - canDecryptLogin → tryDecryptLogins (accurate verb, plural alignment) - Expand abbreviated variables: p→login, uPBE→userPBE, pPBE→pwdPBE Password extraction: - Keep entries when decryptPBE fails (URL preserved, user/pwd empty) - Align with Chromium behavior where decrypt failure doesn't skip records Old code cleanup: - firefox.go GetMasterKey now delegates to retrieveMasterKey - Remove functions moved to masterkey.go * docs: add RFC-003 for crypto package naming cleanup Track accumulated naming and structural issues in crypto/asn1pbe.go and cross-browser shared code for a future dedicated refactoring pass. * refactor: move masterkey tests to masterkey_test.go - Rename firefox_test.go to masterkey_test.go since all tests in this file test masterkey.go functions (readKey4DB, sampleEncryptedLogins) - Fix TestReadKey4DB to check nssPrivate rows as a set instead of assuming SQLite insertion order - Future deletion of firefox.go won't accidentally remove masterkey tests
64 lines
2.0 KiB
Go
64 lines
2.0 KiB
Go
package firefox
|
|
|
|
import (
|
|
"fmt"
|
|
"testing"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
func TestReadKey4DB(t *testing.T) {
|
|
// Create a minimal key4.db with metaData and nssPrivate tables
|
|
path := createTestDB(t, "key4.db",
|
|
[]string{
|
|
`CREATE TABLE metaData (id TEXT PRIMARY KEY, item1 BLOB, item2 BLOB)`,
|
|
`CREATE TABLE nssPrivate (a11 BLOB, a102 BLOB)`,
|
|
},
|
|
`INSERT INTO metaData (id, item1, item2) VALUES ('password', x'aabbccdd', x'11223344')`,
|
|
`INSERT INTO nssPrivate (a11, a102) VALUES (x'deadbeef', x'cafebabe')`,
|
|
`INSERT INTO nssPrivate (a11, a102) VALUES (x'feedface', x'12345678')`,
|
|
)
|
|
|
|
k4, err := readKey4DB(path)
|
|
require.NoError(t, err)
|
|
|
|
assert.Equal(t, []byte{0xaa, 0xbb, 0xcc, 0xdd}, k4.globalSalt)
|
|
assert.Equal(t, []byte{0x11, 0x22, 0x33, 0x44}, k4.passwordCheck)
|
|
require.Len(t, k4.privateKeys, 2)
|
|
// Don't assume row order — check that both entries exist
|
|
encryptedBlobs := map[string]bool{}
|
|
for _, pk := range k4.privateKeys {
|
|
encryptedBlobs[fmt.Sprintf("%x", pk.encrypted)] = true
|
|
}
|
|
assert.True(t, encryptedBlobs["deadbeef"])
|
|
assert.True(t, encryptedBlobs["feedface"])
|
|
}
|
|
|
|
func TestReadKey4DB_EmptyNssPrivate(t *testing.T) {
|
|
path := createTestDB(t, "key4.db",
|
|
[]string{
|
|
`CREATE TABLE metaData (id TEXT PRIMARY KEY, item1 BLOB, item2 BLOB)`,
|
|
`CREATE TABLE nssPrivate (a11 BLOB, a102 BLOB)`,
|
|
},
|
|
`INSERT INTO metaData (id, item1, item2) VALUES ('password', x'aa', x'bb')`,
|
|
)
|
|
|
|
_, err := readKey4DB(path)
|
|
require.Error(t, err)
|
|
assert.Contains(t, err.Error(), "empty")
|
|
}
|
|
|
|
func TestSampleEncryptedLogins(t *testing.T) {
|
|
raw := []byte(`{"logins":[
|
|
{"encryptedUsername":"dGVzdA==","encryptedPassword":"cGFzcw=="},
|
|
{"encryptedUsername":"!!!invalid","encryptedPassword":"cGFzcw=="},
|
|
{"encryptedUsername":"dGVzdA==","encryptedPassword":"cGFzcw=="}
|
|
]}`)
|
|
|
|
samples := sampleEncryptedLogins(raw)
|
|
require.Len(t, samples, 2) // second entry skipped (invalid base64)
|
|
assert.Equal(t, []byte("test"), samples[0].username)
|
|
assert.Equal(t, []byte("pass"), samples[0].password)
|
|
}
|