mirror of
https://github.com/moonD4rk/HackBrowserData.git
synced 2026-08-07 23:18:34 +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:
@@ -0,0 +1,165 @@
|
||||
package safari
|
||||
|
||||
import (
|
||||
"path/filepath"
|
||||
|
||||
"github.com/moond4rk/hackbrowserdata/filemanager"
|
||||
"github.com/moond4rk/hackbrowserdata/log"
|
||||
"github.com/moond4rk/hackbrowserdata/types"
|
||||
)
|
||||
|
||||
// profile is one Safari profile — the leaf extraction unit. Passwords come from
|
||||
// the shared macOS Keychain; everything else reads from the profile's directories.
|
||||
type profile struct {
|
||||
ctx profileContext
|
||||
browserName string
|
||||
sourcePaths map[types.Category]resolvedPath
|
||||
}
|
||||
|
||||
func (p *profile) name() string { return p.ctx.name }
|
||||
func (p *profile) label() string { return p.browserName + "/" + p.name() }
|
||||
|
||||
func (p *profile) dir() string {
|
||||
if p.ctx.isDefault() {
|
||||
return p.ctx.legacyHome
|
||||
}
|
||||
return filepath.Join(p.ctx.container, "Safari", "Profiles", p.ctx.uuidUpper)
|
||||
}
|
||||
|
||||
func (p *profile) extract(categories []types.Category, keychainPassword string) *types.BrowserData {
|
||||
session, err := filemanager.NewSession()
|
||||
if err != nil {
|
||||
log.Debugf("new session for %s: %v", p.label(), err)
|
||||
return &types.BrowserData{}
|
||||
}
|
||||
defer session.Cleanup()
|
||||
|
||||
tempPaths := p.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 p.ctx.isDefault() {
|
||||
p.extractCategory(data, cat, "", keychainPassword)
|
||||
}
|
||||
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 p.ctx.isDefault() {
|
||||
p.extractCategory(data, cat, "", keychainPassword)
|
||||
}
|
||||
continue
|
||||
}
|
||||
path, ok := tempPaths[cat]
|
||||
if !ok {
|
||||
continue
|
||||
}
|
||||
p.extractCategory(data, cat, path, keychainPassword)
|
||||
}
|
||||
return data
|
||||
}
|
||||
|
||||
func (p *profile) count(categories []types.Category, keychainPassword string) map[types.Category]int {
|
||||
session, err := filemanager.NewSession()
|
||||
if err != nil {
|
||||
log.Debugf("new session for %s: %v", p.label(), err)
|
||||
return nil
|
||||
}
|
||||
defer session.Cleanup()
|
||||
|
||||
tempPaths := p.acquireFiles(session, categories)
|
||||
|
||||
counts := make(map[types.Category]int)
|
||||
for _, cat := range categories {
|
||||
if cat == types.Password {
|
||||
if p.ctx.isDefault() {
|
||||
counts[cat] = p.countCategory(cat, "", keychainPassword)
|
||||
}
|
||||
continue
|
||||
}
|
||||
if cat == types.Extension {
|
||||
if p.ctx.isDefault() {
|
||||
counts[cat] = p.countCategory(cat, "", keychainPassword)
|
||||
}
|
||||
continue
|
||||
}
|
||||
path, ok := tempPaths[cat]
|
||||
if !ok {
|
||||
continue
|
||||
}
|
||||
counts[cat] = p.countCategory(cat, path, keychainPassword)
|
||||
}
|
||||
return counts
|
||||
}
|
||||
|
||||
func (p *profile) acquireFiles(session *filemanager.Session, categories []types.Category) map[types.Category]string {
|
||||
tempPaths := make(map[types.Category]string)
|
||||
for _, cat := range categories {
|
||||
rp, ok := p.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 (p *profile) extractCategory(data *types.BrowserData, cat types.Category, path, keychainPassword string) {
|
||||
var err error
|
||||
switch cat {
|
||||
case types.Password:
|
||||
data.Passwords, err = extractPasswords(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, p.ctx.downloadOwnerUUID())
|
||||
case types.LocalStorage:
|
||||
data.LocalStorage, err = extractLocalStorage(path)
|
||||
case types.Extension:
|
||||
data.Extensions, err = extractExtensions(p.ctx.container)
|
||||
default:
|
||||
return
|
||||
}
|
||||
if err != nil {
|
||||
log.Debugf("extract %s for %s: %v", cat, p.label(), err)
|
||||
}
|
||||
}
|
||||
|
||||
func (p *profile) countCategory(cat types.Category, path, keychainPassword string) int {
|
||||
var count int
|
||||
var err error
|
||||
switch cat {
|
||||
case types.Password:
|
||||
count, err = countPasswords(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, p.ctx.downloadOwnerUUID())
|
||||
case types.LocalStorage:
|
||||
count, err = countLocalStorage(path)
|
||||
case types.Extension:
|
||||
count, err = countExtensions(p.ctx.container)
|
||||
default:
|
||||
// Unsupported categories silently return 0.
|
||||
}
|
||||
if err != nil {
|
||||
log.Debugf("count %s for %s: %v", cat, p.label(), err)
|
||||
}
|
||||
return count
|
||||
}
|
||||
Reference in New Issue
Block a user