refactor: refactor package with gofumpt

moonD4rk · moonD4rk · commit 6d710c20e180 · 2022-06-05T14:51:37.000+08:00
diff --git a/cmd/hack-browser-data/main.go b/cmd/hack-browser-data/main.go
@@ -29,7 +29,7 @@ func Execute() {
 		Name:      "hack-browser-data",
 		Usage:     "Export passwords/cookies/history/bookmarks from browser",
 		UsageText: "[hack-browser-data -b chrome -f json -dir results -cc]\nExport all browingdata(password/cookie/history/bookmark) from browser\nGithub Link: https://github.com/moonD4rk/HackBrowserData",
-		Version:   "0.4.2",
+		Version:   "0.4.3",
 		Flags: []cli.Flag{
 			&cli.BoolFlag{Name: "verbose", Aliases: []string{"vv"}, Destination: &verbose, Value: false, Usage: "verbose"},
 			&cli.BoolFlag{Name: "compress", Aliases: []string{"zip"}, Destination: &compress, Value: false, Usage: "compress result to zip"},
diff --git a/internal/browingdata/browsingdata.go b/internal/browingdata/browsingdata.go
@@ -35,7 +35,6 @@ func New(sources []item.Item) *Data {
 }
 
 func (d *Data) Recovery(masterKey []byte) error {
-
 	for _, source := range d.sources {
 		if err := source.Parse(masterKey); err != nil {
 			log.Errorf("parse %s error %s", source.Name(), err.Error())
@@ -48,7 +47,6 @@ func (d *Data) Output(dir, browserName, flag string) {
 	output := NewOutPutter(flag)
 
 	for _, source := range d.sources {
-
 		filename := fileutil.Filename(browserName, source.Name(), output.Ext())
 
 		f, err := output.CreateFile(dir, filename)
diff --git a/internal/browingdata/creditcard/creditcard.go b/internal/browingdata/creditcard/creditcard.go
@@ -71,6 +71,7 @@ func (c *ChromiumCreditCard) Parse(masterKey []byte) error {
 	}
 	return nil
 }
+
 func (c *ChromiumCreditCard) Name() string {
 	return "creditcard"
 }
@@ -122,6 +123,7 @@ func (c *YandexCreditCard) Parse(masterKey []byte) error {
 	}
 	return nil
 }
+
 func (c *YandexCreditCard) Name() string {
 	return "creditcard"
 }
diff --git a/internal/browingdata/localstorage/localstorage.go b/internal/browingdata/localstorage/localstorage.go
@@ -40,7 +40,7 @@ func (c *ChromiumLocalStorage) Parse(masterKey []byte) error {
 		if len(value) > 1024*5 {
 			continue
 		}
-		var s = new(storage)
+		s := new(storage)
 		s.fillKey(key)
 		s.fillValue(value)
 		// don't save meta data
@@ -114,13 +114,11 @@ func (f *FirefoxLocalStorage) Parse(masterKey []byte) error {
 	}
 	defer rows.Close()
 	for rows.Next() {
-		var (
-			originKey, key, value string
-		)
+		var originKey, key, value string
 		if err = rows.Scan(&originKey, &key, &value); err != nil {
 			log.Warn(err)
 		}
-		var s = new(storage)
+		s := new(storage)
 		s.fillFirefox(originKey, key, value)
 		*f = append(*f, *s)
 	}
diff --git a/internal/browingdata/outputter.go b/internal/browingdata/outputter.go
@@ -50,7 +50,7 @@ func (o *OutPutter) CreateFile(dir, filename string) (*os.File, error) {
 
 	if dir != "" {
 		if _, err := os.Stat(dir); os.IsNotExist(err) {
-			err := os.MkdirAll(dir, 0777)
+			err := os.MkdirAll(dir, 0o777)
 			if err != nil {
 				return nil, err
 			}
@@ -60,7 +60,7 @@ func (o *OutPutter) CreateFile(dir, filename string) (*os.File, error) {
 	var file *os.File
 	var err error
 	p := filepath.Join(dir, filename)
-	file, err = os.OpenFile(p, os.O_TRUNC|os.O_CREATE|os.O_WRONLY|os.O_APPEND, 0666)
+	file, err = os.OpenFile(p, os.O_TRUNC|os.O_CREATE|os.O_WRONLY|os.O_APPEND, 0o666)
 	if err != nil {
 		return nil, err
 	}
diff --git a/internal/browingdata/password/password.go b/internal/browingdata/password/password.go
@@ -229,9 +229,7 @@ func (f *FirefoxPassword) Name() string {
 }
 
 func getFirefoxDecryptKey(key4file string) (item1, item2, a11, a102 []byte, err error) {
-	var (
-		keyDB *sql.DB
-	)
+	var keyDB *sql.DB
 	keyDB, err = sql.Open("sqlite3", key4file)
 	if err != nil {
 		return nil, nil, nil, nil, err
diff --git a/internal/browser/browser.go b/internal/browser/browser.go
@@ -111,10 +111,8 @@ func ListBrowser() []string {
 	return l
 }
 
-var (
-	// home dir path for all platforms
-	homeDir, _ = os.UserHomeDir()
-)
+// home dir path for all platforms
+var homeDir, _ = os.UserHomeDir()
 
 const (
 	chromeName     = "Chrome"
diff --git a/internal/browser/browser_windows.go b/internal/browser/browser_windows.go
@@ -3,9 +3,6 @@
 package browser
 
 import (
-	"io/ioutil"
-	"os"
-
 	"hack-browser-data/internal/item"
 )
 
@@ -18,7 +15,7 @@ var (
 	}{
 		"chrome": {
 			name:        chromeName,
-			profilePath: getProfiles(chromeUserDataPath)[0],
+			profilePath: chromeUserDataPath,
 			items:       item.DefaultChromium,
 		},
 		"edge": {
@@ -28,12 +25,12 @@ var (
 		},
 		"chromium": {
 			name:        chromiumName,
-			profilePath: getProfiles(chromiumUserDataPath)[0],
+			profilePath: chromiumUserDataPath,
 			items:       item.DefaultChromium,
 		},
 		"chrome-beta": {
 			name:        chromeBetaName,
-			profilePath: getProfiles(chromeBetaUserDataPath)[0],
+			profilePath: chromeBetaUserDataPath,
 			items:       item.DefaultChromium,
 		},
 		"opera": {
@@ -91,31 +88,10 @@ var (
 	}
 )
 
-func getProfiles(userDataPath string) []string {
-	var res []string
-	files, err := ioutil.ReadDir(userDataPath)
-
-	if err != nil {
-
-		res = append(res, userDataPath+"Default")
-	}
-
-	for _, f := range files {
-		if f.IsDir() && f.Name() != "System Profile" {
-			var thisPath = userDataPath + f.Name()
-			_, err := os.Stat(thisPath + "/Login Data")
-			if err == nil {
-				res = append(res, userDataPath+f.Name())
-			}
-		}
-	}
-	return res
-}
-
 var (
-	chromeUserDataPath     = homeDir + "/AppData/Local/Google/Chrome/User Data/"
-	chromeBetaUserDataPath = homeDir + "/AppData/Local/Google/Chrome Beta/User Data/"
-	chromiumUserDataPath   = homeDir + "/AppData/Local/Chromium/User Data/"
+	chromeUserDataPath     = homeDir + "/AppData/Local/Google/Chrome/User Data/Default/"
+	chromeBetaUserDataPath = homeDir + "/AppData/Local/Google/Chrome Beta/User Data/Default/"
+	chromiumUserDataPath   = homeDir + "/AppData/Local/Chromium/User Data/Default/"
 	edgeProfilePath        = homeDir + "/AppData/Local/Microsoft/Edge/User Data/Default/"
 	braveProfilePath       = homeDir + "/AppData/Local/BraveSoftware/Brave-Browser/User Data/Default/"
 	speed360ProfilePath    = homeDir + "/AppData/Local/360chrome/Chrome/User Data/Default/"
diff --git a/internal/browser/chromium/chromium.go b/internal/browser/chromium/chromium.go
@@ -39,6 +39,7 @@ func New(name, storage, profilePath string, items []item.Item) ([]*chromium, err
 			name:      fileutil.BrowserName(name, user),
 			items:     typeutil.Keys(itemPaths),
 			itemPaths: itemPaths,
+			storage:   storage,
 		})
 	}
 	return chromiumList, nil
@@ -90,7 +91,7 @@ func (c *chromium) copyItemToLocal() error {
 }
 
 func (c *chromium) getItemPath(profilePath string, items []item.Item) (map[item.Item]string, error) {
-	var itemPaths = make(map[item.Item]string)
+	itemPaths := make(map[item.Item]string)
 	parentDir := fileutil.ParentDir(profilePath)
 	baseDir := fileutil.BaseDir(profilePath)
 	err := filepath.Walk(parentDir, chromiumWalkFunc(items, itemPaths, baseDir))
@@ -102,7 +103,8 @@ func (c *chromium) getItemPath(profilePath string, items []item.Item) (map[item.
 }
 
 func (c *chromium) getMultiItemPath(profilePath string, items []item.Item) (map[string]map[item.Item]string, error) {
-	var multiItemPaths = make(map[string]map[item.Item]string)
+	// multiItemPaths is a map of user to item path, map[profile 1][item's name & path key pair]
+	multiItemPaths := make(map[string]map[item.Item]string)
 	parentDir := fileutil.ParentDir(profilePath)
 	err := filepath.Walk(parentDir, chromiumWalkFunc2(items, multiItemPaths))
 	if err != nil {
@@ -126,6 +128,7 @@ func (c *chromium) getMultiItemPath(profilePath string, items []item.Item) (map[
 		}
 		t[userDir] = v
 		t[userDir][item.ChromiumKey] = keyPath
+		fillLocalStoragePath(t[userDir], item.ChromiumLocalStorage)
 	}
 	return t, nil
 }
diff --git a/internal/browser/chromium/chromium_darwin.go b/internal/browser/chromium/chromium_darwin.go
@@ -1,3 +1,5 @@
+//go:build darwin
+
 package chromium
 
 import (
@@ -46,7 +48,7 @@ func (c *chromium) GetMasterKey() ([]byte, error) {
 	if chromeSecret == nil {
 		return nil, ErrWrongSecurityCommand
 	}
-	var chromeSalt = []byte("saltysalt")
+	chromeSalt := []byte("saltysalt")
 	// @https://source.chromium.org/chromium/chromium/src/+/master:components/os_crypt/os_crypt_mac.mm;l=157
 	key := pbkdf2.Key(chromeSecret, chromeSalt, 1003, 16, sha1.New)
 	if key == nil {
diff --git a/internal/browser/chromium/chromium_linux.go b/internal/browser/chromium/chromium_linux.go
@@ -1,3 +1,5 @@
+//go:build linux
+
 package chromium
 
 import (
@@ -60,7 +62,7 @@ func (c *chromium) GetMasterKey() ([]byte, error) {
 		// @https://source.chromium.org/chromium/chromium/src/+/main:components/os_crypt/os_crypt_linux.cc;l=100
 		chromiumSecret = []byte("peanuts")
 	}
-	var chromiumSalt = []byte("saltysalt")
+	chromiumSalt := []byte("saltysalt")
 	// @https://source.chromium.org/chromium/chromium/src/+/master:components/os_crypt/os_crypt_linux.cc
 	key := pbkdf2.Key(chromiumSecret, chromiumSalt, 1, 16, sha1.New)
 	c.masterKey = key
diff --git a/internal/browser/chromium/chromium_windows.go b/internal/browser/chromium/chromium_windows.go
@@ -1,3 +1,5 @@
+//go:build windows
+
 package chromium
 
 import (
@@ -13,9 +15,7 @@ import (
 	"hack-browser-data/internal/utils/fileutil"
 )
 
-var (
-	errDecodeMasterKeyFailed = errors.New("decode master key failed")
-)
+var errDecodeMasterKeyFailed = errors.New("decode master key failed")
 
 func (c *chromium) GetMasterKey() ([]byte, error) {
 	keyFile, err := fileutil.ReadFile(item.TempChromiumKey)
diff --git a/internal/browser/firefox/firefox.go b/internal/browser/firefox/firefox.go
@@ -21,13 +21,10 @@ type firefox struct {
 	itemPaths   map[item.Item]string
 }
 
-var (
-	ErrProfilePathNotFound = errors.New("profile path not found")
-)
+var ErrProfilePathNotFound = errors.New("profile path not found")
 
 // New returns a new firefox instance.
 func New(name, storage, profilePath string, items []item.Item) ([]*firefox, error) {
-
 	f := &firefox{
 		name:        name,
 		storage:     storage,
@@ -50,7 +47,7 @@ func New(name, storage, profilePath string, items []item.Item) ([]*firefox, erro
 }
 
 func (f *firefox) getMultiItemPath(profilePath string, items []item.Item) (map[string]map[item.Item]string, error) {
-	var multiItemPaths = make(map[string]map[item.Item]string)
+	multiItemPaths := make(map[string]map[item.Item]string)
 	err := filepath.Walk(profilePath, firefoxWalkFunc(items, multiItemPaths))
 	return multiItemPaths, err
 }
diff --git a/internal/decrypter/decrypter_darwin.go b/internal/decrypter/decrypter_darwin.go
@@ -5,7 +5,7 @@ func Chromium(key, encryptPass []byte) ([]byte, error) {
 		if len(key) == 0 {
 			return nil, errSecurityKeyIsEmpty
 		}
-		var chromeIV = []byte{32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32}
+		chromeIV := []byte{32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32}
 		return aes128CBCDecrypt(key, chromeIV, encryptPass[3:])
 	} else {
 		return nil, errDecryptFailed
diff --git a/internal/decrypter/decrypter_linux.go b/internal/decrypter/decrypter_linux.go
@@ -1,7 +1,7 @@
 package decrypter
 
 func Chromium(key, encryptPass []byte) ([]byte, error) {
-	var chromeIV = []byte{32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32}
+	chromeIV := []byte{32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32}
 	if len(encryptPass) > 3 {
 		if len(key) == 0 {
 			return nil, errSecurityKeyIsEmpty
diff --git a/internal/utils/fileutil/filetutil.go b/internal/utils/fileutil/filetutil.go
@@ -81,7 +81,7 @@ func CopyDirHasSuffix(src, dst, suffix string) error {
 	if err != nil {
 		return err
 	}
-	if err := os.MkdirAll(dst, 0755); err != nil {
+	if err := os.MkdirAll(dst, 0o755); err != nil {
 		return err
 	}
 	for index, file := range filelist {
@@ -102,7 +102,7 @@ func CopyFile(src, dst string) error {
 	if err != nil {
 		return err
 	}
-	err = ioutil.WriteFile(dst, d, 0777)
+	err = ioutil.WriteFile(dst, d, 0o777)
 	if err != nil {
 		return err
 	}
@@ -141,7 +141,7 @@ func CompressDir(dir string) error {
 	if err != nil {
 		return err
 	}
-	var b = new(bytes.Buffer)
+	b := new(bytes.Buffer)
 	zw := zip.NewWriter(b)
 	for _, f := range files {
 		fw, _ := zw.Create(f.Name())
diff --git a/internal/utils/typeutil/typeutil.go b/internal/utils/typeutil/typeutil.go
@@ -24,7 +24,7 @@ func IntToBool[T constraints.Signed](a T) bool {
 }
 
 func Reverse[T any](s []T) []T {
-	var h = make([]T, len(s))
+	h := make([]T, len(s))
 	for i := 0; i < len(s); i++ {
 		h[i] = s[len(s)-i-1]
 	}
diff --git a/internal/utils/typeutil/typeutil_test.go b/internal/utils/typeutil/typeutil_test.go
@@ -4,13 +4,11 @@ import (
 	"testing"
 )
 
-var (
-	reverseTestCases = [][]any{
-		[]any{1, 2, 3, 4, 5},
-		[]any{"1", "2", "3", "4", "5"},
-		[]any{"1", 2, "3", "4", 5},
-	}
-)
+var reverseTestCases = [][]any{
+	{1, 2, 3, 4, 5},
+	{"1", "2", "3", "4", "5"},
+	{"1", 2, "3", "4", 5},
+}
 
 func TestReverse(t *testing.T) {
 	for _, ts := range reverseTestCases {

Original file line number	Diff line number	Diff line change
`@@ -71,6 +71,7 @@ func (c *ChromiumCreditCard) Parse(masterKey []byte) error {`
`71`	`71`	`}`
`72`	`72`	`return nil`
`73`	`73`	`}`
	`74`	`+`
`74`	`75`	`func (c *ChromiumCreditCard) Name() string {`
`75`	`76`	`return "creditcard"`
`76`	`77`	`}`
`@@ -122,6 +123,7 @@ func (c *YandexCreditCard) Parse(masterKey []byte) error {`
`122`	`123`	`}`
`123`	`124`	`return nil`
`124`	`125`	`}`
	`126`	`+`
`125`	`127`	`func (c *YandexCreditCard) Name() string {`
`126`	`128`	`return "creditcard"`
`127`	`129`	`}`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ func (c *ChromiumLocalStorage) Parse(masterKey []byte) error {`
`40`	`40`	`if len(value) > 1024*5 {`
`41`	`41`	`continue`
`42`	`42`	`}`
`43`		`- var s = new(storage)`
	`43`	`+ s := new(storage)`
`44`	`44`	`s.fillKey(key)`
`45`	`45`	`s.fillValue(value)`
`46`	`46`	`// don't save meta data`
`@@ -114,13 +114,11 @@ func (f *FirefoxLocalStorage) Parse(masterKey []byte) error {`
`114`	`114`	`}`
`115`	`115`	`defer rows.Close()`
`116`	`116`	`for rows.Next() {`
`117`		`- var (`
`118`		`- originKey, key, value string`
`119`		`- )`
	`117`	`+ var originKey, key, value string`
`120`	`118`	`if err = rows.Scan(&originKey, &key, &value); err != nil {`
`121`	`119`	`log.Warn(err)`
`122`	`120`	`}`
`123`		`- var s = new(storage)`
	`121`	`+ s := new(storage)`
`124`	`122`	`s.fillFirefox(originKey, key, value)`
`125`	`123`	`f = append(f, *s)`
`126`	`124`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,7 @@ func New(name, storage, profilePath string, items []item.Item) ([]*chromium, err`
`39`	`39`	`name: fileutil.BrowserName(name, user),`
`40`	`40`	`items: typeutil.Keys(itemPaths),`
`41`	`41`	`itemPaths: itemPaths,`
	`42`	`+ storage: storage,`
`42`	`43`	`})`
`43`	`44`	`}`
`44`	`45`	`return chromiumList, nil`
`@@ -90,7 +91,7 @@ func (c *chromium) copyItemToLocal() error {`
`90`	`91`	`}`
`91`	`92`
`92`	`93`	`func (c *chromium) getItemPath(profilePath string, items []item.Item) (map[item.Item]string, error) {`
`93`		`- var itemPaths = make(map[item.Item]string)`
	`94`	`+ itemPaths := make(map[item.Item]string)`
`94`	`95`	`parentDir := fileutil.ParentDir(profilePath)`
`95`	`96`	`baseDir := fileutil.BaseDir(profilePath)`
`96`	`97`	`err := filepath.Walk(parentDir, chromiumWalkFunc(items, itemPaths, baseDir))`
`@@ -102,7 +103,8 @@ func (c *chromium) getItemPath(profilePath string, items []item.Item) (map[item.`
`102`	`103`	`}`
`103`	`104`
`104`	`105`	`func (c *chromium) getMultiItemPath(profilePath string, items []item.Item) (map[string]map[item.Item]string, error) {`
`105`		`- var multiItemPaths = make(map[string]map[item.Item]string)`
	`106`	`+ // multiItemPaths is a map of user to item path, map[profile 1][item's name & path key pair]`
	`107`	`+ multiItemPaths := make(map[string]map[item.Item]string)`
`106`	`108`	`parentDir := fileutil.ParentDir(profilePath)`
`107`	`109`	`err := filepath.Walk(parentDir, chromiumWalkFunc2(items, multiItemPaths))`
`108`	`110`	`if err != nil {`
`@@ -126,6 +128,7 @@ func (c *chromium) getMultiItemPath(profilePath string, items []item.Item) (map[`
`126`	`128`	`}`
`127`	`129`	`t[userDir] = v`
`128`	`130`	`t[userDir][item.ChromiumKey] = keyPath`
	`131`	`+ fillLocalStoragePath(t[userDir], item.ChromiumLocalStorage)`
`129`	`132`	`}`
`130`	`133`	`return t, nil`
`131`	`134`	`}`