From 14fd71005afb3eca7dec0bb4f64bf90b73817640 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E1=B4=8D=E1=B4=8F=E1=B4=8F=C9=B4D4=CA=80=E1=B4=8B?= Date: Sun, 14 Aug 2022 22:16:24 +0800 Subject: [PATCH] refactor: add nolint comment --- internal/browser/browser.go | 3 +++ internal/browser/browser_windows.go | 5 ----- internal/browser/chromium/chromium_linux.go | 4 +++- internal/decrypter/decrypter_linux.go | 3 --- 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/internal/browser/browser.go b/internal/browser/browser.go index 47f8e79..f8d2bb1 100644 --- a/internal/browser/browser.go +++ b/internal/browser/browser.go @@ -114,6 +114,7 @@ func ListBrowser() []string { // home dir path for all platforms var homeDir, _ = os.UserHomeDir() +//nolint:unused const ( chromeName = "Chrome" chromeBetaName = "Chrome Beta" @@ -126,4 +127,6 @@ const ( coccocName = "CocCoc" yandexName = "Yandex" firefoxName = "Firefox" + speed360Name = "360speed" + qqBrowserName = "QQ" ) diff --git a/internal/browser/browser_windows.go b/internal/browser/browser_windows.go index 5d0ebbc..17fa899 100644 --- a/internal/browser/browser_windows.go +++ b/internal/browser/browser_windows.go @@ -6,11 +6,6 @@ import ( "hack-browser-data/internal/item" ) -const ( - speed360Name = "360speed" - qqBrowserName = "QQ" -) - var ( chromiumList = map[string]struct { name string diff --git a/internal/browser/chromium/chromium_linux.go b/internal/browser/chromium/chromium_linux.go index 173971a..f9893bd 100644 --- a/internal/browser/chromium/chromium_linux.go +++ b/internal/browser/chromium/chromium_linux.go @@ -32,7 +32,9 @@ func (c *chromium) GetMasterKey() ([]byte, error) { return nil, err } defer func() { - session.Close() + if err := session.Close(); err != nil { + log.Errorf("close session failed: %v", err) + } }() collections, err := svc.GetAllCollections() if err != nil { diff --git a/internal/decrypter/decrypter_linux.go b/internal/decrypter/decrypter_linux.go index c7257dd..715f610 100644 --- a/internal/decrypter/decrypter_linux.go +++ b/internal/decrypter/decrypter_linux.go @@ -4,9 +4,6 @@ func Chromium(key, encryptPass []byte) ([]byte, error) { if len(encryptPass) < 3 { return nil, errPasswordIsEmpty } - if len(key) == 0 { - return nil, errSecurityKeyIsEmpty - } chromeIV := []byte{32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32} return aes128CBCDecrypt(key, chromeIV, encryptPass[3:])