mirror of
https://github.com/moonD4rk/HackBrowserData.git
synced 2026-06-02 19:41:36 +02:00
chore: downgrade golang version to 1.20, support Windows 7. (#435)
* chore: downgrade golang version to 1.20, support windows 7 * chore: Update dependencies for Go project. - Update dependencies in go.sum - Improvements and optimizations in various files - Bug fixes and error handling enhancements * chore: Update modernc.org/sqlite library versions in go.mod and go.sum files - Update version of `modernc.org/sqlite` to `v1.31.1` in `go.mod` and `go.sum` files - Update module hash in `go.sum` file for `modernc.org/sqlite` - Ensure consistency between `go.mod` and `go.sum` files in relation to `modernc.org/sqlite` version * chore: replace log/slog with standard logger (#436) * chore: replace log/slog with standard logger * chore: Update Go dependencies and versions - Update Go version from `1.22.5` to `1.20` and other dependencies - Update critical dependencies to latest versions - Ensure compatibility with new versions of dependencies * chore: Optimize dependency management in workflows - Update build and lint workflows to use `go mod tidy` for getting dependencies - Change modules download mode to `'mod'` in linters configuration - Add step to get dependencies in lint workflow * refactor: Update dependencies and refactor Chromium key deletion logic - Update `modernc.org/sqlite` to `v1.31.1` in `go.mod` and `go.sum` - Increase version number to `0.5.0` in `cmd/hack-browser-data/main.go` - Refactor and update logic for filtering and copying items in `browser/chromium/chromium.go` * Improve logging functionality and data type conversion - Add `String()` method to `DataType` enum in types.go - Update log level to Debug in logger_test.go - Set log level to Debug in `TestLoggerDebug` and `TestLoggerDebugf` functions
This commit is contained in:
@@ -2,13 +2,12 @@ package chromium
|
||||
|
||||
import (
|
||||
"io/fs"
|
||||
"log/slog"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"slices"
|
||||
"strings"
|
||||
|
||||
"github.com/moond4rk/hackbrowserdata/browserdata"
|
||||
"github.com/moond4rk/hackbrowserdata/log"
|
||||
"github.com/moond4rk/hackbrowserdata/types"
|
||||
"github.com/moond4rk/hackbrowserdata/utils/fileutil"
|
||||
"github.com/moond4rk/hackbrowserdata/utils/typeutil"
|
||||
@@ -53,9 +52,12 @@ func (c *Chromium) Name() string {
|
||||
|
||||
func (c *Chromium) BrowsingData(isFullExport bool) (*browserdata.BrowserData, error) {
|
||||
// delete chromiumKey from dataTypes, doesn't need to export key
|
||||
dataTypes := slices.DeleteFunc(c.dataTypes, func(i types.DataType) bool {
|
||||
return i == types.ChromiumKey
|
||||
})
|
||||
var dataTypes []types.DataType
|
||||
for _, dt := range c.dataTypes {
|
||||
if dt != types.ChromiumKey {
|
||||
dataTypes = append(dataTypes, dt)
|
||||
}
|
||||
}
|
||||
|
||||
if !isFullExport {
|
||||
dataTypes = types.FilterSensitiveItems(c.dataTypes)
|
||||
@@ -96,7 +98,7 @@ func (c *Chromium) copyItemToLocal() error {
|
||||
err = fileutil.CopyFile(path, filename)
|
||||
}
|
||||
if err != nil {
|
||||
slog.Error("copy item to local error", "path", path, "filename", filename, "err", err)
|
||||
log.Errorf("copy item to local, path %s, filename %s err %v", path, filename, err)
|
||||
continue
|
||||
}
|
||||
}
|
||||
@@ -139,7 +141,7 @@ func chromiumWalkFunc(items []types.DataType, multiItemPaths map[string]map[type
|
||||
return func(path string, info fs.FileInfo, err error) error {
|
||||
if err != nil {
|
||||
if os.IsPermission(err) {
|
||||
slog.Warn("skipping walk chromium path permission error", "path", path, "err", err)
|
||||
log.Warnf("skipping walk chromium path permission error, path %s, err %v", path, err)
|
||||
return nil
|
||||
}
|
||||
return err
|
||||
|
||||
@@ -7,12 +7,12 @@ import (
|
||||
"crypto/sha1"
|
||||
"errors"
|
||||
"fmt"
|
||||
"log/slog"
|
||||
"os"
|
||||
"os/exec"
|
||||
"strings"
|
||||
|
||||
"github.com/moond4rk/hackbrowserdata/crypto"
|
||||
"github.com/moond4rk/hackbrowserdata/log"
|
||||
"github.com/moond4rk/hackbrowserdata/types"
|
||||
)
|
||||
|
||||
@@ -54,6 +54,6 @@ func (c *Chromium) GetMasterKey() ([]byte, error) {
|
||||
return nil, errWrongSecurityCommand
|
||||
}
|
||||
c.masterKey = key
|
||||
slog.Info("get master key success", "browser", c.name)
|
||||
log.Debugf("get master key success, browser %s", c.name)
|
||||
return key, nil
|
||||
}
|
||||
|
||||
@@ -5,13 +5,13 @@ package chromium
|
||||
import (
|
||||
"crypto/sha1"
|
||||
"fmt"
|
||||
"log/slog"
|
||||
"os"
|
||||
|
||||
"github.com/godbus/dbus/v5"
|
||||
keyring "github.com/ppacher/go-dbus-keyring"
|
||||
|
||||
"github.com/moond4rk/hackbrowserdata/crypto"
|
||||
"github.com/moond4rk/hackbrowserdata/log"
|
||||
"github.com/moond4rk/hackbrowserdata/types"
|
||||
)
|
||||
|
||||
@@ -34,7 +34,7 @@ func (c *Chromium) GetMasterKey() ([]byte, error) {
|
||||
}
|
||||
defer func() {
|
||||
if err := session.Close(); err != nil {
|
||||
slog.Error("close dbus session error", "err", err.Error())
|
||||
log.Errorf("close dbus session error: %v", err)
|
||||
}
|
||||
}()
|
||||
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 {
|
||||
slog.Warn("get label from dbus", "err", err.Error())
|
||||
log.Warnf("get label from dbus: %v", err)
|
||||
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 := crypto.PBKDF2Key(secret, salt, 1, 16, sha1.New)
|
||||
c.masterKey = key
|
||||
slog.Info("get master key success", "browser", c.name)
|
||||
log.Debugf("get master key success, browser %s", c.name)
|
||||
return key, nil
|
||||
}
|
||||
|
||||
@@ -5,12 +5,12 @@ package chromium
|
||||
import (
|
||||
"encoding/base64"
|
||||
"errors"
|
||||
"log/slog"
|
||||
"os"
|
||||
|
||||
"github.com/tidwall/gjson"
|
||||
|
||||
"github.com/moond4rk/hackbrowserdata/crypto"
|
||||
"github.com/moond4rk/hackbrowserdata/log"
|
||||
"github.com/moond4rk/hackbrowserdata/types"
|
||||
"github.com/moond4rk/hackbrowserdata/utils/fileutil"
|
||||
)
|
||||
@@ -35,9 +35,9 @@ func (c *Chromium) GetMasterKey() ([]byte, error) {
|
||||
}
|
||||
c.masterKey, err = crypto.DecryptWithDPAPI(key[5:])
|
||||
if err != nil {
|
||||
slog.Error("decrypt master key failed", "err", err)
|
||||
log.Errorf("decrypt master key failed, err %v", err)
|
||||
return nil, err
|
||||
}
|
||||
slog.Info("get master key success", "browser", c.name)
|
||||
log.Debugf("get master key success, browser %s", c.name)
|
||||
return c.masterKey, nil
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user