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,6 +2,7 @@ package bookmark
|
||||
|
||||
import (
|
||||
"database/sql"
|
||||
"log/slog"
|
||||
"os"
|
||||
"sort"
|
||||
"time"
|
||||
@@ -11,7 +12,6 @@ import (
|
||||
"github.com/tidwall/gjson"
|
||||
|
||||
"github.com/moond4rk/hackbrowserdata/item"
|
||||
"github.com/moond4rk/hackbrowserdata/log"
|
||||
"github.com/moond4rk/hackbrowserdata/utils/fileutil"
|
||||
"github.com/moond4rk/hackbrowserdata/utils/typeutil"
|
||||
)
|
||||
@@ -102,7 +102,7 @@ func (f *FirefoxBookmark) Parse(_ []byte) error {
|
||||
defer db.Close()
|
||||
_, err = db.Exec(closeJournalMode)
|
||||
if err != nil {
|
||||
log.Error(err)
|
||||
slog.Error("close journal mode error", "err", err)
|
||||
}
|
||||
rows, err := db.Query(queryFirefoxBookMark)
|
||||
if err != nil {
|
||||
@@ -115,7 +115,7 @@ func (f *FirefoxBookmark) Parse(_ []byte) error {
|
||||
title, url string
|
||||
)
|
||||
if err = rows.Scan(&id, &url, &bt, &dateAdded, &title); err != nil {
|
||||
log.Warn(err)
|
||||
slog.Error("scan bookmark error", "err", err)
|
||||
}
|
||||
*f = append(*f, bookmark{
|
||||
ID: id,
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package browsingdata
|
||||
|
||||
import (
|
||||
"path"
|
||||
"log/slog"
|
||||
|
||||
"github.com/moond4rk/hackbrowserdata/browsingdata/bookmark"
|
||||
"github.com/moond4rk/hackbrowserdata/browsingdata/cookie"
|
||||
@@ -13,7 +13,6 @@ import (
|
||||
"github.com/moond4rk/hackbrowserdata/browsingdata/password"
|
||||
"github.com/moond4rk/hackbrowserdata/browsingdata/sessionstorage"
|
||||
"github.com/moond4rk/hackbrowserdata/item"
|
||||
"github.com/moond4rk/hackbrowserdata/log"
|
||||
"github.com/moond4rk/hackbrowserdata/utils/fileutil"
|
||||
)
|
||||
|
||||
@@ -40,7 +39,7 @@ func New(items []item.Item) *Data {
|
||||
func (d *Data) Recovery(masterKey []byte) error {
|
||||
for _, source := range d.sources {
|
||||
if err := source.Parse(masterKey); err != nil {
|
||||
log.Errorf("parse %s error %s", source.Name(), err.Error())
|
||||
slog.Error("parse error", "source_data", source.Name(), "err", err.Error())
|
||||
continue
|
||||
}
|
||||
}
|
||||
@@ -59,18 +58,18 @@ func (d *Data) Output(dir, browserName, flag string) {
|
||||
|
||||
f, err := output.CreateFile(dir, filename)
|
||||
if err != nil {
|
||||
log.Errorf("create file %s error %s", filename, err.Error())
|
||||
slog.Error("create file error", "filename", filename, "err", err.Error())
|
||||
continue
|
||||
}
|
||||
if err := output.Write(source, f); err != nil {
|
||||
log.Errorf("write to file %s error %s", filename, err.Error())
|
||||
slog.Error("write to file error", "filename", filename, "err", err.Error())
|
||||
continue
|
||||
}
|
||||
if err := f.Close(); err != nil {
|
||||
log.Errorf("close file %s error %s", filename, err.Error())
|
||||
slog.Error("close file error", "filename", filename, "err", err.Error())
|
||||
continue
|
||||
}
|
||||
log.Noticef("output to file %s success", path.Join(dir, filename))
|
||||
slog.Warn("export success", "filename", filename)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -2,6 +2,7 @@ package cookie
|
||||
|
||||
import (
|
||||
"database/sql"
|
||||
"log/slog"
|
||||
"os"
|
||||
"sort"
|
||||
"time"
|
||||
@@ -11,7 +12,6 @@ import (
|
||||
|
||||
"github.com/moond4rk/hackbrowserdata/crypto"
|
||||
"github.com/moond4rk/hackbrowserdata/item"
|
||||
"github.com/moond4rk/hackbrowserdata/log"
|
||||
"github.com/moond4rk/hackbrowserdata/utils/typeutil"
|
||||
)
|
||||
|
||||
@@ -55,7 +55,7 @@ func (c *ChromiumCookie) Parse(masterKey []byte) error {
|
||||
value, encryptValue []byte
|
||||
)
|
||||
if err = rows.Scan(&key, &encryptValue, &host, &path, &createDate, &expireDate, &isSecure, &isHTTPOnly, &hasExpire, &isPersistent); err != nil {
|
||||
log.Warn(err)
|
||||
slog.Error("scan chromium cookie error", "err", err)
|
||||
}
|
||||
|
||||
cookie := cookie{
|
||||
@@ -77,7 +77,7 @@ func (c *ChromiumCookie) Parse(masterKey []byte) error {
|
||||
value, err = crypto.DecryptPass(masterKey, encryptValue)
|
||||
}
|
||||
if err != nil {
|
||||
log.Error(err)
|
||||
slog.Error("decrypt chromium cookie error", "err", err)
|
||||
}
|
||||
}
|
||||
cookie.Value = string(value)
|
||||
@@ -123,7 +123,7 @@ func (f *FirefoxCookie) Parse(_ []byte) error {
|
||||
creationTime, expiry int64
|
||||
)
|
||||
if err = rows.Scan(&name, &value, &host, &path, &creationTime, &expiry, &isSecure, &isHTTPOnly); err != nil {
|
||||
log.Warn(err)
|
||||
slog.Error("scan firefox cookie error", "err", err)
|
||||
}
|
||||
*f = append(*f, cookie{
|
||||
KeyName: name,
|
||||
|
||||
@@ -2,6 +2,7 @@ package creditcard
|
||||
|
||||
import (
|
||||
"database/sql"
|
||||
"log/slog"
|
||||
"os"
|
||||
|
||||
// import sqlite3 driver
|
||||
@@ -9,7 +10,6 @@ import (
|
||||
|
||||
"github.com/moond4rk/hackbrowserdata/crypto"
|
||||
"github.com/moond4rk/hackbrowserdata/item"
|
||||
"github.com/moond4rk/hackbrowserdata/log"
|
||||
)
|
||||
|
||||
type ChromiumCreditCard []card
|
||||
@@ -47,7 +47,7 @@ func (c *ChromiumCreditCard) Parse(masterKey []byte) error {
|
||||
value, encryptValue []byte
|
||||
)
|
||||
if err := rows.Scan(&guid, &name, &month, &year, &encryptValue, &address, &nickname); err != nil {
|
||||
log.Warn(err)
|
||||
slog.Error("scan chromium credit card error", "err", err)
|
||||
}
|
||||
ccInfo := card{
|
||||
GUID: guid,
|
||||
@@ -64,7 +64,7 @@ func (c *ChromiumCreditCard) Parse(masterKey []byte) error {
|
||||
value, err = crypto.DecryptPass(masterKey, encryptValue)
|
||||
}
|
||||
if err != nil {
|
||||
log.Error(err)
|
||||
slog.Error("decrypt chromium credit card error", "err", err)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -102,7 +102,7 @@ func (c *YandexCreditCard) Parse(masterKey []byte) error {
|
||||
value, encryptValue []byte
|
||||
)
|
||||
if err := rows.Scan(&guid, &name, &month, &year, &encryptValue, &address, &nickname); err != nil {
|
||||
log.Warn(err)
|
||||
slog.Error("scan chromium credit card error", "err", err)
|
||||
}
|
||||
ccInfo := card{
|
||||
GUID: guid,
|
||||
@@ -119,7 +119,7 @@ func (c *YandexCreditCard) Parse(masterKey []byte) error {
|
||||
value, err = crypto.DecryptPass(masterKey, encryptValue)
|
||||
}
|
||||
if err != nil {
|
||||
log.Error(err)
|
||||
slog.Error("decrypt chromium credit card error", "err", err)
|
||||
}
|
||||
}
|
||||
ccInfo.CardNumber = string(value)
|
||||
|
||||
@@ -2,6 +2,7 @@ package download
|
||||
|
||||
import (
|
||||
"database/sql"
|
||||
"log/slog"
|
||||
"os"
|
||||
"sort"
|
||||
"strings"
|
||||
@@ -12,7 +13,6 @@ import (
|
||||
"github.com/tidwall/gjson"
|
||||
|
||||
"github.com/moond4rk/hackbrowserdata/item"
|
||||
"github.com/moond4rk/hackbrowserdata/log"
|
||||
"github.com/moond4rk/hackbrowserdata/utils/typeutil"
|
||||
)
|
||||
|
||||
@@ -49,7 +49,7 @@ func (c *ChromiumDownload) Parse(_ []byte) error {
|
||||
totalBytes, startTime, endTime int64
|
||||
)
|
||||
if err := rows.Scan(&targetPath, &tabURL, &totalBytes, &startTime, &endTime, &mimeType); err != nil {
|
||||
log.Warn(err)
|
||||
slog.Warn("scan chromium download error", "err", err)
|
||||
}
|
||||
data := download{
|
||||
TargetPath: targetPath,
|
||||
@@ -92,7 +92,7 @@ func (f *FirefoxDownload) Parse(_ []byte) error {
|
||||
|
||||
_, err = db.Exec(closeJournalMode)
|
||||
if err != nil {
|
||||
log.Error(err)
|
||||
slog.Error("close journal mode error", "err", err)
|
||||
}
|
||||
rows, err := db.Query(queryFirefoxDownload)
|
||||
if err != nil {
|
||||
@@ -105,7 +105,7 @@ func (f *FirefoxDownload) Parse(_ []byte) error {
|
||||
placeID, dateAdded int64
|
||||
)
|
||||
if err = rows.Scan(&placeID, &content, &url, &dateAdded); err != nil {
|
||||
log.Warn(err)
|
||||
slog.Warn("scan firefox download error", "err", err)
|
||||
}
|
||||
contentList := strings.Split(content, ",{")
|
||||
if len(contentList) > 1 {
|
||||
|
||||
@@ -2,6 +2,7 @@ package history
|
||||
|
||||
import (
|
||||
"database/sql"
|
||||
"log/slog"
|
||||
"os"
|
||||
"sort"
|
||||
"time"
|
||||
@@ -10,7 +11,6 @@ import (
|
||||
_ "github.com/mattn/go-sqlite3"
|
||||
|
||||
"github.com/moond4rk/hackbrowserdata/item"
|
||||
"github.com/moond4rk/hackbrowserdata/log"
|
||||
"github.com/moond4rk/hackbrowserdata/utils/typeutil"
|
||||
)
|
||||
|
||||
@@ -47,7 +47,7 @@ func (c *ChromiumHistory) Parse(_ []byte) error {
|
||||
lastVisitTime int64
|
||||
)
|
||||
if err := rows.Scan(&url, &title, &visitCount, &lastVisitTime); err != nil {
|
||||
log.Warn(err)
|
||||
slog.Warn("scan chromium history error", "err", err)
|
||||
}
|
||||
data := history{
|
||||
URL: url,
|
||||
@@ -103,7 +103,7 @@ func (f *FirefoxHistory) Parse(_ []byte) error {
|
||||
visitCount int
|
||||
)
|
||||
if err = rows.Scan(&id, &url, &visitDate, &title, &visitCount); err != nil {
|
||||
log.Warn(err)
|
||||
slog.Error("scan firefox history error", "err", err)
|
||||
}
|
||||
*f = append(*f, history{
|
||||
Title: title,
|
||||
|
||||
@@ -4,6 +4,7 @@ import (
|
||||
"bytes"
|
||||
"database/sql"
|
||||
"fmt"
|
||||
"log/slog"
|
||||
"os"
|
||||
"strings"
|
||||
|
||||
@@ -12,7 +13,6 @@ import (
|
||||
"golang.org/x/text/transform"
|
||||
|
||||
"github.com/moond4rk/hackbrowserdata/item"
|
||||
"github.com/moond4rk/hackbrowserdata/log"
|
||||
"github.com/moond4rk/hackbrowserdata/utils/byteutil"
|
||||
"github.com/moond4rk/hackbrowserdata/utils/typeutil"
|
||||
)
|
||||
@@ -115,7 +115,7 @@ func (f *FirefoxLocalStorage) Parse(_ []byte) error {
|
||||
|
||||
_, err = db.Exec(closeJournalMode)
|
||||
if err != nil {
|
||||
log.Error(err)
|
||||
slog.Error("close journal mode error", "err", err)
|
||||
}
|
||||
rows, err := db.Query(queryLocalStorage)
|
||||
if err != nil {
|
||||
@@ -125,7 +125,7 @@ func (f *FirefoxLocalStorage) Parse(_ []byte) error {
|
||||
for rows.Next() {
|
||||
var originKey, key, value string
|
||||
if err = rows.Scan(&originKey, &key, &value); err != nil {
|
||||
log.Warn(err)
|
||||
slog.Error("scan firefox local storage error", "err", err)
|
||||
}
|
||||
s := new(storage)
|
||||
s.fillFirefox(originKey, key, value)
|
||||
|
||||
@@ -4,6 +4,7 @@ import (
|
||||
"bytes"
|
||||
"database/sql"
|
||||
"encoding/base64"
|
||||
"log/slog"
|
||||
"os"
|
||||
"sort"
|
||||
"time"
|
||||
@@ -14,7 +15,6 @@ import (
|
||||
|
||||
"github.com/moond4rk/hackbrowserdata/crypto"
|
||||
"github.com/moond4rk/hackbrowserdata/item"
|
||||
"github.com/moond4rk/hackbrowserdata/log"
|
||||
"github.com/moond4rk/hackbrowserdata/utils/typeutil"
|
||||
)
|
||||
|
||||
@@ -54,7 +54,7 @@ func (c *ChromiumPassword) Parse(masterKey []byte) error {
|
||||
create int64
|
||||
)
|
||||
if err := rows.Scan(&url, &username, &pwd, &create); err != nil {
|
||||
log.Warn(err)
|
||||
slog.Error("scan chromium password error", "err", err)
|
||||
}
|
||||
login := loginData{
|
||||
UserName: username,
|
||||
@@ -68,7 +68,7 @@ func (c *ChromiumPassword) Parse(masterKey []byte) error {
|
||||
password, err = crypto.DecryptPass(masterKey, pwd)
|
||||
}
|
||||
if err != nil {
|
||||
log.Error(err)
|
||||
slog.Error("decrypt chromium password error", "err", err)
|
||||
}
|
||||
}
|
||||
if create > time.Now().Unix() {
|
||||
@@ -121,7 +121,7 @@ func (c *YandexPassword) Parse(masterKey []byte) error {
|
||||
create int64
|
||||
)
|
||||
if err := rows.Scan(&url, &username, &pwd, &create); err != nil {
|
||||
log.Warn(err)
|
||||
slog.Error("scan yandex password error", "err", err)
|
||||
}
|
||||
login := loginData{
|
||||
UserName: username,
|
||||
@@ -136,7 +136,7 @@ func (c *YandexPassword) Parse(masterKey []byte) error {
|
||||
password, err = crypto.DecryptPass(masterKey, pwd)
|
||||
}
|
||||
if err != nil {
|
||||
log.Errorf("decrypt yandex password error %s", err)
|
||||
slog.Error("decrypt yandex password error", "err", err)
|
||||
}
|
||||
}
|
||||
if create > time.Now().Unix() {
|
||||
|
||||
@@ -4,6 +4,7 @@ import (
|
||||
"bytes"
|
||||
"database/sql"
|
||||
"fmt"
|
||||
"log/slog"
|
||||
"os"
|
||||
"strings"
|
||||
|
||||
@@ -12,7 +13,6 @@ import (
|
||||
"golang.org/x/text/transform"
|
||||
|
||||
"github.com/moond4rk/hackbrowserdata/item"
|
||||
"github.com/moond4rk/hackbrowserdata/log"
|
||||
"github.com/moond4rk/hackbrowserdata/utils/byteutil"
|
||||
"github.com/moond4rk/hackbrowserdata/utils/typeutil"
|
||||
)
|
||||
@@ -123,7 +123,7 @@ func (f *FirefoxSessionStorage) Parse(_ []byte) error {
|
||||
|
||||
_, err = db.Exec(closeJournalMode)
|
||||
if err != nil {
|
||||
log.Error(err)
|
||||
slog.Error("close journal mode error", "err", err)
|
||||
}
|
||||
rows, err := db.Query(querySessionStorage)
|
||||
if err != nil {
|
||||
@@ -133,7 +133,7 @@ func (f *FirefoxSessionStorage) Parse(_ []byte) error {
|
||||
for rows.Next() {
|
||||
var originKey, key, value string
|
||||
if err = rows.Scan(&originKey, &key, &value); err != nil {
|
||||
log.Warn(err)
|
||||
slog.Error("scan session storage error", "err", err)
|
||||
}
|
||||
s := new(session)
|
||||
s.fillFirefox(originKey, key, value)
|
||||
|
||||
Reference in New Issue
Block a user