CalvinBackup/HackBrowserData
1
0
Fork 0
mirror of https://github.com/moonD4rk/HackBrowserData.git synced 2026-05-19 18:58:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

chore: downgrade golang version to 1.20, support Windows 7. (#435)

Browse Source 
* 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:
ᴍᴏᴏɴD4ʀᴋ
2024-10-22 11:13:06 +08:00
parent 31591411e4
commit ad020cf135
33 changed files with 695 additions and 364 deletions
Download Patch File Download Diff File Expand all files Collapse all files
browserdata/bookmark/bookmark.go
+3 -3
View File
@@ -2,7 +2,6 @@ package bookmark
import (
"database/sql"
"log/slog"
"os"
"sort"
"time"
@@ -11,6 +10,7 @@ import (
_ "modernc.org/sqlite" // import sqlite3 driver
"github.com/moond4rk/hackbrowserdata/extractor"
"github.com/moond4rk/hackbrowserdata/log"
"github.com/moond4rk/hackbrowserdata/types"
"github.com/moond4rk/hackbrowserdata/utils/fileutil"
"github.com/moond4rk/hackbrowserdata/utils/typeutil"
@@ -111,7 +111,7 @@ func (f *FirefoxBookmark) Extract(_ []byte) error {
defer db.Close()
_, err = db.Exec(closeJournalMode)
if err != nil {
slog.Error("close journal mode error", "err", err)
log.Errorf("close journal mode error: %v", err)
}
rows, err := db.Query(queryFirefoxBookMark)
if err != nil {
@@ -124,7 +124,7 @@ func (f *FirefoxBookmark) Extract(_ []byte) error {
title, url string
)
if err = rows.Scan(&id, &url, &bt, &dateAdded, &title); err != nil {
slog.Error("scan bookmark error", "err", err)
log.Errorf("scan bookmark error: %v", err)
}
*f = append(*f, bookmark{
ID: id,
browserdata/browserdata.go
+7 -8
View File
@@ -1,9 +1,8 @@
package browserdata
import (
"log/slog"
"github.com/moond4rk/hackbrowserdata/extractor"
"github.com/moond4rk/hackbrowserdata/log"
"github.com/moond4rk/hackbrowserdata/types"
"github.com/moond4rk/hackbrowserdata/utils/fileutil"
)
@@ -23,7 +22,7 @@ func New(items []types.DataType) *BrowserData {
func (d *BrowserData) Recovery(masterKey []byte) error {
for _, source := range d.extractors {
if err := source.Extract(masterKey); err != nil {
slog.Error("parse error", "source_data", source.Name(), "err", err.Error())
log.Errorf("parse %s error: %v", source.Name(), err)
continue
}
}
@@ -42,18 +41,18 @@ func (d *BrowserData) Output(dir, browserName, flag string) {
f, err := output.CreateFile(dir, filename)
if err != nil {
slog.Error("create file error", "filename", filename, "err", err.Error())
log.Errorf("create file %s error: %v", filename, err)
continue
}
if err := output.Write(source, f); err != nil {
slog.Error("write to file error", "filename", filename, "err", err.Error())
log.Errorf("write to file %s error: %v", filename, err)
continue
}
if err := f.Close(); err != nil {
slog.Error("close file error", "filename", filename, "err", err.Error())
log.Errorf("close file %s error: %v", filename, err)
continue
}
slog.Warn("export success", "filename", filename)
log.Warnf("export success: %s", filename)
}
}
@@ -62,7 +61,7 @@ func (d *BrowserData) addExtractors(items []types.DataType) {
if source := extractor.CreateExtractor(itemType); source != nil {
d.extractors[itemType] = source
} else {
slog.Debug("source not found", "source", itemType)
log.Debugf("source not found: %s", itemType)
}
}
}
browserdata/cookie/cookie.go
+4 -4
View File
@@ -2,7 +2,6 @@ package cookie
import (
"database/sql"
"log/slog"
"os"
"sort"
"time"
@@ -12,6 +11,7 @@ import (
"github.com/moond4rk/hackbrowserdata/crypto"
"github.com/moond4rk/hackbrowserdata/extractor"
"github.com/moond4rk/hackbrowserdata/log"
"github.com/moond4rk/hackbrowserdata/types"
"github.com/moond4rk/hackbrowserdata/utils/typeutil"
)
@@ -65,7 +65,7 @@ func (c *ChromiumCookie) Extract(masterKey []byte) error {
value, encryptValue []byte
)
if err = rows.Scan(&key, &encryptValue, &host, &path, &createDate, &expireDate, &isSecure, &isHTTPOnly, &hasExpire, &isPersistent); err != nil {
slog.Error("scan chromium cookie error", "err", err)
log.Errorf("scan chromium cookie error: %v", err)
}
cookie := cookie{
@@ -87,7 +87,7 @@ func (c *ChromiumCookie) Extract(masterKey []byte) error {
value, err = crypto.DecryptWithChromium(masterKey, encryptValue)
}
if err != nil {
slog.Error("decrypt chromium cookie error", "err", err)
log.Errorf("decrypt chromium cookie error: %v", err)
}
}
cookie.Value = string(value)
@@ -133,7 +133,7 @@ func (f *FirefoxCookie) Extract(_ []byte) error {
creationTime, expiry int64
)
if err = rows.Scan(&name, &value, &host, &path, &creationTime, &expiry, &isSecure, &isHTTPOnly); err != nil {
slog.Error("scan firefox cookie error", "err", err)
log.Errorf("scan firefox cookie error: %v", err)
}
*f = append(*f, cookie{
KeyName: name,
browserdata/creditcard/creditcard.go
+5 -5
View File
@@ -2,7 +2,6 @@ package creditcard
import (
"database/sql"
"log/slog"
"os"
// import sqlite3 driver
@@ -10,6 +9,7 @@ import (
"github.com/moond4rk/hackbrowserdata/crypto"
"github.com/moond4rk/hackbrowserdata/extractor"
"github.com/moond4rk/hackbrowserdata/log"
"github.com/moond4rk/hackbrowserdata/types"
)
@@ -57,7 +57,7 @@ func (c *ChromiumCreditCard) Extract(masterKey []byte) error {
value, encryptValue []byte
)
if err := rows.Scan(&guid, &name, &month, &year, &encryptValue, &address, &nickname); err != nil {
slog.Error("scan chromium credit card error", "err", err)
log.Errorf("scan chromium credit card error: %v", err)
}
ccInfo := card{
GUID: guid,
@@ -74,7 +74,7 @@ func (c *ChromiumCreditCard) Extract(masterKey []byte) error {
value, err = crypto.DecryptWithChromium(masterKey, encryptValue)
}
if err != nil {
slog.Error("decrypt chromium credit card error", "err", err)
log.Errorf("decrypt chromium credit card error: %v", err)
}
}
@@ -112,7 +112,7 @@ func (c *YandexCreditCard) Extract(masterKey []byte) error {
value, encryptValue []byte
)
if err := rows.Scan(&guid, &name, &month, &year, &encryptValue, &address, &nickname); err != nil {
slog.Error("scan chromium credit card error", "err", err)
log.Errorf("scan chromium credit card error: %v", err)
}
ccInfo := card{
GUID: guid,
@@ -129,7 +129,7 @@ func (c *YandexCreditCard) Extract(masterKey []byte) error {
value, err = crypto.DecryptWithChromium(masterKey, encryptValue)
}
if err != nil {
slog.Error("decrypt chromium credit card error", "err", err)
log.Errorf("decrypt chromium credit card error: %v", err)
}
}
ccInfo.CardNumber = string(value)
browserdata/download/download.go
+4 -4
View File
@@ -2,7 +2,6 @@ package download
import (
"database/sql"
"log/slog"
"os"
"sort"
"strings"
@@ -12,6 +11,7 @@ import (
_ "modernc.org/sqlite" // import sqlite3 driver
"github.com/moond4rk/hackbrowserdata/extractor"
"github.com/moond4rk/hackbrowserdata/log"
"github.com/moond4rk/hackbrowserdata/types"
"github.com/moond4rk/hackbrowserdata/utils/typeutil"
)
@@ -58,7 +58,7 @@ func (c *ChromiumDownload) Extract(_ []byte) error {
totalBytes, startTime, endTime int64
)
if err := rows.Scan(&targetPath, &tabURL, &totalBytes, &startTime, &endTime, &mimeType); err != nil {
slog.Warn("scan chromium download error", "err", err)
log.Warnf("scan chromium download error: %v", err)
}
data := download{
TargetPath: targetPath,
@@ -101,7 +101,7 @@ func (f *FirefoxDownload) Extract(_ []byte) error {
_, err = db.Exec(closeJournalMode)
if err != nil {
slog.Error("close journal mode error", "err", err)
log.Errorf("close journal mode error: %v", err)
}
rows, err := db.Query(queryFirefoxDownload)
if err != nil {
@@ -114,7 +114,7 @@ func (f *FirefoxDownload) Extract(_ []byte) error {
placeID, dateAdded int64
)
if err = rows.Scan(&placeID, &content, &url, &dateAdded); err != nil {
slog.Warn("scan firefox download error", "err", err)
log.Warnf("scan firefox download error: %v", err)
}
contentList := strings.Split(content, ",{")
if len(contentList) > 1 {
browserdata/history/history.go
+3 -3
View File
@@ -2,7 +2,6 @@ package history
import (
"database/sql"
"log/slog"
"os"
"sort"
"time"
@@ -11,6 +10,7 @@ import (
_ "modernc.org/sqlite"
"github.com/moond4rk/hackbrowserdata/extractor"
"github.com/moond4rk/hackbrowserdata/log"
"github.com/moond4rk/hackbrowserdata/types"
"github.com/moond4rk/hackbrowserdata/utils/typeutil"
)
@@ -57,7 +57,7 @@ func (c *ChromiumHistory) Extract(_ []byte) error {
lastVisitTime int64
)
if err := rows.Scan(&url, &title, &visitCount, &lastVisitTime); err != nil {
slog.Warn("scan chromium history error", "err", err)
log.Warnf("scan chromium history error: %v", err)
}
data := history{
URL: url,
@@ -113,7 +113,7 @@ func (f *FirefoxHistory) Extract(_ []byte) error {
visitCount int
)
if err = rows.Scan(&id, &url, &visitDate, &title, &visitCount); err != nil {
slog.Error("scan firefox history error", "err", err)
log.Errorf("scan firefox history error: %v", err)
}
*f = append(*f, history{
Title: title,
browserdata/localstorage/localstorage.go
+3 -3
View File
@@ -4,7 +4,6 @@ import (
"bytes"
"database/sql"
"fmt"
"log/slog"
"os"
"strings"
@@ -13,6 +12,7 @@ import (
"golang.org/x/text/transform"
"github.com/moond4rk/hackbrowserdata/extractor"
"github.com/moond4rk/hackbrowserdata/log"
"github.com/moond4rk/hackbrowserdata/types"
"github.com/moond4rk/hackbrowserdata/utils/byteutil"
"github.com/moond4rk/hackbrowserdata/utils/typeutil"
@@ -125,7 +125,7 @@ func (f *FirefoxLocalStorage) Extract(_ []byte) error {
_, err = db.Exec(closeJournalMode)
if err != nil {
slog.Error("close journal mode error", "err", err)
log.Errorf("close journal mode error: %v", err)
}
rows, err := db.Query(queryLocalStorage)
if err != nil {
@@ -135,7 +135,7 @@ func (f *FirefoxLocalStorage) Extract(_ []byte) error {
for rows.Next() {
var originKey, key, value string
if err = rows.Scan(&originKey, &key, &value); err != nil {
slog.Error("scan firefox local storage error", "err", err)
log.Errorf("scan firefox local storage error: %v", err)
}
s := new(storage)
s.fillFirefox(originKey, key, value)
browserdata/password/password.go
+5 -5
View File
@@ -3,7 +3,6 @@ package password
import (
"database/sql"
"encoding/base64"
"log/slog"
"os"
"sort"
"time"
@@ -13,6 +12,7 @@ import (
"github.com/moond4rk/hackbrowserdata/crypto"
"github.com/moond4rk/hackbrowserdata/extractor"
"github.com/moond4rk/hackbrowserdata/log"
"github.com/moond4rk/hackbrowserdata/types"
"github.com/moond4rk/hackbrowserdata/utils/typeutil"
)
@@ -65,7 +65,7 @@ func (c *ChromiumPassword) Extract(masterKey []byte) error {
create int64
)
if err := rows.Scan(&url, &username, &pwd, &create); err != nil {
slog.Error("scan chromium password error", "err", err)
log.Errorf("scan chromium password error: %v", err)
}
login := loginData{
UserName: username,
@@ -79,7 +79,7 @@ func (c *ChromiumPassword) Extract(masterKey []byte) error {
password, err = crypto.DecryptWithChromium(masterKey, pwd)
}
if err != nil {
slog.Error("decrypt chromium password error", "err", err)
log.Errorf("decrypt chromium password error: %v", err)
}
}
if create > time.Now().Unix() {
@@ -132,7 +132,7 @@ func (c *YandexPassword) Extract(masterKey []byte) error {
create int64
)
if err := rows.Scan(&url, &username, &pwd, &create); err != nil {
slog.Error("scan yandex password error", "err", err)
log.Errorf("scan yandex password error: %v", err)
}
login := loginData{
UserName: username,
@@ -147,7 +147,7 @@ func (c *YandexPassword) Extract(masterKey []byte) error {
password, err = crypto.DecryptWithChromium(masterKey, pwd)
}
if err != nil {
slog.Error("decrypt yandex password error", "err", err)
log.Errorf("decrypt yandex password error: %v", err)
}
}
if create > time.Now().Unix() {
browserdata/sessionstorage/sessionstorage.go
+3 -3
View File
@@ -4,7 +4,6 @@ import (
"bytes"
"database/sql"
"fmt"
"log/slog"
"os"
"strings"
@@ -13,6 +12,7 @@ import (
"golang.org/x/text/transform"
"github.com/moond4rk/hackbrowserdata/extractor"
"github.com/moond4rk/hackbrowserdata/log"
"github.com/moond4rk/hackbrowserdata/types"
"github.com/moond4rk/hackbrowserdata/utils/byteutil"
"github.com/moond4rk/hackbrowserdata/utils/typeutil"
@@ -133,7 +133,7 @@ func (f *FirefoxSessionStorage) Extract(_ []byte) error {
_, err = db.Exec(closeJournalMode)
if err != nil {
slog.Error("close journal mode error", "err", err)
log.Errorf("close journal mode error: %v", err)
}
rows, err := db.Query(querySessionStorage)
if err != nil {
@@ -143,7 +143,7 @@ func (f *FirefoxSessionStorage) Extract(_ []byte) error {
for rows.Next() {
var originKey, key, value string
if err = rows.Scan(&originKey, &key, &value); err != nil {
slog.Error("scan session storage error", "err", err)
log.Errorf("scan session storage error: %v", err)
}
s := new(session)
s.fillFirefox(originKey, key, value)