feat-dev: support firefox for windows and macos

2026-05-19 18:58:03 +02:00 · 2022-01-16 22:31:51 +08:00
parent 88fe9c96db
commit 4d444891ab
17 changed files with 384 additions and 216 deletions
@@ -1,12 +1,13 @@
 package cmd

 import (
+	"fmt"
 	"os"
 	"strings"

-	"hack-browser-data/core"
+	"hack-browser-data/pkg/browser"
+	"hack-browser-data/pkg/browser/outputter"
 	"hack-browser-data/pkg/log"
-	"hack-browser-data/utils"

 	"github.com/urfave/cli/v2"
 )
@@ -18,7 +19,6 @@ var (
 	verbose           bool
 	compress          bool
 	customProfilePath string
-	customKeyPath     string
 )

 func Execute() {
@@ -30,16 +30,15 @@ func Execute() {
 		Flags: []cli.Flag{
 			&cli.BoolFlag{Name: "verbose", Aliases: []string{"vv"}, Destination: &verbose, Value: false, Usage: "verbose"},
 			&cli.BoolFlag{Name: "compress", Aliases: []string{"cc"}, Destination: &compress, Value: false, Usage: "compress result to zip"},
-			&cli.StringFlag{Name: "browser", Aliases: []string{"b"}, Destination: &browserName, Value: "all", Usage: "available browsers: all|" + strings.Join(core.ListBrowser(), "|")},
+			&cli.StringFlag{Name: "browser", Aliases: []string{"b"}, Destination: &browserName, Value: "all", Usage: "available browsers: all|" + strings.Join(browser.ListBrowser(), "|")},
 			&cli.StringFlag{Name: "results-dir", Aliases: []string{"dir"}, Destination: &exportDir, Value: "results", Usage: "export dir"},
 			&cli.StringFlag{Name: "format", Aliases: []string{"f"}, Destination: &outputFormat, Value: "csv", Usage: "format, csv|json|console"},
 			&cli.StringFlag{Name: "profile-dir-path", Aliases: []string{"p"}, Destination: &customProfilePath, Value: "", Usage: "custom profile dir path, get with chrome://version"},
-			&cli.StringFlag{Name: "key-file-path", Aliases: []string{"k"}, Destination: &customKeyPath, Value: "", Usage: "custom key file path"},
 		},
 		HideHelpCommand: true,
-		Action: func(c *cli.Context) error {
+		Action: func(ctx *cli.Context) error {
 			var (
-				browsers []core.Browser
+				browsers []browser.Browser
 				err      error
 			)
 			if verbose {
@@ -47,69 +46,38 @@ func Execute() {
 			} else {
 				log.InitLog("error")
 			}
-			if customProfilePath != "" {
-				browsers, err = core.PickCustomBrowser(browserName, customProfilePath, customKeyPath)
-				if err != nil {
-					log.Error(err)
-				}
-			} else {
-				// default select all browsers
-				browsers, err = core.PickBrowser(browserName)
-				if err != nil {
-					log.Error(err)
-				}
+			browsers = browser.PickBrowsers(browserName)
+
+			output := outputter.NewOutPutter(outputFormat)
+			if err := output.MakeDir(exportDir); err != nil {
+				panic(err)
 			}
-			err = utils.MakeDir(exportDir)
-			if err != nil {
-				log.Error(err)
-			}
-			for _, browser := range browsers {
-				err := browser.InitSecretKey()
-				if err != nil {
-					log.Error(err)
+			for _, b := range browsers {
+				fmt.Printf("%+v\n", b)
+				if err := b.CopyItemFileToLocal(); err != nil {
+					panic(err)
 				}
-				// default select all items
-				// you can get single item with browser.GetItem(itemName)
-				items, err := browser.GetAllItems()
+				masterKey, err := b.GetMasterKey()
 				if err != nil {
-					log.Error(err)
+					fmt.Println(err)
 				}
-				name := browser.GetName()
-				key := browser.GetSecretKey()
-				for _, item := range items {
-					err := item.CopyDB()
+				browserName := b.GetName()
+				multiData := b.GetBrowsingData()
+				for _, data := range multiData {
+					if err := data.Parse(masterKey); err != nil {
+						fmt.Println(err)
+					}
+					filename := fmt.Sprintf("%s_%s.%s", browserName, data.Name(), outputFormat)
+					file, err := output.CreateFile(exportDir, filename)
 					if err != nil {
-						log.Error(err)
+						panic(err)
 					}
-					switch browser.(type) {
-					case *core.Chromium:
-						err := item.ChromeParse(key)
-						if err != nil {
-							log.Error(err)
-						}
-					case *core.Firefox:
-						err := item.FirefoxParse()
-						if err != nil {
-							log.Error(err)
-						}
-					}
-					err = item.Release()
-					if err != nil {
-						log.Error(err)
-					}
-					err = item.OutPut(outputFormat, name, exportDir)
-					if err != nil {
-						log.Error(err)
+					if err := output.Write(data, file); err != nil {
+						panic(err)
 					}
 				}
 			}
-			if compress {
-				err = utils.Compress(exportDir)
-				if err != nil {
-					log.Error(err)
-				}
-			}
-			return nil
+			return err
 		},
 	}
 	err := app.Run(os.Args)
@@ -117,3 +85,99 @@ func Execute() {
 		log.Error(err)
 	}
 }
+
+// func Execute() {
+// 	app := &cli.App{
+// 		Name:  "hack-browser-data",
+// 		Usage: "Export passwords/cookies/history/bookmarks from browser",
+// 		UsageText: "[hack-browser-data -b chrome -f json -dir results -cc]\n 	Get all data(password/cookie/history/bookmark) from chrome",
+// 		Version: "0.3.7",
+// 		Flags: []cli.Flag{
+// 			&cli.BoolFlag{Name: "verbose", Aliases: []string{"vv"}, Destination: &verbose, Value: false, Usage: "verbose"},
+// 			&cli.BoolFlag{Name: "compress", Aliases: []string{"cc"}, Destination: &compress, Value: false, Usage: "compress result to zip"},
+// 			&cli.StringFlag{Name: "browser", Aliases: []string{"b"}, Destination: &browserName, Value: "all", Usage: "available browsers: all|" + strings.Join(core.ListBrowser(), "|")},
+// 			&cli.StringFlag{Name: "results-dir", Aliases: []string{"dir"}, Destination: &exportDir, Value: "results", Usage: "export dir"},
+// 			&cli.StringFlag{Name: "format", Aliases: []string{"f"}, Destination: &outputFormat, Value: "csv", Usage: "format, csv|json|console"},
+// 			&cli.StringFlag{Name: "profile-dir-path", Aliases: []string{"p"}, Destination: &customProfilePath, Value: "", Usage: "custom profile dir path, get with chrome://version"},
+// 		},
+// 		HideHelpCommand: true,
+// 		Action: func(c *cli.Context) error {
+// 			var (
+// 				browsers []core.Browser
+// 				err      error
+// 			)
+// 			if verbose {
+// 				log.InitLog("debug")
+// 			} else {
+// 				log.InitLog("error")
+// 			}
+// 			if customProfilePath != "" {
+// 				browsers, err = core.PickCustomBrowser(browserName, customProfilePath, customKeyPath)
+// 				if err != nil {
+// 					log.Error(err)
+// 				}
+// 			} else {
+// 				// default select all browsers
+// 				browsers, err = core.PickBrowser(browserName)
+// 				if err != nil {
+// 					log.Error(err)
+// 				}
+// 			}
+// 			err = utils.MakeDir(exportDir)
+// 			if err != nil {
+// 				log.Error(err)
+// 			}
+// 			for _, browser := range browsers {
+// 				err := browser.InitSecretKey()
+// 				if err != nil {
+// 					log.Error(err)
+// 				}
+// 				// default select all items
+// 				// you can get single item with browser.GetItem(itemName)
+// 				items, err := browser.GetAllItems()
+// 				if err != nil {
+// 					log.Error(err)
+// 				}
+// 				name := browser.GetName()
+// 				key := browser.GetSecretKey()
+// 				for _, item := range items {
+// 					err := item.CopyDB()
+// 					if err != nil {
+// 						log.Error(err)
+// 					}
+// 					switch browser.(type) {
+// 					case *core.Chromium:
+// 						err := item.ChromeParse(key)
+// 						if err != nil {
+// 							log.Error(err)
+// 						}
+// 					case *core.Firefox:
+// 						err := item.FirefoxParse()
+// 						if err != nil {
+// 							log.Error(err)
+// 						}
+// 					}
+// 					err = item.Release()
+// 					if err != nil {
+// 						log.Error(err)
+// 					}
+// 					err = item.OutPut(outputFormat, name, exportDir)
+// 					if err != nil {
+// 						log.Error(err)
+// 					}
+// 				}
+// 			}
+// 			if compress {
+// 				err = utils.Compress(exportDir)
+// 				if err != nil {
+// 					log.Error(err)
+// 				}
+// 			}
+// 			return nil
+// 		},
+// 	}
+// 	err := app.Run(os.Args)
+// 	if err != nil {
+// 		log.Error(err)
+// 	}
+// }
@@ -1 +0,0 @@
-package hackbrowserdata