feat: rename item temp filename

internal/browser/chromium/chromium.go

@@ -22,65 +22,65 @@ type chromium struct {
 	itemPaths   map[item.Item]string
 }
 
-// New creates a new instance of chromium browser, fill item's path if item is exist.
+// New create instance of chromium browser, fill item's path if item is existed.
 func New(name, storage, profilePath string, items []item.Item) (*chromium, error) {
-
+	c := &chromium{
+		name:    name,
+		storage: storage,
+	}
 	// TODO: Handle file path is not exist
 	if !fileutil.FolderExists(profilePath) {
 		return nil, fmt.Errorf("%s profile path is not exist: %s", name, profilePath)
 	}
-	itemsPaths, err := getChromiumItemPath(profilePath, items)
+	masterKey, err := c.GetMasterKey()
 	if err != nil {
 		return nil, err
 	}
-
-	c := &chromium{
-		name:        name,
-		storage:     storage,
-		profilePath: profilePath,
-		items:       typeutil.Keys(itemsPaths),
-		itemPaths:   itemsPaths,
+	itemsPaths, err := c.getItemPath(profilePath, items)
+	if err != nil {
+		return nil, err
 	}
-	// new browsing data
+	c.masterKey = masterKey
+	c.profilePath = profilePath
+	c.itemPaths = itemsPaths
+	c.items = typeutil.Keys(itemsPaths)
 	return c, err
 }
 
+func (c *chromium) GetItems() []item.Item {
+	return c.items
+}
+
+func (c *chromium) GetItemPaths() map[item.Item]string {
+	return c.itemPaths
+}
+
 func (c *chromium) GetName() string {
 	return c.name
 }
 
-func (c *chromium) GetBrowsingData() []browingdata.Source {
-	var browsingData []browingdata.Source
-	data := browingdata.New(c.items)
-	for item := range c.itemPaths {
-		d := item.NewBrowsingData()
-		if d != nil {
-			browsingData = append(browsingData, d)
-		}
+func (c *chromium) GetBrowsingData() (*browingdata.Data, error) {
+	b := browingdata.New(c.items)
+
+	if err := c.copyItemToLocal(); err != nil {
+		return nil, err
 	}
-	return browsingData
+	if err := b.Recovery(c.masterKey); err != nil {
+		return nil, err
+	}
+	return b, nil
 }
 
-func (c *chromium) CopyItemFileToLocal() error {
-	for item, sourcePath := range c.itemPaths {
-		var dstFilename = item.TempName()
-		locals, _ := filepath.Glob("*")
-		for _, v := range locals {
-			if v == dstFilename {
-				err := os.Remove(dstFilename)
-				// TODO: Should Continue all iteration error
-				if err != nil {
-					return err
-				}
-			}
-		}
-
+func (c *chromium) copyItemToLocal() error {
+	for i, path := range c.itemPaths {
+		// var dstFilename = item.TempName()
+		var filename = i.String()
 		// TODO: Handle read file error
-		sourceFile, err := ioutil.ReadFile(sourcePath)
+		d, err := ioutil.ReadFile(path)
 		if err != nil {
 			fmt.Println(err.Error())
 		}
-		err = ioutil.WriteFile(dstFilename, sourceFile, 0777)
+		err = ioutil.WriteFile(filename, d, 0777)
 		if err != nil {
 			return err
 		}
@@ -88,7 +88,7 @@ func (c *chromium) CopyItemFileToLocal() error {
 	return nil
 }
 
-func getChromiumItemPath(profilePath string, items []item.Item) (map[item.Item]string, error) {
+func (c *chromium) getItemPath(profilePath string, items []item.Item) (map[item.Item]string, error) {
 	var itemPaths = make(map[item.Item]string)
 	err := filepath.Walk(profilePath, chromiumWalkFunc(items, itemPaths))
 	return itemPaths, err
@@ -102,7 +102,7 @@ func chromiumWalkFunc(items []item.Item, itemPaths map[item.Item]string) filepat
 				if it == item.ChromiumKey {
 					itemPaths[it] = path
 				}
-				// TODO: Handle file path is not in Default folder
+				// TODO: check file path is not in Default folder
 				if strings.Contains(path, "Default") {
 					itemPaths[it] = path
 				}

internal/browser/chromium/chromium_darwin.go

@@ -29,17 +29,16 @@ func (c *chromium) GetMasterKey() ([]byte, error) {
 	if stderr.Len() > 0 {
 		return nil, errors.New(stderr.String())
 	}
-	temp := stdout.Bytes()
-	chromeSecret := temp[:len(temp)-1]
+	chromeSecret := bytes.TrimSpace(stdout.Bytes())
 	if chromeSecret == nil {
 		return nil, ErrWrongSecurityCommand
 	}
 	var 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 {
-		c.browserInfo.masterKey = key
-		return key, nil
+	if key == nil {
+		return nil, ErrWrongSecurityCommand
 	}
-	return nil, errors.New("macOS wrong security command")
+	c.masterKey = key
+	return key, nil
 }

internal/browser/chromium/chromium_windows.go

@@ -4,8 +4,11 @@ import (
 	"encoding/base64"
 	"errors"
 
-	"github.com/smallstep/cli/utils"
 	"github.com/tidwall/gjson"
+
+	"hack-browser-data/internal/decrypter"
+	"hack-browser-data/internal/item"
+	"hack-browser-data/internal/utils/fileutil"
 )
 
 var (
@@ -13,7 +16,7 @@ var (
 )
 
 func (c *chromium) GetMasterKey() ([]byte, error) {
-	keyFile, err := utils.ReadFile(item.TempChromiumKey)
+	keyFile, err := fileutil.ReadFile(item.TempChromiumKey)
 	if err != nil {
 		return nil, err
 	}
@@ -23,8 +26,8 @@ func (c *chromium) GetMasterKey() ([]byte, error) {
 		if err != nil {
 			return nil, errDecodeMasterKeyFailed
 		}
-		c.browserInfo.masterKey, err = decrypter.DPApi(pureKey[5:])
-		return c.browserInfo.masterKey, err
+		c.masterKey, err = decrypter.DPApi(pureKey[5:])
+		return c.masterKey, err
 	}
 	return nil, nil
 }