mirror of
https://github.com/moonD4rk/HackBrowserData.git
synced 2026-08-15 23:50:19 +02:00
refactor(browser): split installation and profile abstractions (#603)
* refactor(browser): split installation and profile abstractions A Chromium installation shares one master key across its profiles, but modeling each profile as its own Browser re-derived the key per profile. Browser now represents one installation holding its profiles and derives the key once; new types.Profile/ExtractResult/CountResult carry per-profile results. * style: gofumpt safari_test.go * test(chromium): rename shadowed loop var to path
This commit is contained in:
Roger
+53
-162
@@ -2,194 +2,85 @@ package safari
|
||||
|
||||
import (
|
||||
"os"
|
||||
"path/filepath"
|
||||
"time"
|
||||
|
||||
"github.com/moond4rk/hackbrowserdata/filemanager"
|
||||
"github.com/moond4rk/hackbrowserdata/log"
|
||||
"github.com/moond4rk/hackbrowserdata/types"
|
||||
)
|
||||
|
||||
// Browser is one Safari profile's data ready for extraction. Passwords come from the shared macOS
|
||||
// Keychain; everything else reads from the profile's directories.
|
||||
// Browser is one Safari installation, holding the default profile and any named
|
||||
// profiles. Passwords come from the shared macOS Keychain; the login password is
|
||||
// set on the installation and threaded to each profile at extract time.
|
||||
type Browser struct {
|
||||
cfg types.BrowserConfig
|
||||
profile profileContext
|
||||
keychainPassword string
|
||||
sourcePaths map[types.Category]resolvedPath
|
||||
profiles []*profile
|
||||
}
|
||||
|
||||
// SetKeychainPassword sets the macOS login password used to unlock the Keychain.
|
||||
func (b *Browser) SetKeychainPassword(password string) { b.keychainPassword = password }
|
||||
|
||||
// NewBrowsers returns one Browser per Safari profile with resolvable data. Named profiles are
|
||||
// enumerated from SafariTabs.db.
|
||||
func NewBrowsers(cfg types.BrowserConfig) ([]*Browser, error) {
|
||||
var browsers []*Browser
|
||||
// NewBrowser returns the Safari installation with one profile per Safari profile
|
||||
// that has resolvable data, or nil if none. Named profiles are enumerated from
|
||||
// SafariTabs.db.
|
||||
func NewBrowser(cfg types.BrowserConfig) (*Browser, error) {
|
||||
var profiles []*profile
|
||||
for _, p := range discoverSafariProfiles(cfg.UserDataDir) {
|
||||
paths := resolveProfilePaths(p)
|
||||
if len(paths) == 0 {
|
||||
continue
|
||||
}
|
||||
browsers = append(browsers, &Browser{
|
||||
cfg: cfg,
|
||||
profile: p,
|
||||
profiles = append(profiles, &profile{
|
||||
ctx: p,
|
||||
browserName: cfg.Name,
|
||||
sourcePaths: paths,
|
||||
})
|
||||
}
|
||||
return browsers, nil
|
||||
if len(profiles) == 0 {
|
||||
return nil, nil
|
||||
}
|
||||
return &Browser{cfg: cfg, profiles: profiles}, nil
|
||||
}
|
||||
|
||||
func (b *Browser) BrowserName() string { return b.cfg.Name }
|
||||
func (b *Browser) UserDataDir() string { return b.cfg.UserDataDir }
|
||||
|
||||
// Profiles returns the identity of every Safari profile in this installation.
|
||||
func (b *Browser) Profiles() []types.Profile {
|
||||
out := make([]types.Profile, 0, len(b.profiles))
|
||||
for _, p := range b.profiles {
|
||||
out = append(out, types.Profile{Name: p.ctx.name, Dir: p.dir()})
|
||||
}
|
||||
return out
|
||||
}
|
||||
|
||||
// Extract extracts every profile, threading the installation's keychain password.
|
||||
func (b *Browser) Extract(categories []types.Category) ([]types.ExtractResult, error) {
|
||||
results := make([]types.ExtractResult, 0, len(b.profiles))
|
||||
for _, p := range b.profiles {
|
||||
results = append(results, types.ExtractResult{
|
||||
Profile: types.Profile{Name: p.ctx.name, Dir: p.dir()},
|
||||
Data: p.extract(categories, b.keychainPassword),
|
||||
})
|
||||
}
|
||||
return results, nil
|
||||
}
|
||||
|
||||
// CountEntries counts entries per category for every profile.
|
||||
func (b *Browser) CountEntries(categories []types.Category) ([]types.CountResult, error) {
|
||||
results := make([]types.CountResult, 0, len(b.profiles))
|
||||
for _, p := range b.profiles {
|
||||
results = append(results, types.CountResult{
|
||||
Profile: types.Profile{Name: p.ctx.name, Dir: p.dir()},
|
||||
Counts: p.count(categories, b.keychainPassword),
|
||||
})
|
||||
}
|
||||
return results, nil
|
||||
}
|
||||
|
||||
func resolveProfilePaths(p profileContext) map[types.Category]resolvedPath {
|
||||
return resolveSourcePaths(buildSources(p))
|
||||
}
|
||||
|
||||
func (b *Browser) BrowserName() string { return b.cfg.Name }
|
||||
func (b *Browser) ProfileName() string { return b.profile.name }
|
||||
func (b *Browser) UserDataDir() string { return b.cfg.UserDataDir }
|
||||
|
||||
func (b *Browser) ProfileDir() string {
|
||||
if b.profile.isDefault() {
|
||||
return b.profile.legacyHome
|
||||
}
|
||||
return filepath.Join(b.profile.container, "Safari", "Profiles", b.profile.uuidUpper)
|
||||
}
|
||||
|
||||
func (b *Browser) Extract(categories []types.Category) (*types.BrowserData, error) {
|
||||
session, err := filemanager.NewSession()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
defer session.Cleanup()
|
||||
|
||||
tempPaths := b.acquireFiles(session, categories)
|
||||
|
||||
data := &types.BrowserData{}
|
||||
for _, cat := range categories {
|
||||
// Keychain is user-scope, not per-profile — attribute only to default to avoid duplicates.
|
||||
if cat == types.Password {
|
||||
if b.profile.isDefault() {
|
||||
b.extractCategory(data, cat, "")
|
||||
}
|
||||
continue
|
||||
}
|
||||
// Extension plists (AppExtensions + WebExtensions) live directly in the container
|
||||
// and are read in-place; attribute to default only until per-profile layouts are verified.
|
||||
if cat == types.Extension {
|
||||
if b.profile.isDefault() {
|
||||
b.extractCategory(data, cat, "")
|
||||
}
|
||||
continue
|
||||
}
|
||||
path, ok := tempPaths[cat]
|
||||
if !ok {
|
||||
continue
|
||||
}
|
||||
b.extractCategory(data, cat, path)
|
||||
}
|
||||
return data, nil
|
||||
}
|
||||
|
||||
func (b *Browser) CountEntries(categories []types.Category) (map[types.Category]int, error) {
|
||||
session, err := filemanager.NewSession()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
defer session.Cleanup()
|
||||
|
||||
tempPaths := b.acquireFiles(session, categories)
|
||||
|
||||
counts := make(map[types.Category]int)
|
||||
for _, cat := range categories {
|
||||
if cat == types.Password {
|
||||
if b.profile.isDefault() {
|
||||
counts[cat] = b.countCategory(cat, "")
|
||||
}
|
||||
continue
|
||||
}
|
||||
if cat == types.Extension {
|
||||
if b.profile.isDefault() {
|
||||
counts[cat] = b.countCategory(cat, "")
|
||||
}
|
||||
continue
|
||||
}
|
||||
path, ok := tempPaths[cat]
|
||||
if !ok {
|
||||
continue
|
||||
}
|
||||
counts[cat] = b.countCategory(cat, path)
|
||||
}
|
||||
return counts, nil
|
||||
}
|
||||
|
||||
func (b *Browser) acquireFiles(session *filemanager.Session, categories []types.Category) map[types.Category]string {
|
||||
tempPaths := make(map[types.Category]string)
|
||||
for _, cat := range categories {
|
||||
rp, ok := b.sourcePaths[cat]
|
||||
if !ok {
|
||||
continue
|
||||
}
|
||||
dst := filepath.Join(session.TempDir(), cat.String())
|
||||
if err := session.Acquire(rp.absPath, dst, rp.isDir); err != nil {
|
||||
log.Debugf("acquire %s: %v", cat, err)
|
||||
continue
|
||||
}
|
||||
tempPaths[cat] = dst
|
||||
}
|
||||
return tempPaths
|
||||
}
|
||||
|
||||
func (b *Browser) extractCategory(data *types.BrowserData, cat types.Category, path string) {
|
||||
var err error
|
||||
switch cat {
|
||||
case types.Password:
|
||||
data.Passwords, err = extractPasswords(b.keychainPassword)
|
||||
case types.History:
|
||||
data.Histories, err = extractHistories(path)
|
||||
case types.Cookie:
|
||||
data.Cookies, err = extractCookies(path)
|
||||
case types.Bookmark:
|
||||
data.Bookmarks, err = extractBookmarks(path)
|
||||
case types.Download:
|
||||
data.Downloads, err = extractDownloads(path, b.profile.downloadOwnerUUID())
|
||||
case types.LocalStorage:
|
||||
data.LocalStorage, err = extractLocalStorage(path)
|
||||
case types.Extension:
|
||||
data.Extensions, err = extractExtensions(b.profile.container)
|
||||
default:
|
||||
return
|
||||
}
|
||||
if err != nil {
|
||||
log.Debugf("extract %s for %s: %v", cat, b.BrowserName()+"/"+b.ProfileName(), err)
|
||||
}
|
||||
}
|
||||
|
||||
func (b *Browser) countCategory(cat types.Category, path string) int {
|
||||
var count int
|
||||
var err error
|
||||
switch cat {
|
||||
case types.Password:
|
||||
count, err = countPasswords(b.keychainPassword)
|
||||
case types.History:
|
||||
count, err = countHistories(path)
|
||||
case types.Cookie:
|
||||
count, err = countCookies(path)
|
||||
case types.Bookmark:
|
||||
count, err = countBookmarks(path)
|
||||
case types.Download:
|
||||
count, err = countDownloads(path, b.profile.downloadOwnerUUID())
|
||||
case types.LocalStorage:
|
||||
count, err = countLocalStorage(path)
|
||||
case types.Extension:
|
||||
count, err = countExtensions(b.profile.container)
|
||||
default:
|
||||
// Unsupported categories silently return 0.
|
||||
}
|
||||
if err != nil {
|
||||
log.Debugf("count %s for %s: %v", cat, b.BrowserName()+"/"+b.ProfileName(), err)
|
||||
}
|
||||
return count
|
||||
}
|
||||
|
||||
type resolvedPath struct {
|
||||
absPath string
|
||||
isDir bool
|
||||
|
||||
Reference in New Issue
Block a user