|
57 | 57 | queryChromiumCookie = `SELECT name, encrypted_value, host_key, path, creation_utc, expires_utc, is_secure, is_httponly, has_expires, is_persistent FROM cookies` |
58 | 58 | queryFirefoxHistory = `SELECT id, url, last_visit_date, title, visit_count FROM moz_places` |
59 | 59 | queryFirefoxDownload = `SELECT place_id, GROUP_CONCAT(content), url, dateAdded FROM (SELECT * FROM moz_annos INNER JOIN moz_places ON moz_annos.place_id=moz_places.id) t GROUP BY place_id` |
60 | | - queryFirefoxBookMarks = `SELECT id, fk, type, dateAdded, title FROM moz_bookmarks` |
| 60 | + queryFirefoxBookMarks = `SELECT id, url, type, dateAdded, title FROM (SELECT * FROM moz_bookmarks INNER JOIN moz_places ON moz_bookmarks.fk=moz_places.id)` |
61 | 61 | queryFirefoxCookie = `SELECT name, value, host, path, creationTime, expiry, isSecure, isHttpOnly FROM moz_cookies` |
62 | 62 | queryMetaData = `SELECT item1, item2 FROM metaData WHERE id = 'password'` |
63 | 63 | queryNssPrivate = `SELECT a11, a102 from nssPrivate` |
@@ -146,10 +146,10 @@ func (b *bookmarks) FirefoxParse() error { |
146 | 146 | } |
147 | 147 | for bookmarkRows.Next() { |
148 | 148 | var ( |
149 | | - id, fk, bType, dateAdded int64 |
150 | | - title string |
| 149 | + id, bType, dateAdded int64 |
| 150 | + title, url string |
151 | 151 | ) |
152 | | - err = bookmarkRows.Scan(&id, &fk, &bType, &dateAdded, &title) |
| 152 | + err = bookmarkRows.Scan(&id, &url, &bType, &dateAdded, &title) |
153 | 153 | if err != nil { |
154 | 154 | log.Warn(err) |
155 | 155 | } |
|
0 commit comments