Fixes and bump version to 20240301 (#19)

google · Mar 1, 2024 · c96b8ab · c96b8ab
1 parent d154447
commit c96b8ab
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/.github/workflows/pypi-publish.yml b/.github/workflows/pypi-publish.yml
@@ -76,6 +76,7 @@ jobs:
       run: >-
         gh release create
         '${{ github.ref_name }}'
+        --verify-tag
         --repo '${{ github.repository }}'
         --notes ""
     - name: Upload artifact signatures to GitHub Release

diff --git a/dfindexeddb/indexeddb/chromium.py b/dfindexeddb/indexeddb/chromium.py
@@ -404,7 +404,7 @@ def FromStream(
       The decoded key.
     """
     decoder = utils.LevelDBDecoder(stream)
-    key_prefix = KeyPrefix.FromDecoder(decoder)
+    key_prefix = KeyPrefix.FromDecoder(decoder, base_offset=base_offset)
     return cls.FromDecoder(
         decoder=decoder, key_prefix=key_prefix, base_offset=base_offset)
 
@@ -1027,7 +1027,7 @@ def FromDecoder(
         definitions.KeyPrefixType.OBJECT_STORE_DATA):
       raise errors.ParserError('Invalid KeyPrefix for ObjectStoreDataKey')
     offset = decoder.stream.tell()
-    encoded_user_key = IDBKey.FromDecoder(decoder, base_offset)
+    encoded_user_key = IDBKey.FromDecoder(decoder, offset)
     return cls(
         offset=base_offset + offset,
         key_prefix=key_prefix, encoded_user_key=encoded_user_key)
@@ -1054,7 +1054,7 @@ def FromDecoder(
   ) -> ExistsEntryKey:
     """Decodes the exists entry key."""
     offset = decoder.stream.tell()
-    encoded_user_key = IDBKey.FromDecoder(decoder, base_offset)
+    encoded_user_key = IDBKey.FromDecoder(decoder, offset)
 
     return cls(
         offset=base_offset + offset,
@@ -1085,15 +1085,17 @@ def FromDecoder(cls, decoder: utils.LevelDBDecoder, key_prefix: KeyPrefix,
                  base_offset: int = 0) -> IndexDataKey:
     """Decodes the index data key."""
     offset = decoder.stream.tell()
-    encoded_user_key = IDBKey.FromDecoder(decoder, base_offset)
+    encoded_user_key = IDBKey.FromDecoder(decoder, offset)
 
     if decoder.NumRemainingBytes() > 0:
       _, sequence_number = decoder.DecodeVarint()
     else:
       sequence_number = None
 
     if decoder.NumRemainingBytes() > 0:
-      encoded_primary_key = IDBKey.FromDecoder(decoder, base_offset)
+      encoded_primary_key_offset = decoder.stream.tell()
+      encoded_primary_key = IDBKey.FromDecoder(
+          decoder, encoded_primary_key_offset)
     else:
       encoded_primary_key = None
 
@@ -1126,7 +1128,7 @@ def FromDecoder(
   ) -> BlobEntryKey:
     """Decodes the blob entry key."""
     offset = decoder.stream.tell()
-    user_key = IDBKey.FromDecoder(decoder, base_offset)
+    user_key = IDBKey.FromDecoder(decoder, offset)
 
     return cls(key_prefix=key_prefix, user_key=user_key,
                offset=base_offset + offset)

diff --git a/dfindexeddb/version.py b/dfindexeddb/version.py
@@ -14,7 +14,7 @@
 # limitations under the License.
 """Version information for dfIndexeddb."""
 
-__version__ = "20240229"
+__version__ = "20240301"
 
 
 def GetVersion():

diff --git a/pyproject.toml b/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "dfindexeddb"
-version = "20240229"
+version = "20240301"
 requires-python = ">=3.8"
 description = "dfindexeddb is an experimental Python tool for performing digital forensic analysis of IndexedDB and leveldb files."
 license = {file = "LICENSE"}