refactor(cli): flatten keys export/import into dumpkeys/restore (#608)

* refactor(cli): flatten keys export/import into dumpkeys/restore The keys noun-group clashed with the flat dump/list verbs; unify on flat verbs and drop the keys parent. Pure rename, no behavior change. * docs(rfc): add RFC-013 CLI redesign & cross-host restore The accepted design doc for the flat-verb CLI redesign and cross-platform restore.
2026-06-10 20:07:46 +02:00 · 2026-06-06 14:34:40 +08:00
parent 9fa709a11e
commit 8936c42d10
4 changed files with 182 additions and 59 deletions
@@ -0,0 +1,109 @@
+package main
+
+import (
+	"fmt"
+	"io"
+	"os"
+	"strings"
+
+	"github.com/spf13/cobra"
+
+	"github.com/moond4rk/hackbrowserdata/browser"
+	"github.com/moond4rk/hackbrowserdata/log"
+	"github.com/moond4rk/hackbrowserdata/masterkey"
+)
+
+func restoreCmd() *cobra.Command {
+	var (
+		keysPath     string
+		browserName  string
+		category     string
+		outputFormat string
+		outputDir    string
+		profilePath  string
+		compress     bool
+	)
+
+	cmd := &cobra.Command{
+		Use:   "restore",
+		Short: "Decrypt a copied profile using exported master keys",
+		Example: `  hack-browser-data restore -i keys.json -b chrome -p /path/to/copied/User\ Data
+  hack-browser-data restore -i keys.json -b edge -p /path -c cookie -f csv
+  ssh origin "hack-browser-data dumpkeys" | hack-browser-data restore -i - -b chrome -p /path`,
+		RunE: func(cmd *cobra.Command, args []string) error {
+			browsers, err := loadAndApplyKeys(browserName, profilePath, keysPath)
+			if err != nil {
+				return err
+			}
+			if len(browsers) == 0 {
+				log.Warnf("no browsers found")
+				return nil
+			}
+			categories, err := parseCategories(category)
+			if err != nil {
+				return err
+			}
+			return extractAndWrite(browsers, categories, outputDir, outputFormat, compress)
+		},
+	}
+
+	cmd.Flags().StringVarP(&keysPath, "input", "i", "", "input keys file (use - for stdin)")
+	cmd.Flags().StringVarP(&browserName, "browser", "b", "", "target browser (single, required): "+browser.Names())
+	cmd.Flags().StringVarP(&category, "category", "c", "all", "data categories (comma-separated): all|"+categoryNames())
+	cmd.Flags().StringVarP(&outputFormat, "format", "f", "json", "output format: csv|json|cookie-editor")
+	cmd.Flags().StringVarP(&outputDir, "dir", "d", "results", "output directory")
+	cmd.Flags().StringVarP(&profilePath, "profile-path", "p", "", "copied profile dir path (required)")
+	cmd.Flags().BoolVar(&compress, "zip", false, "compress output to zip")
+
+	_ = cmd.MarkFlagRequired("input")
+	_ = cmd.MarkFlagRequired("browser")
+	_ = cmd.MarkFlagRequired("profile-path")
+
+	return cmd
+}
+
+func loadAndApplyKeys(browserName, profilePath, keysPath string) ([]browser.Browser, error) {
+	if profilePath == "" {
+		return nil, fmt.Errorf("requires -p <copied-profile-dir>")
+	}
+	name := strings.ToLower(browserName)
+	if name == "" || name == "all" {
+		return nil, fmt.Errorf(`requires -b <browser> (single, not "all")`)
+	}
+	if keysPath == "" {
+		return nil, fmt.Errorf("requires -i <keys-file> (or - for stdin)")
+	}
+
+	var r io.Reader = os.Stdin
+	if keysPath != "-" {
+		f, err := os.Open(keysPath)
+		if err != nil {
+			return nil, fmt.Errorf("open keys file %q: %w", keysPath, err)
+		}
+		defer f.Close()
+		r = f
+	}
+	dump, err := masterkey.ReadJSON(r)
+	if err != nil {
+		return nil, fmt.Errorf("read keys file %q: %w", keysPath, err)
+	}
+
+	browsers, err := browser.DiscoverBrowsers(browser.DiscoverOptions{
+		Name:        browserName,
+		ProfilePath: profilePath,
+	})
+	if err != nil {
+		return nil, err
+	}
+
+	browser.ApplyDump(browsers, dump)
+
+	for _, b := range browsers {
+		if _, ok := b.(browser.KeychainPasswordReceiver); ok {
+			log.Infof("Safari has no portable master key; run `dump -b safari` separately for full extraction")
+			break
+		}
+	}
+
+	return browsers, nil
+}