dissect.database 1.1.dev13__tar.gz → 1.1.dev15__tar.gz

{dissect_database-1.1.dev13/dissect.database.egg-info → dissect_database-1.1.dev15}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dissect.database
-Version: 1.1.dev13
+Version: 1.1.dev15
 Summary: A Dissect module implementing parsers for various database formats, including Berkeley DB, Microsofts Extensible Storage Engine (ESE) and SQLite3
 Author-email: Dissect Team <dissect@fox-it.com>
 License-Expression: Apache-2.0

{dissect_database-1.1.dev13 → dissect_database-1.1.dev15}/dissect/database/ese/ntds/objects/object.py

@@ -147,6 +147,11 @@ class Object:
         """Return the object's name."""
         return self.get("name")
 
+    @property
+    def cn(self) -> str | None:
+        """Return the object's Common Name (CN)."""
+        return self.get("cn")
+
     @property
     def object_category(self) -> str | None:
         """Return the object's objectCategory."""

{dissect_database-1.1.dev13 → dissect_database-1.1.dev15}/dissect/database/ese/ntds/objects/top.py

@@ -14,3 +14,8 @@ class Top(Object):
 
     def __repr_body__(self) -> str:
         return f"name={self.name!r}"
+
+    @property
+    def display_name(self) -> str | None:
+        """Return the displayName for this object."""
+        return self.get("displayName")

{dissect_database-1.1.dev13 → dissect_database-1.1.dev15}/dissect/database/sqlite3/encryption/sqlcipher/sqlcipher.py

@@ -150,7 +150,7 @@ class SQLCipher(SQLite3):
             f"fh={self.cipher_path or self.cipher_fh} "
             f"wal={self.wal} "
             f"checkpoint={bool(self.checkpoint)} "
-            f"pages={self.header.page_count}>"
+            f"pages={self.page_count}>"
         )
 
     def close(self) -> None:

{dissect_database-1.1.dev13 → dissect_database-1.1.dev15}/dissect/database/sqlite3/sqlite3.py

@@ -129,10 +129,13 @@ class SQLite3:
         else:
             self.checkpoint = checkpoint
 
+        # Determine the highest page count we have encountered while parsing the SQLite3 header and optionally WAL.
+        self.page_count = max(self.header.page_count, self.wal.highest_page_num) if self.wal else self.header.page_count
+
         self.page = lru_cache(256)(self.page)
 
     def __repr__(self) -> str:
-        return f"<SQLite3 path={self.path!s} fh={self.fh!s} wal={self.wal!s} checkpoint={bool(self.checkpoint)!r} pages={self.header.page_count!r}>"  # noqa: E501
+        return f"<SQLite3 path={self.path} fh={self.fh} wal={self.wal} checkpoint={bool(self.checkpoint)} pages={self.page_count}>"  # noqa: E501
 
     def __enter__(self) -> Self:
         """Return ``self`` upon entering the runtime context."""
@@ -202,7 +205,7 @@ class SQLite3:
         """
         # Only throw an out of bounds exception if the header contains a page_count.
         # Some old versions of SQLite3 do not set/update the page_count correctly.
-        if (num < 1 or num > self.header.page_count) and self.header.page_count > 0:
+        if (num < 1 or num > self.page_count) and self.page_count > 0:
             raise InvalidPageNumber("Page number exceeds boundaries")
 
         data = None
@@ -235,7 +238,7 @@ class SQLite3:
         return Page(self, num)
 
     def pages(self) -> Iterator[Page]:
-        for i in range(self.header.page_count):
+        for i in range(self.page_count):
             yield self.page(i + 1)
 
     def cells(self) -> Iterator[Cell]:

{dissect_database-1.1.dev13 → dissect_database-1.1.dev15}/dissect/database/sqlite3/wal.py

@@ -39,6 +39,7 @@ class WAL:
             raise InvalidDatabase("Invalid WAL header magic")
 
         self.checksum_endian = "<" if self.header.magic == WAL_HEADER_MAGIC_LE else ">"
+        self.highest_page_num = max(fr.page_number for commit in self.commits for fr in commit.frames if fr.valid)
 
         self.frame = lru_cache(1024)(self.frame)
 

{dissect_database-1.1.dev13 → dissect_database-1.1.dev15/dissect.database.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dissect.database
-Version: 1.1.dev13
+Version: 1.1.dev15
 Summary: A Dissect module implementing parsers for various database formats, including Berkeley DB, Microsofts Extensible Storage Engine (ESE) and SQLite3
 Author-email: Dissect Team <dissect@fox-it.com>
 License-Expression: Apache-2.0

{dissect_database-1.1.dev13 → dissect_database-1.1.dev15}/tests/sqlite3/test_wal.py

@@ -5,6 +5,7 @@ from typing import TYPE_CHECKING
 import pytest
 
 from dissect.database.sqlite3 import sqlite3
+from tests._util import absolute_path
 
 if TYPE_CHECKING:
     from pathlib import Path
@@ -162,3 +163,39 @@ def _assert_checkpoint_3(s: sqlite3.SQLite3) -> None:
     assert rows[9].id == 11
     assert rows[9].name == "second checkpoint"
     assert rows[9].value == 101
+
+
+def test_wal_page_count() -> None:
+    """Test if we count the page numbers in the SQLite3 and WAL correctly.
+
+    Test data generated using:
+
+        $ sqlite3 tests/_data/sqlite3/page_count.db
+        SQLite version 3.45.1 2024-01-30 16:01:20
+        Enter ".help" for usage hints.
+        sqlite> PRAGMA journal_mode = WAL;
+        wal
+        sqlite> CREATE TABLE t1 (a, b);
+        sqlite> .quit  # commits wal
+
+        $ python
+        >>> import sqlite3
+        >>> con = sqlite3.connect("tests/_data/sqlite3/page_count.db")
+        ... cur = con.cursor()
+        >>> cur.execute("INSERT INTO t1 VALUES (1, ?)", ("A" * 8192,))
+        >>> con.commit()
+        # Copy page_count.db* files before closing
+    """
+
+    db = sqlite3.SQLite3(absolute_path("_data/sqlite3/page_count.db"))
+    table = db.table("t1")
+    assert table.sql == "CREATE TABLE t1 (a, b)"
+
+    row = next(table.rows())
+    assert row.a == 1
+    assert row.b == "A" * 8192
+
+    assert db.wal
+    assert db.wal.highest_page_num == 4
+    assert db.header.page_count == 2
+    assert db.page_count == 4