dfindexeddb 20240224__py3-none-any.whl → 20240225__py3-none-any.whl

dfindexeddb/leveldb/ldb.py

@@ -21,6 +21,7 @@ import os
 from typing import BinaryIO, Iterable, Tuple
 
 import snappy
+import zstd
 
 from dfindexeddb import utils
 
@@ -90,17 +91,24 @@ class LdbBlock:
   data: bytes = field(repr=False)
   footer: bytes  # 5 bytes = 1 byte compressed flag + 4 bytes checksum.
 
-  COMPRESSED = 1
+  SNAPPY_COMPRESSED = 1
+  ZSTD_COMPRESSED = 2
   RESTART_ENTRY_LENGTH = 4
 
-  def IsCompressed(self) -> bool:
-    """Returns true if the block is compressed."""
-    return self.footer[0] == self.COMPRESSED
+  def IsSnappyCompressed(self) -> bool:
+    """Returns true if the block is snappy compressed."""
+    return self.footer[0] == self.SNAPPY_COMPRESSED
+
+  def IsZstdCompressed(self) -> bool:
+    """Returns true if the block is zstd compressed."""
+    return self.footer[0] == self.ZSTD_COMPRESSED
 
   def GetBuffer(self) -> bytes:
     """Returns the block buffer, decompressing if required."""
-    if self.IsCompressed():
+    if self.IsSnappyCompressed():
       return snappy.decompress(self.data)
+    if self.IsZstdCompressed():
+      return zstd.decompress(self.data)
     return self.data
 
   def GetRecords(self) -> Iterable[LdbKeyValueRecord]:
@@ -246,8 +254,7 @@ class LdbFileReader:
       LdbKeyValueRecords.
     """
     for block in self.GetBlocks():
-      for record in block.GetRecords():
-        yield record
+      yield from block.GetRecords()
 
   def RangeIter(self) -> Iterable[Tuple[bytes, bytes]]:  #pylint: disable=C0103
     """Returns an iterator of key-value pairs.

dfindexeddb/leveldb/log.py

@@ -20,7 +20,6 @@ from enum import IntEnum
 import io
 from typing import BinaryIO, Generator, Iterable, Optional
 
-from dfindexeddb import errors
 from dfindexeddb import utils
 
 
@@ -198,11 +197,10 @@ class Block:
       LogFileRecord
     """
     buffer = io.BytesIO(self.data)
-    while True:
-      try:
-        yield PhysicalRecord.FromStream(buffer, base_offset=self.offset)
-      except errors.DecoderError:
-        return
+    buffer_length = len(self.data)
+
+    while buffer.tell() < buffer_length:
+      yield PhysicalRecord.FromStream(buffer, base_offset=self.offset)
 
   @classmethod
   def FromStream(cls, stream: BinaryIO) -> Optional[Block]:
@@ -212,7 +210,8 @@ class Block:
       stream: the binary stream to be parsed.
 
     Returns:
-      the Block or None if there is no data to read from the stream."""
+      the Block or None if there is no data to read from the stream.
+    """
     offset = stream.tell()
     data = stream.read(cls.BLOCK_SIZE)  # reads full and partial blocks
     if not data:
@@ -266,8 +265,7 @@ class LogFileReader:
       PhysicalRecord
     """
     for block in self.GetBlocks():
-      for physical_record in block.GetPhysicalRecords():
-        yield physical_record
+      yield from block.GetPhysicalRecords()
 
   def GetWriteBatches(self) -> Generator[WriteBatch, None, None]:
     """Returns an iterator of WriteBatch instances.
@@ -304,5 +302,4 @@ class LogFileReader:
       KeyValueRecord
     """
     for batch in self.GetWriteBatches():
-      for record in batch.records:
-        yield record
+      yield from batch.records

dfindexeddb/utils.py

@@ -68,10 +68,10 @@ class StreamDecoder:
     offset = self.stream.tell()
     buffer = self.stream.read(count)
     if count == -1 and not buffer:
-      raise errors.DecoderError('No bytes available')
+      raise errors.DecoderError(f'No bytes available at offset {offset}')
     if count != -1 and len(buffer) != count:
       raise errors.DecoderError(
-          f'Read {len(buffer)}, wanted {count}, at stream offset {offset}')
+          f'Read {len(buffer)} bytes, but wanted {count} at offset {offset}')
     return offset, buffer
 
   def PeekBytes(self, count: int) -> Tuple[int, bytes]:
@@ -225,7 +225,8 @@ class LevelDBDecoder(StreamDecoder):
     offset = self.stream.tell()
     buffer = self.stream.read()
     if len(buffer) % 2:
-      raise errors.DecoderError('Odd number of bytes encountered')
+      raise errors.DecoderError(
+          f'Odd number of bytes encountered at offset {offset}')
     return offset, buffer.decode('utf-16-be')
 
   def DecodeBlobWithLength(self) -> Tuple[int, bytes]:

dfindexeddb/version.py

