From 121e49bdff69458639127cdb424d305a84d6b313 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E1=B4=8D=E1=B4=8F=E1=B4=8F=C9=B4D4=CA=80=E1=B4=8B?= Date: Tue, 19 Apr 2022 21:28:43 +0800 Subject: [PATCH] feat: add local storage for firefox --- go.mod | 2 + go.sum | 24 +++ internal/browingdata/browsingdata.go | 5 + .../browingdata/localstorage/localstorage.go | 140 ++++++++++++++++++ internal/item/filename.go | 13 +- internal/item/item.go | 6 +- internal/utils/typeutil/typeutil.go | 8 + internal/utils/typeutil/typeutil_test.go | 24 +++ 8 files changed, 213 insertions(+), 9 deletions(-) create mode 100644 internal/browingdata/localstorage/localstorage.go create mode 100644 internal/utils/typeutil/typeutil_test.go diff --git a/go.mod b/go.mod index 5055c2a..9b5fd94 100644 --- a/go.mod +++ b/go.mod @@ -10,6 +10,7 @@ require ( github.com/json-iterator/go v1.1.12 github.com/mattn/go-sqlite3 v1.14.9 github.com/ppacher/go-dbus-keyring v1.0.1 + github.com/syndtr/goleveldb v1.0.0 github.com/tidwall/gjson v1.9.3 github.com/urfave/cli/v2 v2.4.0 golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3 @@ -18,6 +19,7 @@ require ( require ( github.com/cpuguy83/go-md2man/v2 v2.0.1 // indirect + github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db // indirect github.com/gookit/goutil v0.5.0 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect diff --git a/go.sum b/go.sum index 51292df..2b1c81f 100644 --- a/go.sum +++ b/go.sum @@ -4,11 +4,15 @@ github.com/cpuguy83/go-md2man/v2 v2.0.1/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46t github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/gocarina/gocsv v0.0.0-20211203214250-4735fba0c1d9 h1:ptTza/LLPmfRtmz77X+6J61Wyf5e1hz5xYMvRk/hkE4= github.com/gocarina/gocsv v0.0.0-20211203214250-4735fba0c1d9/go.mod h1:5YoVOkjYAQumqlV356Hj3xeYh4BdZuLE0/nRkf2NKkI= github.com/godbus/dbus/v5 v5.0.3/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/godbus/dbus/v5 v5.1.0 h1:4KLkAxT3aOY8Li4FRJe/KvhoNFFxo0m6fNuFUO8QJUk= github.com/godbus/dbus/v5 v5.1.0/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= +github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db h1:woRePGFeVFfLKN/pOkfl+p/TAqKOfFu+7KPlMVpok/w= +github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/gookit/color v1.5.0 h1:1Opow3+BWDwqor78DcJkJCIwnkviFi+rrOANki9BUFw= github.com/gookit/color v1.5.0/go.mod h1:43aQb+Zerm/BWh2GnrgOQm7ffz7tvQXEKV6BFMl7wAo= @@ -16,6 +20,8 @@ github.com/gookit/goutil v0.5.0 h1:SrbfjqZ8iprxJOfKZVT0yGJ4/82afr4Qa0RQwON19I4= github.com/gookit/goutil v0.5.0/go.mod h1:pq1eTibwb2wN96jrci0xy7xogWzzo9CihOQJEAvz4yQ= github.com/gookit/slog v0.2.2-0.20220415153407-dd89ed7b0448 h1:7kNDAgYDAu/5X+PbFfzGToaKJiDcghKv7B4XOGosrPM= github.com/gookit/slog v0.2.2-0.20220415153407-dd89ed7b0448/go.mod h1:9Sh1Utw3LVG0kqN++ankdfrCVQ7yixKDL1+YrYvIulU= +github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI= +github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= @@ -27,6 +33,11 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= +github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/ginkgo v1.7.0 h1:WSHQ+IS43OoUrWtD1/bbclrwK8TTH5hzp+umCiuxHgs= +github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/gomega v1.4.3 h1:RE1xgDvH7imwFD45h+u2SgIfERHlS2yNG4DObb5BSKU= +github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/ppacher/go-dbus-keyring v1.0.1 h1:dM4dMfP5w9MxY+foFHCQiN7izEGpFdKr3tZeMGmvqD0= @@ -38,6 +49,8 @@ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UV github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/syndtr/goleveldb v1.0.0 h1:fBdIW9lB4Iz0n9khmH8w27SJ3QEJ7+IgjPEwGSZiFdE= +github.com/syndtr/goleveldb v1.0.0/go.mod h1:ZVVdQEZoIme9iO1Ch2Jdy24qqXrMMOU6lpPAyBWyWuQ= github.com/tidwall/gjson v1.9.3 h1:hqzS9wAHMO+KVBBkLxYdkEeeFHuqr95GfClRLKlgK0E= github.com/tidwall/gjson v1.9.3/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk= github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA= @@ -56,7 +69,11 @@ golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3 h1:0es+/5331RGQPcXlMfP+Wr golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/exp v0.0.0-20220414153411-bcd21879b8fd h1:zVFyTKZN/Q7mNRWSs1GOYnHM9NiFSJ54YVRsD0rNWT4= golang.org/x/exp v0.0.0-20220414153411-bcd21879b8fd/go.mod h1:lgLbSvA5ygNOMpwM/9anMpWVlVJ7Z+cHWq/eFuinpGE= +golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2 h1:CIJ76btIcR3eFI5EgSo6k1qKw9KJexJuRLI9G7Hp5wE= +golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -65,7 +82,14 @@ golang.org/x/sys v0.0.0-20220412211240-33da011f77ad h1:ntjMns5wyP/fN65tdBD4g8J5w golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.6 h1:aRYxNxv6iGQlyVaZmk6ZgYEDa+Jg18DxebPSrd6bg1M= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4= +gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= +gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= +gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= +gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo= diff --git a/internal/browingdata/browsingdata.go b/internal/browingdata/browsingdata.go index d46ae19..444eda9 100644 --- a/internal/browingdata/browsingdata.go +++ b/internal/browingdata/browsingdata.go @@ -8,6 +8,7 @@ import ( "hack-browser-data/internal/browingdata/creditcard" "hack-browser-data/internal/browingdata/download" "hack-browser-data/internal/browingdata/history" + "hack-browser-data/internal/browingdata/localstorage" "hack-browser-data/internal/browingdata/password" "hack-browser-data/internal/item" "hack-browser-data/internal/log" @@ -75,6 +76,8 @@ func (d *Data) addSource(Sources []item.Item) { d.sources[source] = &download.ChromiumDownload{} case item.ChromiumCreditCard: d.sources[source] = &creditcard.ChromiumCreditCard{} + case item.ChromiumLocalStorage: + d.sources[source] = &localstorage.ChromiumLocalStorage{} case item.YandexPassword: d.sources[source] = &password.YandexPassword{} case item.YandexCreditCard: @@ -89,6 +92,8 @@ func (d *Data) addSource(Sources []item.Item) { d.sources[source] = &history.FirefoxHistory{} case item.FirefoxDownload: d.sources[source] = &download.FirefoxDownload{} + case item.FirefoxLocalStorage: + d.sources[source] = &localstorage.FirefoxLocalStorage{} } } } diff --git a/internal/browingdata/localstorage/localstorage.go b/internal/browingdata/localstorage/localstorage.go new file mode 100644 index 0000000..9c89d36 --- /dev/null +++ b/internal/browingdata/localstorage/localstorage.go @@ -0,0 +1,140 @@ +package localstorage + +import ( + "bytes" + "database/sql" + "fmt" + "os" + "path" + "strings" + + "github.com/syndtr/goleveldb/leveldb" + + "hack-browser-data/internal/item" + "hack-browser-data/internal/log" + "hack-browser-data/internal/utils/typeutil" +) + +type ChromiumLocalStorage []storage + +type storage struct { + IsMeta bool + URL string + Key string + Value string +} + +func (c *ChromiumLocalStorage) Parse(masterKey []byte) error { + home, _ := os.UserHomeDir() + db, err := leveldb.OpenFile(path.Join(home, "tmp/Local Storage/leveldb"), nil) + if err != nil { + return err + } + // log.Info("parsing local storage now") + defer db.Close() + + iter := db.NewIterator(nil, nil) + for iter.Next() { + key := iter.Key() + value := iter.Value() + var s = new(storage) + s.fillKey(key) + + s.fillValue(value) + *c = append(*c, *s) + } + iter.Release() + err = iter.Error() + return err +} + +func (c *ChromiumLocalStorage) Name() string { + return "localStorage" +} + +func (s *storage) fillKey(b []byte) { + keys := bytes.Split(b, []byte("\x00")) + if len(keys) == 1 && bytes.HasPrefix(keys[0], []byte("META:")) { + s.IsMeta = true + s.fillMetaHeader(keys[0]) + } + if len(keys) == 2 && bytes.HasPrefix(keys[0], []byte("_")) { + s.fillHeader(keys[0], keys[1]) + } +} + +func (s *storage) fillMetaHeader(b []byte) { + s.URL = string(bytes.Trim(b, "META:")) +} + +func (s *storage) fillHeader(url, key []byte) { + s.URL = string(bytes.Trim(url, "_")) + s.Key = string(bytes.Trim(key, "\x01")) +} + +// fillValue fills value of the storage +// TODO: support unicode charter +func (s *storage) fillValue(b []byte) { + t := fmt.Sprintf("%c", b) + m := strings.NewReplacer(" ", "", "\x00", "", "\x01", "").Replace(t) + s.Value = m +} + +type FirefoxLocalStorage []storage + +const ( + queryFirefoxHistory = `SELECT originKey, key, value FROM webappsstore2` + closeJournalMode = `PRAGMA journal_mode=off` +) + +func (f *FirefoxLocalStorage) Parse(masterKey []byte) error { + db, err := sql.Open("sqlite3", item.TempFirefoxLocalStorage) + if err != nil { + return err + } + if err != nil { + return err + } + defer os.Remove(item.TempFirefoxLocalStorage) + defer db.Close() + _, err = db.Exec(closeJournalMode) + if err != nil { + return err + } + defer db.Close() + rows, err := db.Query(queryFirefoxHistory) + if err != nil { + return err + } + defer rows.Close() + for rows.Next() { + var ( + originKey, key, value string + ) + if err = rows.Scan(&originKey, &key, &value); err != nil { + log.Warn(err) + } + var s = new(storage) + s.fillFirefox(originKey, key, value) + *f = append(*f, *s) + } + return nil +} + +func (s *storage) fillFirefox(originKey, key, value string) { + // originKey = moc.buhtig.:https:443 + p := strings.Split(originKey, ":") + h := typeutil.Reverse([]byte(p[0])) + if bytes.HasPrefix(h, []byte(".")) { + h = h[1:] + } + if len(p) == 3 { + s.URL = fmt.Sprintf("%s://%s:%s", p[1], string(h), p[2]) + } + s.Key = key + s.Value = value +} + +func (f *FirefoxLocalStorage) Name() string { + return "localStorage" +} diff --git a/internal/item/filename.go b/internal/item/filename.go index 028d6cf..23909bb 100644 --- a/internal/item/filename.go +++ b/internal/item/filename.go @@ -9,15 +9,16 @@ const ( fileChromiumDownload = "History" fileChromiumCookie = "Cookies" fileChromiumBookmark = "Bookmarks" - fileChromiumLocalStorage = "chromiumLocalStorage" + fileChromiumLocalStorage = "Local Storage/leveldb" fileYandexPassword = "Ya Passman Data" fileYandexCredit = "Ya Credit Cards" - fileFirefoxKey4 = "key4.db" - fileFirefoxCookie = "cookies.sqlite" - fileFirefoxPassword = "logins.json" - fileFirefoxData = "places.sqlite" + fileFirefoxKey4 = "key4.db" + fileFirefoxCookie = "cookies.sqlite" + fileFirefoxPassword = "logins.json" + fileFirefoxData = "places.sqlite" + fileFirefoxLocalStorage = "webappsstore.sqlite" ) const ( @@ -45,7 +46,7 @@ const ( TempFirefoxBookmark = "firefoxBookmark" TempFirefoxHistory = "firefoxHistory" TempFirefoxDownload = "firefoxDownload" + TempFirefoxLocalStorage = "firefoxLocalStorage" TempFirefoxCreditCard = "" - TempFirefoxLocalStorage = "" TempFirefoxExtension = "" ) diff --git a/internal/item/item.go b/internal/item/item.go index c2fb49a..df8eac3 100644 --- a/internal/item/item.go +++ b/internal/item/item.go @@ -62,7 +62,7 @@ func (i Item) FileName() string { case FirefoxDownload: return fileFirefoxData case FirefoxLocalStorage: - return UnsupportedItem + return fileFirefoxLocalStorage case FirefoxCreditCard: return UnsupportedItem case FirefoxHistory: @@ -111,7 +111,7 @@ func (i Item) String() string { case FirefoxHistory: return TempFirefoxHistory case FirefoxLocalStorage: - return UnsupportedItem + return TempFirefoxLocalStorage case FirefoxCreditCard: return UnsupportedItem case FirefoxExtension: @@ -139,9 +139,9 @@ var DefaultYandex = []Item{ ChromiumBookmark, ChromiumHistory, ChromiumDownload, - ChromiumLocalStorage, ChromiumExtension, YandexPassword, + ChromiumLocalStorage, YandexCreditCard, } diff --git a/internal/utils/typeutil/typeutil.go b/internal/utils/typeutil/typeutil.go index 986585b..bbb7825 100644 --- a/internal/utils/typeutil/typeutil.go +++ b/internal/utils/typeutil/typeutil.go @@ -23,6 +23,14 @@ func IntToBool[T constraints.Signed](a T) bool { return true } +func Reverse[T any](s []T) []T { + var h = make([]T, len(s)) + for i := 0; i < len(s); i++ { + h[i] = s[len(s)-i-1] + } + return h +} + func TimeStamp(stamp int64) time.Time { s := time.Unix(stamp, 0) if s.Local().Year() > 9999 { diff --git a/internal/utils/typeutil/typeutil_test.go b/internal/utils/typeutil/typeutil_test.go new file mode 100644 index 0000000..849ede3 --- /dev/null +++ b/internal/utils/typeutil/typeutil_test.go @@ -0,0 +1,24 @@ +package typeutil + +import ( + "testing" +) + +var ( + reverseTestCases = [][]any{ + []any{1, 2, 3, 4, 5}, + []any{"1", "2", "3", "4", "5"}, + []any{"1", 2, "3", "4", 5}, + } +) + +func TestReverse(t *testing.T) { + for _, ts := range reverseTestCases { + h := Reverse(ts) + for i := 0; i < len(ts); i++ { + if h[len(h)-i-1] != ts[i] { + t.Errorf("reverse failed %v != %v", h, ts) + } + } + } +}