dissect.target 3.16.dev12__tar.gz → 3.16.dev13__tar.gz

{dissect.target-3.16.dev12/dissect.target.egg-info → dissect.target-3.16.dev13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dissect.target
-Version: 3.16.dev12
+Version: 3.16.dev13
 Summary: This module ties all other Dissect modules together, it provides a programming API and command line tools which allow easy access to various data sources inside disk images or file collections (a.k.a. targets)
 Author-email: Dissect Team <dissect@fox-it.com>
 License: Affero General Public License v3

{dissect.target-3.16.dev12 → dissect.target-3.16.dev13}/dissect/target/plugins/apps/browser/browser.py

@@ -43,6 +43,7 @@ GENERIC_COOKIE_FIELDS = [
     ("boolean", "is_secure"),
     ("boolean", "is_http_only"),
     ("boolean", "same_site"),
+    ("path", "source"),
 ]
 
 GENERIC_HISTORY_RECORD_FIELDS = [

{dissect.target-3.16.dev12 → dissect.target-3.16.dev13}/dissect/target/plugins/apps/browser/chrome.py

@@ -38,8 +38,7 @@ class ChromePlugin(ChromiumMixin, BrowserPlugin):
     )
 
     BrowserCookieRecord = create_extended_descriptor([UserRecordDescriptorExtension])(
-        "browser/chrome/cookie",
-        GENERIC_COOKIE_FIELDS,
+        "browser/chrome/cookie", GENERIC_COOKIE_FIELDS
     )
 
     BrowserDownloadRecord = create_extended_descriptor([UserRecordDescriptorExtension])(

{dissect.target-3.16.dev12 → dissect.target-3.16.dev13}/dissect/target/plugins/apps/browser/chromium.py

@@ -117,59 +117,60 @@ class ChromiumMixin:
         if not len(self._build_userdirs(self.DIRS)):
             raise UnsupportedPluginError("No Chromium-based browser directories found")
 
-    def downloads(self, browser_name: Optional[str] = None) -> Iterator[BrowserDownloadRecord]:
-        """Return browser download records from supported Chromium-based browsers.
+    def history(self, browser_name: Optional[str] = None) -> Iterator[BrowserHistoryRecord]:
+        """Return browser history records from supported Chromium-based browsers.
 
         Args:
             browser_name: The name of the browser as a string.
 
         Yields:
             Records with the following fields:
-                ts_start (datetime): Download start timestamp.
-                ts_end (datetime): Download end timestamp.
+                ts (datetime): Visit timestamp.
                 browser (string): The browser from which the records are generated from.
                 id (string): Record ID.
-                path (string): Download path.
-                url (uri): Download URL.
-                tab_url (string): Tab URL.
-                tab_referrer_url (string): Referrer URL.
-                size (varint): Download file size.
-                mime_type (string): MIME type.
-                state (varint): Download state number.
-                source: (path): The source file of the download record.
+                url (uri): History URL.
+                title (string): Page title.
+                description (string): Page description.
+                rev_host (string): Reverse hostname.
+                visit_type (varint): Visit type.
+                visit_count (varint): Amount of visits.
+                hidden (string): Hidden value.
+                typed (string): Typed value.
+                session (varint): Session value.
+                from_visit (varint): Record ID of the "from" visit.
+                from_url (uri): URL of the "from" visit.
+                source: (path): The source file of the history record.
         """
         for user, db_file, db in self._iter_db("History"):
             try:
-                download_chains = defaultdict(list)
-                for row in db.table("downloads_url_chains"):
-                    download_chains[row.id].append(row)
-
-                for chain in download_chains.values():
-                    chain.sort(key=lambda row: row.chain_index)
-
-                for row in db.table("downloads").rows():
-                    if download_path := row.target_path:
-                        download_path = self.target.fs.path(download_path)
+                urls = {row.id: row for row in db.table("urls").rows()}
+                visits = {}
 
-                    url = None
-                    download_chain = download_chains.get(row.id)
+                for row in db.table("visits").rows():
+                    visits[row.id] = row
+                    url = urls[row.url]
 
-                    if download_chain:
-                        url = download_chain[-1].url
-                        url = try_idna(url)
+                    if row.from_visit and row.from_visit in visits:
+                        from_visit = visits[row.from_visit]
+                        from_url = urls[from_visit.url]
+                    else:
+                        from_visit, from_url = None, None
 
-                    yield self.BrowserDownloadRecord(
-                        ts_start=webkittimestamp(row.start_time),
-                        ts_end=webkittimestamp(row.end_time) if row.end_time else None,
+                    yield self.BrowserHistoryRecord(
+                        ts=webkittimestamp(row.visit_time),
                         browser=browser_name,
-                        id=row.get("id"),
-                        tab_url=try_idna(row.get("tab_url")),
-                        tab_referrer_url=try_idna(row.get("tab_referrer_url")),
-                        path=download_path,
-                        url=url,
-                        size=row.get("total_bytes"),
-                        mime_type=row.get("mime_type"),
-                        state=row.get("state"),
+                        id=row.id,
+                        url=try_idna(url.url),
+                        title=url.title,
+                        description=None,
+                        rev_host=None,
+                        visit_type=None,
+                        visit_count=url.visit_count,
+                        hidden=url.hidden,
+                        typed=None,
+                        session=None,
+                        from_visit=row.from_visit or None,
+                        from_url=try_idna(from_url.url) if from_url else None,
                         source=db_file,
                         _target=self.target,
                         _user=user,
@@ -212,11 +213,72 @@ class ChromiumMixin:
                         is_secure=bool(cookie.is_secure),
                         is_http_only=bool(cookie.is_httponly),
                         same_site=bool(cookie.samesite),
+                        source=db_file,
                         _user=user,
                     )
             except SQLError as e:
                 self.target.log.warning("Error processing cookie file: %s", db_file, exc_info=e)
 
+    def downloads(self, browser_name: Optional[str] = None) -> Iterator[BrowserDownloadRecord]:
+        """Return browser download records from supported Chromium-based browsers.
+
+        Args:
+            browser_name: The name of the browser as a string.
+
+        Yields:
+            Records with the following fields:
+                ts_start (datetime): Download start timestamp.
+                ts_end (datetime): Download end timestamp.
+                browser (string): The browser from which the records are generated from.
+                id (string): Record ID.
+                path (string): Download path.
+                url (uri): Download URL.
+                tab_url (string): Tab URL.
+                tab_referrer_url (string): Referrer URL.
+                size (varint): Download file size.
+                mime_type (string): MIME type.
+                state (varint): Download state number.
+                source: (path): The source file of the download record.
+        """
+        for user, db_file, db in self._iter_db("History"):
+            try:
+                download_chains = defaultdict(list)
+                for row in db.table("downloads_url_chains"):
+                    download_chains[row.id].append(row)
+
+                for chain in download_chains.values():
+                    chain.sort(key=lambda row: row.chain_index)
+
+                for row in db.table("downloads").rows():
+                    if download_path := row.target_path:
+                        download_path = self.target.fs.path(download_path)
+
+                    url = None
+                    download_chain = download_chains.get(row.id)
+
+                    if download_chain:
+                        url = download_chain[-1].url
+                        url = try_idna(url)
+
+                    yield self.BrowserDownloadRecord(
+                        ts_start=webkittimestamp(row.start_time),
+                        ts_end=webkittimestamp(row.end_time) if row.end_time else None,
+                        browser=browser_name,
+                        id=row.get("id"),
+                        tab_url=try_idna(row.get("tab_url")),
+                        tab_referrer_url=try_idna(row.get("tab_referrer_url")),
+                        path=download_path,
+                        url=url,
+                        size=row.get("total_bytes"),
+                        mime_type=row.get("mime_type"),
+                        state=row.get("state"),
+                        source=db_file,
+                        _target=self.target,
+                        _user=user,
+                    )
+            except SQLError as e:
+                self.target.log.warning("Error processing history file: %s", db_file, exc_info=e)
+
     def extensions(self, browser_name: Optional[str] = None) -> Iterator[BrowserExtensionRecord]:
         """Iterates over all installed extensions for a given browser.
 
@@ -303,67 +365,6 @@ class ChromiumMixin:
                 except (AttributeError, KeyError) as e:
                     self.target.log.info("No browser extensions found in: %s", json_file, exc_info=e)
 
-    def history(self, browser_name: Optional[str] = None) -> Iterator[BrowserHistoryRecord]:
-        """Return browser history records from supported Chromium-based browsers.
-
-        Args:
-            browser_name: The name of the browser as a string.
-
-        Yields:
-            Records with the following fields:
-                ts (datetime): Visit timestamp.
-                browser (string): The browser from which the records are generated from.
-                id (string): Record ID.
-                url (uri): History URL.
-                title (string): Page title.
-                description (string): Page description.
-                rev_host (string): Reverse hostname.
-                visit_type (varint): Visit type.
-                visit_count (varint): Amount of visits.
-                hidden (string): Hidden value.
-                typed (string): Typed value.
-                session (varint): Session value.
-                from_visit (varint): Record ID of the "from" visit.
-                from_url (uri): URL of the "from" visit.
-                source: (path): The source file of the history record.
-        """
-        for user, db_file, db in self._iter_db("History"):
-            try:
-                urls = {row.id: row for row in db.table("urls").rows()}
-                visits = {}
-
-                for row in db.table("visits").rows():
-                    visits[row.id] = row
-                    url = urls[row.url]
-
-                    if row.from_visit and row.from_visit in visits:
-                        from_visit = visits[row.from_visit]
-                        from_url = urls[from_visit.url]
-                    else:
-                        from_visit, from_url = None, None
-
-                    yield self.BrowserHistoryRecord(
-                        ts=webkittimestamp(row.visit_time),
-                        browser=browser_name,
-                        id=row.id,
-                        url=try_idna(url.url),
-                        title=url.title,
-                        description=None,
-                        rev_host=None,
-                        visit_type=None,
-                        visit_count=url.visit_count,
-                        hidden=url.hidden,
-                        typed=None,
-                        session=None,
-                        from_visit=row.from_visit or None,
-                        from_url=try_idna(from_url.url) if from_url else None,
-                        source=db_file,
-                        _target=self.target,
-                        _user=user,
-                    )
-            except SQLError as e:
-                self.target.log.warning("Error processing history file: %s", db_file, exc_info=e)
-
 
 class ChromiumPlugin(ChromiumMixin, BrowserPlugin):
     """Chromium browser plugin."""

{dissect.target-3.16.dev12 → dissect.target-3.16.dev13}/dissect/target/plugins/apps/browser/edge.py

@@ -36,8 +36,7 @@ class EdgePlugin(ChromiumMixin, BrowserPlugin):
     )
 
     BrowserCookieRecord = create_extended_descriptor([UserRecordDescriptorExtension])(
-        "browser/edge/cookie",
-        GENERIC_COOKIE_FIELDS,
+        "browser/edge/cookie", GENERIC_COOKIE_FIELDS
     )
 
     BrowserDownloadRecord = create_extended_descriptor([UserRecordDescriptorExtension])(

{dissect.target-3.16.dev12 → dissect.target-3.16.dev13}/dissect/target/plugins/apps/browser/firefox.py

@@ -176,6 +176,7 @@ class FirefoxPlugin(BrowserPlugin):
                         is_secure=bool(cookie.isSecure),
                         is_http_only=bool(cookie.isHttpOnly),
                         same_site=bool(cookie.sameSite),
+                        source=db_file,
                         _user=user,
                     )
             except SQLError as e:

{dissect.target-3.16.dev12 → dissect.target-3.16.dev13/dissect.target.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dissect.target
-Version: 3.16.dev12
+Version: 3.16.dev13
 Summary: This module ties all other Dissect modules together, it provides a programming API and command line tools which allow easy access to various data sources inside disk images or file collections (a.k.a. targets)
 Author-email: Dissect Team <dissect@fox-it.com>
 License: Affero General Public License v3