mirror of
https://github.com/moonD4rk/HackBrowserData
synced 2025-05-03 16:38:00 +00:00
e48f35cfd3
* refactor: Refactor logging to use structured slog package. - Remove `gookit` dependencies from `go.sum` - Improve error logging in multiple packages by replacing `log` with `log/slog` - Update dependencies in `go.mod` - Add new `logger` package with test cases - Refactor logging statements in multiple packages to use `slog` instead of `log` - Change logging format and level in multiple packages for better structured logging * refactor: Refactor logger package and add handler interface - Refactor logger package - Rename `defaultHandler` to `DefaultLogger` - Move `ReplaceAttr` function to `Logger` struct - Implement `LogHandler` struct with `slog.Handler` interface - Add new `Logger` methods for configuration - Add `SetMaxLevel`, `SetJSONHandler`, `SetTextHandler`, `SetOutput`, `SetVerbose`, `SetReplaceAttrFunc` - Add verbose flag to `cmd/hack-browser-data/main.go` to increase logging * refactor: Refactor logger package to use simplified handler initialization. - Refactor logger package to use Default instead of DefaultLogger - Update `NewHandler` method to correctly reference `Default` logger and simplify handler initialization - Update tests for logger to reflect changes in Default usage - Rename `DefaultLogger` to `Default` and update comments to better reflect its purpose - Update function calls in hack-browser-data main.go to reflect logger package updates * refactor: Refactor logging in Chromium implementation Refactor logging and simplify decryption in chromium files - Replace logger package import with shared slog package - Change logging messages to use slog instead of logger - Simplify decryption process by removing first 5 characters of encrypted key - Refactor error logging in linux file to use shared slog package - Replace string concatenation with formatted string in linux error message
77 lines
1.8 KiB
Go
77 lines
1.8 KiB
Go
//go:build linux
|
|
|
|
package chromium
|
|
|
|
import (
|
|
"crypto/sha1"
|
|
"fmt"
|
|
"log/slog"
|
|
"os"
|
|
|
|
"github.com/godbus/dbus/v5"
|
|
keyring "github.com/ppacher/go-dbus-keyring"
|
|
"golang.org/x/crypto/pbkdf2"
|
|
|
|
"github.com/moond4rk/hackbrowserdata/item"
|
|
)
|
|
|
|
func (c *Chromium) GetMasterKey() ([]byte, error) {
|
|
// what is d-bus @https://dbus.freedesktop.org/
|
|
// don't need chromium key file for Linux
|
|
defer os.Remove(item.ChromiumKey.TempFilename())
|
|
|
|
conn, err := dbus.SessionBus()
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
svc, err := keyring.GetSecretService(conn)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
session, err := svc.OpenSession()
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
defer func() {
|
|
if err := session.Close(); err != nil {
|
|
slog.Error("close dbus session error", "err", err.Error())
|
|
}
|
|
}()
|
|
collections, err := svc.GetAllCollections()
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
var secret []byte
|
|
for _, col := range collections {
|
|
items, err := col.GetAllItems()
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
for _, i := range items {
|
|
label, err := i.GetLabel()
|
|
if err != nil {
|
|
slog.Warn("get label from dbus", "err", err.Error())
|
|
continue
|
|
}
|
|
if label == c.storage {
|
|
se, err := i.GetSecret(session.Path())
|
|
if err != nil {
|
|
return nil, fmt.Errorf("get storage from dbus error: %v" + err.Error())
|
|
}
|
|
secret = se.Value
|
|
}
|
|
}
|
|
}
|
|
|
|
if len(secret) == 0 {
|
|
// set default secret @https://source.chromium.org/chromium/chromium/src/+/main:components/os_crypt/os_crypt_linux.cc;l=100
|
|
secret = []byte("peanuts")
|
|
}
|
|
salt := []byte("saltysalt")
|
|
// @https://source.chromium.org/chromium/chromium/src/+/master:components/os_crypt/os_crypt_linux.cc
|
|
key := pbkdf2.Key(secret, salt, 1, 16, sha1.New)
|
|
c.masterKey = key
|
|
slog.Info("get master key success", "browser", c.name)
|
|
return key, nil
|
|
}
|