refactor: sync with origin/main

lxndrblz · Jan 7, 2024 · 8ec80e6 · 8ec80e6
2 parents 996b0a9 + 9dead97
commit 8ec80e6
Show file tree

Hide file tree

Showing 22 changed files with 15 additions and 171 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -6,6 +6,8 @@ jobs:
       runs-on: windows-latest
       steps:
       - uses: actions/checkout@v4
+        with:
+          submodules: recursive
       - name: Set up Python
         uses: actions/setup-python@v5
         with:
@@ -17,6 +19,8 @@ jobs:
       - name: Build binary 🔢
         run:  pyinstaller "main.spec"
       - name: Run conversion ↩️
-        run: .\dist\ms_teams_parser.exe -f ".\testdata\John Doe\IndexedDB\https_teams.microsoft.com_0.indexeddb.leveldb" -o "current_output.json"
+        run: |
+             .\dist\ms_teams_parser.exe -f ".\forensicsim-data\jane_doe_old_teams\IndexedDB\https_teams.microsoft.com_0.indexeddb.leveldb" -o "jane_doe.json"
+             .\dist\ms_teams_parser.exe -f ".\forensicsim-data\john_doe_old_teams\IndexedDB\https_teams.microsoft.com_0.indexeddb.leveldb" -o "john_doe.json"
       # - name: Calculate diff 👽
       #   run: git diff --no-index --word-diff expected_output/john_doe.json current_output.json
diff --git a/.gitmodules b/.gitmodules
@@ -4,3 +4,6 @@
 [submodule "utils\\ccl_chrome_indexeddb"]
 	path = utils\\ccl_chrome_indexeddb
 	url = https://github.com/cclgroupltd/ccl_chrome_indexeddb/
+[submodule "forensicsim-data"]
+	path = forensicsim-data
+	url = https://github.com/KarelZe/forensicsim-data.git
diff --git a/README.md b/README.md
@@ -53,7 +53,7 @@ either be processed by the Autopsy Plugin or in another application.
 The main parser script can be used like this:
 
 ```bash
-.\dist\ms_teams_parser.exe -f ".\testdata\John Doe\IndexedDB\https_teams.microsoft.com_0.indexeddb.leveldb" -o "C:\Temp\John Doe.json"
+.\dist\ms_teams_parser.exe -f ".\forensicsim-data\john_doe_old_teams\IndexedDB\https_teams.microsoft.com_0.indexeddb.leveldb" -o "john_doe.json"
 ```
 
 Feel free to use the LevelDB files provided in this repository.

diff --git a/forensicsim-data b/forensicsim-data
diff --git a/requirements.txt b/requirements.txt
@@ -1,15 +1,5 @@
-altgraph==0.17.4
-beautifulsoup4==4.9.3
-chardet==4.0.0
-click==8.0.4
-colorama==0.4.6
-dataclasses-json==0.6.3
-marshmallow==3.20.1
-mypy-extensions==1.0.0
-packaging==23.2
-pyfiglet==1.0.2
-pyinstaller==6.3.0
-pyinstaller-hooks-contrib==2023.12
-soupsieve==2.5
-typing-inspect==0.9.0
-typing_extensions==4.9.0
+chardet~=4.0.0
+pyfiglet~=0.8.post1
+colorama~=0.4.4
+beautifulsoup4~=4.9.3
+click~=8.0.1
diff --git a/testdata/Jane Doe/IndexedDB/https_teams.microsoft.com_0.indexeddb.leveldb/000114.ldb b/testdata/Jane Doe/IndexedDB/https_teams.microsoft.com_0.indexeddb.leveldb/000114.ldb
diff --git a/testdata/Jane Doe/IndexedDB/https_teams.microsoft.com_0.indexeddb.leveldb/000115.ldb b/testdata/Jane Doe/IndexedDB/https_teams.microsoft.com_0.indexeddb.leveldb/000115.ldb
diff --git a/testdata/Jane Doe/IndexedDB/https_teams.microsoft.com_0.indexeddb.leveldb/000116.ldb b/testdata/Jane Doe/IndexedDB/https_teams.microsoft.com_0.indexeddb.leveldb/000116.ldb
diff --git a/testdata/Jane Doe/IndexedDB/https_teams.microsoft.com_0.indexeddb.leveldb/000118.ldb b/testdata/Jane Doe/IndexedDB/https_teams.microsoft.com_0.indexeddb.leveldb/000118.ldb
diff --git a/testdata/Jane Doe/IndexedDB/https_teams.microsoft.com_0.indexeddb.leveldb/CURRENT b/testdata/Jane Doe/IndexedDB/https_teams.microsoft.com_0.indexeddb.leveldb/CURRENT
diff --git a/testdata/Jane Doe/IndexedDB/https_teams.microsoft.com_0.indexeddb.leveldb/LOCK b/testdata/Jane Doe/IndexedDB/https_teams.microsoft.com_0.indexeddb.leveldb/LOCK
diff --git a/testdata/Jane Doe/IndexedDB/https_teams.microsoft.com_0.indexeddb.leveldb/LOG b/testdata/Jane Doe/IndexedDB/https_teams.microsoft.com_0.indexeddb.leveldb/LOG
diff --git a/testdata/Jane Doe/IndexedDB/https_teams.microsoft.com_0.indexeddb.leveldb/LOG.old b/testdata/Jane Doe/IndexedDB/https_teams.microsoft.com_0.indexeddb.leveldb/LOG.old
diff --git a/testdata/Jane Doe/IndexedDB/https_teams.microsoft.com_0.indexeddb.leveldb/MANIFEST-000120 b/testdata/Jane Doe/IndexedDB/https_teams.microsoft.com_0.indexeddb.leveldb/MANIFEST-000120
diff --git a/testdata/John Doe/IndexedDB/https_teams.microsoft.com_0.indexeddb.leveldb/000115.ldb b/testdata/John Doe/IndexedDB/https_teams.microsoft.com_0.indexeddb.leveldb/000115.ldb
diff --git a/testdata/John Doe/IndexedDB/https_teams.microsoft.com_0.indexeddb.leveldb/000116.ldb b/testdata/John Doe/IndexedDB/https_teams.microsoft.com_0.indexeddb.leveldb/000116.ldb
diff --git a/testdata/John Doe/IndexedDB/https_teams.microsoft.com_0.indexeddb.leveldb/CURRENT b/testdata/John Doe/IndexedDB/https_teams.microsoft.com_0.indexeddb.leveldb/CURRENT
diff --git a/testdata/John Doe/IndexedDB/https_teams.microsoft.com_0.indexeddb.leveldb/LOCK b/testdata/John Doe/IndexedDB/https_teams.microsoft.com_0.indexeddb.leveldb/LOCK
diff --git a/testdata/John Doe/IndexedDB/https_teams.microsoft.com_0.indexeddb.leveldb/LOG b/testdata/John Doe/IndexedDB/https_teams.microsoft.com_0.indexeddb.leveldb/LOG
diff --git a/testdata/John Doe/IndexedDB/https_teams.microsoft.com_0.indexeddb.leveldb/LOG.old b/testdata/John Doe/IndexedDB/https_teams.microsoft.com_0.indexeddb.leveldb/LOG.old
diff --git a/testdata/John Doe/IndexedDB/https_teams.microsoft.com_0.indexeddb.leveldb/MANIFEST-000001 b/testdata/John Doe/IndexedDB/https_teams.microsoft.com_0.indexeddb.leveldb/MANIFEST-000001
diff --git a/utils/test.py b/utils/test.py