mirror of
https://github.com/moonD4rk/HackBrowserData.git
synced 2026-05-21 19:06:47 +02:00
fix(time): correct export data timestamp conversions (#586)
This commit is contained in:
@@ -28,7 +28,7 @@ func extractBookmarks(path string) ([]types.BookmarkEntry, error) {
|
||||
Name: title,
|
||||
URL: url,
|
||||
Folder: bookmarkType(bt),
|
||||
CreatedAt: timestamp(dateAdded / 1000000),
|
||||
CreatedAt: firefoxMicros(dateAdded),
|
||||
}, nil
|
||||
})
|
||||
if err != nil {
|
||||
|
||||
@@ -36,8 +36,8 @@ func extractCookies(path string) ([]types.CookieEntry, error) {
|
||||
IsHTTPOnly: isHTTPOnly != 0,
|
||||
HasExpire: hasExpire,
|
||||
IsPersistent: hasExpire,
|
||||
ExpireAt: timestamp(expiry),
|
||||
CreatedAt: timestamp(createdAt / 1000000),
|
||||
ExpireAt: firefoxSeconds(expiry),
|
||||
CreatedAt: firefoxMicros(createdAt),
|
||||
}, nil
|
||||
})
|
||||
if err != nil {
|
||||
|
||||
@@ -32,7 +32,7 @@ func extractDownloads(path string) ([]types.DownloadEntry, error) {
|
||||
|
||||
entry := types.DownloadEntry{
|
||||
URL: url,
|
||||
StartTime: timestamp(dateAdded / 1000000),
|
||||
StartTime: firefoxMicros(dateAdded),
|
||||
}
|
||||
|
||||
// Firefox stores download metadata as: "target_path,{json}"
|
||||
@@ -42,7 +42,7 @@ func extractDownloads(path string) ([]types.DownloadEntry, error) {
|
||||
entry.TargetPath = contentList[0]
|
||||
json := "{" + contentList[1]
|
||||
entry.TotalBytes = gjson.Get(json, "fileSize").Int()
|
||||
entry.EndTime = timestamp(gjson.Get(json, "endTime").Int() / 1000)
|
||||
entry.EndTime = firefoxMillis(gjson.Get(json, "endTime").Int())
|
||||
} else {
|
||||
entry.TargetPath = content
|
||||
}
|
||||
|
||||
@@ -27,7 +27,7 @@ func extractHistories(path string) ([]types.HistoryEntry, error) {
|
||||
URL: url,
|
||||
Title: title,
|
||||
VisitCount: visitCount,
|
||||
LastVisit: timestamp(lastVisit / 1000000),
|
||||
LastVisit: firefoxMicros(lastVisit),
|
||||
}, nil
|
||||
})
|
||||
if err != nil {
|
||||
|
||||
@@ -68,7 +68,7 @@ func extractPasswords(masterKey []byte, path string) ([]types.LoginEntry, error)
|
||||
URL: url,
|
||||
Username: string(user),
|
||||
Password: string(pwd),
|
||||
CreatedAt: timestamp(v.Get("timeCreated").Int() / 1000),
|
||||
CreatedAt: firefoxMillis(v.Get("timeCreated").Int()),
|
||||
})
|
||||
}
|
||||
if decryptFails > 0 {
|
||||
|
||||
@@ -288,11 +288,38 @@ func resolveSourcePaths(sources map[types.Category][]sourcePath, profileDir stri
|
||||
return resolved
|
||||
}
|
||||
|
||||
// timestamp converts a Unix epoch timestamp (seconds) to a time.Time.
|
||||
func timestamp(stamp int64) time.Time {
|
||||
s := time.Unix(stamp, 0)
|
||||
if s.Local().Year() > 9999 {
|
||||
return time.Date(9999, 12, 13, 23, 59, 59, 0, time.Local)
|
||||
// Firefox uses three timestamp units. Helpers emit UTC and return the zero
|
||||
// time.Time for non-positive or out-of-JSON-range input.
|
||||
//
|
||||
// - firefoxMicros: PRTime (μs since Unix epoch) — moz_* tables.
|
||||
// - firefoxMillis: Date.now() (ms) — logins.json, download endTime.
|
||||
// - firefoxSeconds: seconds — moz_cookies.expiry only.
|
||||
func firefoxMicros(us int64) time.Time {
|
||||
if us <= 0 {
|
||||
return time.Time{}
|
||||
}
|
||||
return s
|
||||
return clampJSON(time.UnixMicro(us).UTC())
|
||||
}
|
||||
|
||||
func firefoxMillis(ms int64) time.Time {
|
||||
if ms <= 0 {
|
||||
return time.Time{}
|
||||
}
|
||||
return clampJSON(time.UnixMilli(ms).UTC())
|
||||
}
|
||||
|
||||
func firefoxSeconds(s int64) time.Time {
|
||||
if s <= 0 {
|
||||
return time.Time{}
|
||||
}
|
||||
return clampJSON(time.Unix(s, 0).UTC())
|
||||
}
|
||||
|
||||
// clampJSON maps years outside time.Time.MarshalJSON's [1, 9999] window
|
||||
// to the zero time, so JSON export can't crash on sentinel inputs.
|
||||
func clampJSON(t time.Time) time.Time {
|
||||
if t.Year() < 1 || t.Year() > 9999 {
|
||||
return time.Time{}
|
||||
}
|
||||
return t
|
||||
}
|
||||
|
||||
@@ -4,6 +4,7 @@ import (
|
||||
"os"
|
||||
"path/filepath"
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"github.com/stretchr/testify/assert"
|
||||
"github.com/stretchr/testify/require"
|
||||
@@ -315,3 +316,79 @@ func TestExtractCategory(t *testing.T) {
|
||||
assert.Empty(t, data.SessionStorage)
|
||||
})
|
||||
}
|
||||
|
||||
// Anchor: 2024-01-15T10:30:00Z.
|
||||
const anchorUnixSeconds = int64(1705314600)
|
||||
|
||||
func TestFirefoxMicros_AnchorDate(t *testing.T) {
|
||||
got := firefoxMicros(anchorUnixSeconds * 1_000_000)
|
||||
want := time.Date(2024, 1, 15, 10, 30, 0, 0, time.UTC)
|
||||
assert.Equal(t, want, got)
|
||||
}
|
||||
|
||||
func TestFirefoxMicros_PrecisionPreserved(t *testing.T) {
|
||||
got := firefoxMicros(anchorUnixSeconds*1_000_000 + 123456)
|
||||
assert.Equal(t, 123456*int64(time.Microsecond), int64(got.Nanosecond()))
|
||||
}
|
||||
|
||||
func TestFirefoxMillis_AnchorDate(t *testing.T) {
|
||||
got := firefoxMillis(anchorUnixSeconds * 1_000)
|
||||
want := time.Date(2024, 1, 15, 10, 30, 0, 0, time.UTC)
|
||||
assert.Equal(t, want, got)
|
||||
}
|
||||
|
||||
func TestFirefoxMillis_PrecisionPreserved(t *testing.T) {
|
||||
got := firefoxMillis(anchorUnixSeconds*1_000 + 789)
|
||||
assert.Equal(t, 789*int64(time.Millisecond), int64(got.Nanosecond()))
|
||||
}
|
||||
|
||||
func TestFirefoxSeconds_AnchorDate(t *testing.T) {
|
||||
got := firefoxSeconds(anchorUnixSeconds)
|
||||
want := time.Date(2024, 1, 15, 10, 30, 0, 0, time.UTC)
|
||||
assert.Equal(t, want, got)
|
||||
}
|
||||
|
||||
func TestFirefoxHelpers_ZeroReturnsZeroTime(t *testing.T) {
|
||||
assert.True(t, firefoxMicros(0).IsZero(), "micros")
|
||||
assert.True(t, firefoxMillis(0).IsZero(), "millis")
|
||||
assert.True(t, firefoxSeconds(0).IsZero(), "seconds")
|
||||
}
|
||||
|
||||
func TestFirefoxHelpers_NegativeReturnsZeroTime(t *testing.T) {
|
||||
assert.True(t, firefoxMicros(-1).IsZero(), "micros")
|
||||
assert.True(t, firefoxMillis(-1).IsZero(), "millis")
|
||||
assert.True(t, firefoxSeconds(-1).IsZero(), "seconds")
|
||||
}
|
||||
|
||||
func TestFirefoxHelpers_AlwaysUTC(t *testing.T) {
|
||||
// assert.Same: pointer equality reliably catches any helper that
|
||||
// leaks time.Local, independent of the runner's configured TZ.
|
||||
assert.Same(t, time.UTC, firefoxMicros(anchorUnixSeconds*1_000_000).Location())
|
||||
assert.Same(t, time.UTC, firefoxMillis(anchorUnixSeconds*1_000).Location())
|
||||
assert.Same(t, time.UTC, firefoxSeconds(anchorUnixSeconds).Location())
|
||||
}
|
||||
|
||||
func TestFirefoxHelpers_SameMomentAcrossUnits(t *testing.T) {
|
||||
us := firefoxMicros(anchorUnixSeconds * 1_000_000)
|
||||
ms := firefoxMillis(anchorUnixSeconds * 1_000)
|
||||
s := firefoxSeconds(anchorUnixSeconds)
|
||||
assert.True(t, us.Equal(ms))
|
||||
assert.True(t, ms.Equal(s))
|
||||
}
|
||||
|
||||
func TestFirefoxHelpers_OutOfJSONRangeReturnsZero(t *testing.T) {
|
||||
for _, tc := range []struct {
|
||||
name string
|
||||
got time.Time
|
||||
}{
|
||||
{"seconds", firefoxSeconds(1 << 50)},
|
||||
{"millis", firefoxMillis(1 << 60)},
|
||||
{"micros", firefoxMicros(1 << 62)},
|
||||
} {
|
||||
t.Run(tc.name, func(t *testing.T) {
|
||||
b, err := tc.got.MarshalJSON()
|
||||
require.NoError(t, err)
|
||||
assert.JSONEq(t, `"0001-01-01T00:00:00Z"`, string(b))
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user