mirror of
https://github.com/moonD4rk/HackBrowserData.git
synced 2026-07-06 21:37:47 +02:00
feat: add Firefox extract methods and complete data model fields (#527)
* feat: add Firefox extract methods and complete data model fields Firefox extract methods: - extractPasswords: JSON + ASN1PBE decryption via decryptPBE helper - extractCookies: SQLite, plaintext (no encryption), journalOff - extractHistories: SQLite, visit count ASC sort (matches old behavior) - extractDownloads: SQLite, moz_annos JOIN with JSON content parsing - extractBookmarks: SQLite, moz_bookmarks JOIN moz_places - extractExtensions: JSON, filter by location=app-profile - extractLocalStorage: SQLite webappsstore2, reversed originKey parsing Complete data model fields (union of Chromium and Firefox): - CookieEntry: add HasExpire, IsPersistent - DownloadEntry: add MimeType - CreditCardEntry: add NickName, Address - ExtensionEntry: add HomepageURL, Enabled Update Chromium extractors to populate new fields: - extract_cookie.go: fill HasExpire, IsPersistent - extract_download.go: SELECT and fill mime_type - extract_creditcard.go: SELECT nickname, billing_address_id - extract_extension.go: fill HomepageURL, Enabled (state==1) Tests: - Full test coverage for all 7 Firefox extract functions - Password test uses known ASN1PBE test vectors from crypto package - Table-driven tests for parseOriginKey - Updated Chromium tests for new fields * fix: add COALESCE for nullable bookmark title in Firefox query Firefox moz_bookmarks.title can be NULL (PR #500 fixed this in old code). Add COALESCE to handle NULL gracefully in SQL instead of relying on driver-specific NULL→string conversion behavior. * fix: enable journalOff for all Firefox SQLite extractors and populate cookie flags - Set journalOff=true for extract_history, extract_download, extract_bookmark (Firefox databases require PRAGMA journal_mode=off to avoid lock errors) - Populate HasExpire and IsPersistent for Firefox cookies (derived from expiry>0) - Add test assertions for HasExpire/IsPersistent in both Chromium and Firefox
This commit is contained in:
Roger
@@ -0,0 +1,167 @@
|
||||
package firefox
|
||||
|
||||
import (
|
||||
"database/sql"
|
||||
"fmt"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"testing"
|
||||
|
||||
"github.com/stretchr/testify/require"
|
||||
_ "modernc.org/sqlite"
|
||||
)
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// Real Firefox table schemas — extracted via `sqlite3 <db> ".schema <table>"`.
|
||||
// ---------------------------------------------------------------------------
|
||||
|
||||
const mozCookiesSchema = `CREATE TABLE moz_cookies (
|
||||
id INTEGER PRIMARY KEY,
|
||||
originAttributes TEXT NOT NULL DEFAULT '',
|
||||
name TEXT,
|
||||
value TEXT,
|
||||
host TEXT,
|
||||
path TEXT,
|
||||
expiry INTEGER,
|
||||
lastAccessed INTEGER,
|
||||
creationTime INTEGER,
|
||||
isSecure INTEGER,
|
||||
isHttpOnly INTEGER,
|
||||
inBrowserElement INTEGER DEFAULT 0,
|
||||
sameSite INTEGER DEFAULT 0,
|
||||
rawSameSite INTEGER DEFAULT 0,
|
||||
schemeMap INTEGER DEFAULT 0,
|
||||
isPartitionedAttributeSet INTEGER DEFAULT 0,
|
||||
CONSTRAINT moz_uniqueid UNIQUE (name, host, path, originAttributes)
|
||||
)`
|
||||
|
||||
const mozPlacesSchema = `CREATE TABLE moz_places (
|
||||
id INTEGER PRIMARY KEY,
|
||||
url LONGVARCHAR,
|
||||
title LONGVARCHAR,
|
||||
rev_host LONGVARCHAR,
|
||||
visit_count INTEGER DEFAULT 0,
|
||||
hidden INTEGER DEFAULT 0 NOT NULL,
|
||||
typed INTEGER DEFAULT 0 NOT NULL,
|
||||
frecency INTEGER DEFAULT -1 NOT NULL,
|
||||
last_visit_date INTEGER,
|
||||
guid TEXT,
|
||||
foreign_count INTEGER DEFAULT 0 NOT NULL,
|
||||
url_hash INTEGER DEFAULT 0 NOT NULL,
|
||||
description TEXT,
|
||||
preview_image_url TEXT,
|
||||
site_name TEXT,
|
||||
origin_id INTEGER,
|
||||
recalc_frecency INTEGER NOT NULL DEFAULT 0,
|
||||
alt_frecency INTEGER,
|
||||
recalc_alt_frecency INTEGER NOT NULL DEFAULT 0
|
||||
)`
|
||||
|
||||
const mozBookmarksSchema = `CREATE TABLE moz_bookmarks (
|
||||
id INTEGER PRIMARY KEY,
|
||||
type INTEGER,
|
||||
fk INTEGER DEFAULT NULL,
|
||||
parent INTEGER,
|
||||
position INTEGER,
|
||||
title LONGVARCHAR,
|
||||
keyword_id INTEGER,
|
||||
folder_type TEXT,
|
||||
dateAdded INTEGER,
|
||||
lastModified INTEGER,
|
||||
guid TEXT,
|
||||
syncStatus INTEGER NOT NULL DEFAULT 0,
|
||||
syncChangeCounter INTEGER NOT NULL DEFAULT 1
|
||||
)`
|
||||
|
||||
const mozAnnosSchema = `CREATE TABLE moz_annos (
|
||||
id INTEGER PRIMARY KEY,
|
||||
place_id INTEGER NOT NULL,
|
||||
anno_attribute_id INTEGER,
|
||||
content LONGVARCHAR,
|
||||
flags INTEGER DEFAULT 0,
|
||||
expiration INTEGER DEFAULT 0,
|
||||
type INTEGER DEFAULT 0,
|
||||
dateAdded INTEGER DEFAULT 0,
|
||||
lastModified INTEGER DEFAULT 0
|
||||
)`
|
||||
|
||||
const webappsstore2Schema = `CREATE TABLE webappsstore2 (
|
||||
originAttributes TEXT,
|
||||
originKey TEXT,
|
||||
scope TEXT,
|
||||
key TEXT,
|
||||
value TEXT
|
||||
)`
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// INSERT helpers
|
||||
// ---------------------------------------------------------------------------
|
||||
|
||||
func insertMozCookie(name, value, host, path string, creationTime, expiry int64, isSecure, isHTTPOnly int) string {
|
||||
return fmt.Sprintf(
|
||||
`INSERT INTO moz_cookies (name, value, host, path, creationTime, expiry, isSecure, isHttpOnly, lastAccessed)
|
||||
VALUES ('%s', '%s', '%s', '%s', %d, %d, %d, %d, %d)`,
|
||||
name, value, host, path, creationTime, expiry, isSecure, isHTTPOnly, creationTime,
|
||||
)
|
||||
}
|
||||
|
||||
func insertMozPlace(id int, url, title string, visitCount int, lastVisitDate int64) string {
|
||||
return fmt.Sprintf(
|
||||
`INSERT INTO moz_places (id, url, title, visit_count, last_visit_date, rev_host, guid, url_hash)
|
||||
VALUES (%d, '%s', '%s', %d, %d, '', 'guid-%d', 0)`,
|
||||
id, url, title, visitCount, lastVisitDate, id,
|
||||
)
|
||||
}
|
||||
|
||||
func insertMozBookmark(id, fk, bookmarkType int, title string, dateAdded int64) string {
|
||||
return fmt.Sprintf(
|
||||
`INSERT INTO moz_bookmarks (id, type, fk, parent, position, title, dateAdded, lastModified, guid)
|
||||
VALUES (%d, %d, %d, 0, 0, '%s', %d, %d, 'bm-guid-%d')`,
|
||||
id, bookmarkType, fk, title, dateAdded, dateAdded, id,
|
||||
)
|
||||
}
|
||||
|
||||
func insertMozAnno(placeID int, content string, dateAdded int64) string {
|
||||
return fmt.Sprintf(
|
||||
`INSERT INTO moz_annos (place_id, anno_attribute_id, content, dateAdded, lastModified)
|
||||
VALUES (%d, 1, '%s', %d, %d)`,
|
||||
placeID, content, dateAdded, dateAdded,
|
||||
)
|
||||
}
|
||||
|
||||
func insertWebappsstore(originKey, key, value string) string {
|
||||
return fmt.Sprintf(
|
||||
`INSERT INTO webappsstore2 (originAttributes, originKey, scope, key, value)
|
||||
VALUES ('', '%s', '', '%s', '%s')`,
|
||||
originKey, key, value,
|
||||
)
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// Test fixture builders
|
||||
// ---------------------------------------------------------------------------
|
||||
|
||||
func createTestDB(t *testing.T, name string, schemas []string, inserts ...string) string {
|
||||
t.Helper()
|
||||
path := filepath.Join(t.TempDir(), name)
|
||||
db, err := sql.Open("sqlite", path)
|
||||
require.NoError(t, err)
|
||||
defer db.Close()
|
||||
|
||||
for _, schema := range schemas {
|
||||
_, err = db.Exec(schema)
|
||||
require.NoError(t, err)
|
||||
}
|
||||
for _, stmt := range inserts {
|
||||
_, err = db.Exec(stmt)
|
||||
require.NoError(t, err)
|
||||
}
|
||||
return path
|
||||
}
|
||||
|
||||
func createTestJSON(t *testing.T, name, content string) string {
|
||||
t.Helper()
|
||||
path := filepath.Join(t.TempDir(), name)
|
||||
require.NoError(t, os.WriteFile(path, []byte(content), 0o644))
|
||||
return path
|
||||
}
|
||||
Reference in New Issue
Block a user