@@ -14,7 +14,7 @@
 # limitations under the License.
 """Version information for dfIndexeddb."""
 
-__version__ = "20240224"
+__version__ = "20240225"
 
 
 def GetVersion():

{dfindexeddb-20240224.dist-info → dfindexeddb-20240225.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dfindexeddb
-Version: 20240224
+Version: 20240225
 Summary: dfindexeddb is an experimental Python tool for performing digital forensic analysis of IndexedDB and leveldb files.
 Author-email: Syd Pleno <sydp@google.com>
 Maintainer-email: dfIndexeddb Developers <dfindexeddb-dev@googlegroups.com>
@@ -218,6 +218,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 License-File: AUTHORS
 Requires-Dist: python-snappy ==0.6.1
+Requires-Dist: zstd ==1.5.5.1
 
 # dfIndexeddb
 

{dfindexeddb-20240224.dist-info → dfindexeddb-20240225.dist-info}/RECORD

@@ -1,18 +1,18 @@
 dfindexeddb/__init__.py,sha256=KPYL9__l8od6_OyDfGRTgaJ6iy_fqIgZ-dS2S-e3Rac,599
 dfindexeddb/errors.py,sha256=PNpwyf_lrPc4TE77oAakX3mu5D_YcP3f80wq8Y1LkvY,749
-dfindexeddb/utils.py,sha256=TG27xY8AjwNs_736ZaPHMERy1HiLv0E123PhPQ-JKKQ,10038
-dfindexeddb/version.py,sha256=-nNzbnRjBpknBvUjJZ8_2lFtuUdQv-yv4r8l78vkDRw,750
+dfindexeddb/utils.py,sha256=g9iiGRX4DB1wFBSBHa6b9lg7JzAdE0SN0DrdB2aS_Co,10091
+dfindexeddb/version.py,sha256=PiFacIFljjKL8Q1cSjdiapC9lqsgpPS4GDZDrPlBy4o,750
 dfindexeddb/indexeddb/__init__.py,sha256=kExXSVBCTKCD5BZJkdMfUMqGksH-DMJxP2_lI0gq-BE,575
 dfindexeddb/indexeddb/blink.py,sha256=MblpYfv-ByG7n_fjYKu2EUhpfVJdUveoW4oSAg5T4tY,3534
 dfindexeddb/indexeddb/chromium.py,sha256=N1aCoJETNqLER8T_C4bmfrxiNr1csJhUJ4-14qrl0nc,42291
 dfindexeddb/indexeddb/definitions.py,sha256=yline3y3gmZx6s-dwjpPDNs5HO4zT6KZqPWQfEsHDoM,7413
 dfindexeddb/indexeddb/v8.py,sha256=ldqpc9T1kG7BOdjnHjQ5hNO9OCXZ3_Zd6vRSpC-NrEA,21893
 dfindexeddb/leveldb/__init__.py,sha256=KPYL9__l8od6_OyDfGRTgaJ6iy_fqIgZ-dS2S-e3Rac,599
-dfindexeddb/leveldb/ldb.py,sha256=AE50TW7zxSUBbi9cmcUs63m_JKnrD24OQSCoamIJ4eU,7668
-dfindexeddb/leveldb/log.py,sha256=nNiycsC9uEmvBatjhsN37cWz0_3A6WBo5byv28-cZdg,8627
-dfindexeddb-20240224.dist-info/AUTHORS,sha256=QbvjbAom57fpEkekkCVFUj0B9KUMGraR510aUMBC-PE,286
-dfindexeddb-20240224.dist-info/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
-dfindexeddb-20240224.dist-info/METADATA,sha256=YoQCcGKgTzYH2j9hr2YjZSy5q6NC55IG2AAS-0Ht89Q,15444
-dfindexeddb-20240224.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-dfindexeddb-20240224.dist-info/top_level.txt,sha256=X9OTaub1c8S_JJ7g-f8JdkhhdiZ4x1j4eni1hdUCwE4,12
-dfindexeddb-20240224.dist-info/RECORD,,
+dfindexeddb/leveldb/ldb.py,sha256=uShhXjQe4Sz3dn54IXbGxRtE6D8RNpu1NDy5Zb0P9LA,7927
+dfindexeddb/leveldb/log.py,sha256=cyMfjDz5a6gfGb5NonxC1Y72OmHYBWzYK8UMVzP_umw,8532
+dfindexeddb-20240225.dist-info/AUTHORS,sha256=QbvjbAom57fpEkekkCVFUj0B9KUMGraR510aUMBC-PE,286
+dfindexeddb-20240225.dist-info/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
+dfindexeddb-20240225.dist-info/METADATA,sha256=ZRr-aOFy5SlgZ2nTgeaYpLCjauP7qzW5XSSsFCyeFOQ,15474
+dfindexeddb-20240225.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+dfindexeddb-20240225.dist-info/top_level.txt,sha256=X9OTaub1c8S_JJ7g-f8JdkhhdiZ4x1j4eni1hdUCwE4,12
+dfindexeddb-20240225.dist-info/RECORD,,