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

fix: Resolve decryption failures of password value in some browser (#452)

Browse Source 
* fix: skip chromium-based browser 'def' dir
* fix: fixed the issue that 360speed, QQ Browser and other Chinese browsers had errors in decrypting passwords and cookies
* misc: modify some log level
* fix: fix the wrong function

---------

Co-authored-by: Aquilao <Aquilao@outlook>
This commit is contained in:
Aquilao Official
2024-11-14 10:13:46 +08:00
committed by ᴍᴏᴏɴD4ʀᴋ
parent 0761fc39f2
commit b66ca7b3d8
9 changed files with 35 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
browserdata/password/password.go
+10 -9
View File
@@ -65,23 +65,24 @@ func (c *ChromiumPassword) Extract(masterKey []byte) error {
create int64
)
if err := rows.Scan(&url, &username, &pwd, &create); err != nil {
log.Errorf("scan chromium password error: %v", err)
log.Debugf("scan chromium password error: %v", err)
}
login := loginData{
UserName: username,
encryptPass: pwd,
LoginURL: url,
}
if len(pwd) > 0 {
if len(masterKey) == 0 {
password, err = crypto.DecryptWithDPAPI(pwd)
} else {
password, err = crypto.DecryptWithChromium(masterKey, pwd)
}
password, err = crypto.DecryptWithDPAPI(pwd)
if err != nil {
log.Errorf("decrypt chromium password error: %v", err)
password, err = crypto.DecryptWithChromium(masterKey, pwd)
if err != nil {
log.Debugf("decrypt chromium password error: %v", err)
}
}
}
if create > time.Now().Unix() {
login.CreateDate = typeutil.TimeEpoch(create)
} else {
@@ -132,7 +133,7 @@ func (c *YandexPassword) Extract(masterKey []byte) error {
create int64
)
if err := rows.Scan(&url, &username, &pwd, &create); err != nil {
log.Errorf("scan yandex password error: %v", err)
log.Debugf("scan yandex password error: %v", err)
}
login := loginData{
UserName: username,
@@ -147,7 +148,7 @@ func (c *YandexPassword) Extract(masterKey []byte) error {
password, err = crypto.DecryptWithChromium(masterKey, pwd)
}
if err != nil {
log.Errorf("decrypt yandex password error: %v", err)
log.Debugf("decrypt yandex password error: %v", err)
}
}
if create > time.Now().Unix() {