mirror of
https://github.com/moonD4rk/HackBrowserData.git
synced 2026-05-19 18:58:03 +02:00
feat: refactor logger to standard library (#280)
* 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
This commit is contained in:
@@ -2,12 +2,12 @@ package chromium
|
||||
|
||||
import (
|
||||
"io/fs"
|
||||
"log/slog"
|
||||
"path/filepath"
|
||||
"strings"
|
||||
|
||||
"github.com/moond4rk/hackbrowserdata/browsingdata"
|
||||
"github.com/moond4rk/hackbrowserdata/item"
|
||||
"github.com/moond4rk/hackbrowserdata/log"
|
||||
"github.com/moond4rk/hackbrowserdata/utils/fileutil"
|
||||
"github.com/moond4rk/hackbrowserdata/utils/typeutil"
|
||||
)
|
||||
@@ -90,7 +90,7 @@ func (c *Chromium) copyItemToLocal() error {
|
||||
err = fileutil.CopyFile(path, filename)
|
||||
}
|
||||
if err != nil {
|
||||
log.Errorf("copy %s to %s error: %v", path, filename, err)
|
||||
slog.Error("copy item to local error", "path", path, "filename", filename, "err", err)
|
||||
continue
|
||||
}
|
||||
}
|
||||
|
||||
@@ -7,6 +7,7 @@ import (
|
||||
"crypto/sha1"
|
||||
"errors"
|
||||
"fmt"
|
||||
"log/slog"
|
||||
"os"
|
||||
"os/exec"
|
||||
"strings"
|
||||
@@ -14,7 +15,6 @@ import (
|
||||
"golang.org/x/crypto/pbkdf2"
|
||||
|
||||
"github.com/moond4rk/hackbrowserdata/item"
|
||||
"github.com/moond4rk/hackbrowserdata/log"
|
||||
)
|
||||
|
||||
var (
|
||||
@@ -55,6 +55,6 @@ func (c *Chromium) GetMasterKey() ([]byte, error) {
|
||||
return nil, errWrongSecurityCommand
|
||||
}
|
||||
c.masterKey = key
|
||||
log.Infof("%s initialized master key success", c.name)
|
||||
slog.Info("get master key success", "browser", c.name)
|
||||
return key, nil
|
||||
}
|
||||
|
||||
@@ -5,6 +5,7 @@ package chromium
|
||||
import (
|
||||
"crypto/sha1"
|
||||
"fmt"
|
||||
"log/slog"
|
||||
"os"
|
||||
|
||||
"github.com/godbus/dbus/v5"
|
||||
@@ -12,7 +13,6 @@ import (
|
||||
"golang.org/x/crypto/pbkdf2"
|
||||
|
||||
"github.com/moond4rk/hackbrowserdata/item"
|
||||
"github.com/moond4rk/hackbrowserdata/log"
|
||||
)
|
||||
|
||||
func (c *Chromium) GetMasterKey() ([]byte, error) {
|
||||
@@ -34,7 +34,7 @@ func (c *Chromium) GetMasterKey() ([]byte, error) {
|
||||
}
|
||||
defer func() {
|
||||
if err := session.Close(); err != nil {
|
||||
log.Errorf("close session failed: %v", err)
|
||||
slog.Error("close dbus session error", "err", err.Error())
|
||||
}
|
||||
}()
|
||||
collections, err := svc.GetAllCollections()
|
||||
@@ -50,7 +50,7 @@ func (c *Chromium) GetMasterKey() ([]byte, error) {
|
||||
for _, i := range items {
|
||||
label, err := i.GetLabel()
|
||||
if err != nil {
|
||||
log.Error(err)
|
||||
slog.Warn("get label from dbus", "err", err.Error())
|
||||
continue
|
||||
}
|
||||
if label == c.storage {
|
||||
@@ -71,6 +71,6 @@ func (c *Chromium) GetMasterKey() ([]byte, error) {
|
||||
// @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
|
||||
log.Infof("%s initialized master key success", c.name)
|
||||
slog.Info("get master key success", "browser", c.name)
|
||||
return key, nil
|
||||
}
|
||||
|
||||
@@ -5,13 +5,13 @@ package chromium
|
||||
import (
|
||||
"encoding/base64"
|
||||
"errors"
|
||||
"log/slog"
|
||||
"os"
|
||||
|
||||
"github.com/tidwall/gjson"
|
||||
|
||||
"github.com/moond4rk/hackbrowserdata/crypto"
|
||||
"github.com/moond4rk/hackbrowserdata/item"
|
||||
"github.com/moond4rk/hackbrowserdata/log"
|
||||
"github.com/moond4rk/hackbrowserdata/utils/fileutil"
|
||||
)
|
||||
|
||||
@@ -35,9 +35,9 @@ func (c *Chromium) GetMasterKey() ([]byte, error) {
|
||||
}
|
||||
c.masterKey, err = crypto.DPAPI(key[5:])
|
||||
if err != nil {
|
||||
log.Errorf("%s failed to decrypt master key, maybe this profile was created on a different OS installation", c.name)
|
||||
slog.Error("decrypt master key failed", "err", err)
|
||||
return nil, err
|
||||
}
|
||||
log.Infof("%s initialized master key success", c.name)
|
||||
slog.Info("get master key success", "browser", c.name)
|
||||
return c.masterKey, nil
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user