refactor: pass golang-ci lint check

This commit is contained in:
ᴍᴏᴏɴD4ʀᴋ
2022-08-14 21:22:34 +08:00
parent 147d57e8f4
commit 63fc3a656a
22 changed files with 112 additions and 99 deletions
+1 -4
View File
@@ -119,14 +119,11 @@ const (
chromeBetaName = "Chrome Beta"
chromiumName = "Chromium"
edgeName = "Microsoft Edge"
speed360Name = "360speed"
qqBrowserName = "QQ"
braveName = "Brave"
operaName = "Opera"
operaGXName = "OperaGX"
vivaldiName = "Vivaldi"
coccocName = "CocCoc"
yandexName = "Yandex"
firefoxName = "Firefox"
firefoxName = "Firefox"
)
+5
View File
@@ -6,6 +6,11 @@ import (
"hack-browser-data/internal/item"
)
const (
speed360Name = "360speed"
qqBrowserName = "QQ"
)
var (
chromiumList = map[string]struct {
name string
+1 -1
View File
@@ -32,7 +32,7 @@ func New(name, storage, profilePath string, items []item.Item) ([]*chromium, err
if err != nil {
return nil, err
}
var chromiumList []*chromium
chromiumList := make([]*chromium, 0, len(multiItemPaths))
for user, itemPaths := range multiItemPaths {
chromiumList = append(chromiumList, &chromium{
name: fileutil.BrowserName(name, user),
+1 -2
View File
@@ -28,10 +28,9 @@ func (c *chromium) GetMasterKey() ([]byte, error) {
)
// don't need chromium key file for macOS
defer os.Remove(item.TempChromiumKey)
// defer os.Remove(item.TempChromiumKey)
// Get the master key from the keychain
// $ security find-generic-password -wa 'Chrome'
cmd = exec.Command("security", "find-generic-password", "-wa", c.storage)
cmd = exec.Command("security", "find-generic-password", "-wa", strings.TrimSpace(c.storage)) //nolint:gosec
cmd.Stdout = &stdout
cmd.Stderr = &stderr
err := cmd.Run()
@@ -24,14 +24,14 @@ func (c *chromium) GetMasterKey() ([]byte, error) {
}
defer os.Remove(keyFile)
encryptedKey := gjson.Get(keyFile, "os_crypt.encrypted_key")
if encryptedKey.Exists() {
pureKey, err := base64.StdEncoding.DecodeString(encryptedKey.String())
if err != nil {
return nil, errDecodeMasterKeyFailed
}
c.masterKey, err = decrypter.DPApi(pureKey[5:])
log.Infof("%s initialized master key success", c.name)
return c.masterKey, err
if !encryptedKey.Exists() {
return nil, nil
}
return nil, nil
pureKey, err := base64.StdEncoding.DecodeString(encryptedKey.String())
if err != nil {
return nil, errDecodeMasterKeyFailed
}
c.masterKey, err = decrypter.DPAPI(pureKey[5:])
log.Infof("%s initialized master key success", c.name)
return c.masterKey, err
}
+2 -1
View File
@@ -35,7 +35,8 @@ func New(name, storage, profilePath string, items []item.Item) ([]*firefox, erro
if err != nil {
return nil, err
}
var firefoxList []*firefox
firefoxList := make([]*firefox, 0, len(multiItemPaths))
for name, itemPaths := range multiItemPaths {
firefoxList = append(firefoxList, &firefox{
name: fmt.Sprintf("firefox-%s", name),