From 0e235d6fb98143c8deda0477464300e0ee535ae1 Mon Sep 17 00:00:00 2001 From: Markus Bilz Date: Sat, 6 Jan 2024 19:01:56 +0100 Subject: [PATCH 01/12] refactor: add 'dependabot.yaml' --- .github/dependabot.yaml | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 .github/dependabot.yaml diff --git a/.github/dependabot.yaml b/.github/dependabot.yaml new file mode 100644 index 0000000..74217de --- /dev/null +++ b/.github/dependabot.yaml @@ -0,0 +1,23 @@ +# To get started with Dependabot version updates, you'll need to specify which +# package ecosystems to update and where the package manifests are located. +# Please see the documentation for all configuration options: +# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates + +version: 2 +updates: + # Maintain dependencies for pip + - package-ecosystem: "pip" + directory: "/" # Location of package manifests + schedule: + interval: "daily" + assignees: + - "lxndrblz" + - "KarelZe" + # Maintain dependencies for GitHub Actions + - package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "daily" + assignees: + - "lxndrblz" + - "KarelZe" \ No newline at end of file From d275807987d2bfb9421ff9c345066da8ed81f62a Mon Sep 17 00:00:00 2001 From: Markus Bilz Date: Sat, 6 Jan 2024 19:39:28 +0100 Subject: [PATCH 02/12] =?UTF-8?q?refactor:=20add=20github=20action=20for?= =?UTF-8?q?=20release=20+=20remove=20travis=20=F0=9F=90=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/release.yaml | 28 ++++++++++++++++++++++++++++ .gitignore | 5 ++++- .travis.yml | 23 ----------------------- README.md | 2 +- 4 files changed, 33 insertions(+), 25 deletions(-) create mode 100644 .github/workflows/release.yaml delete mode 100644 .travis.yml diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml new file mode 100644 index 0000000..c4552bb --- /dev/null +++ b/.github/workflows/release.yaml @@ -0,0 +1,28 @@ +on: + release: + types: [published] +permissions: + contents: write +jobs: + build: + name: Build exectuable 📦 + runs-on: windows + steps: + - uses: actions/checkout@v4 + - name: Set up Python + uses: actions/setup-python@v5 + with: + python-version: "3.9" + - name: Install dependencies + run: | + python -m pip install --upgrade pip + python -m pip install -r requirements.txt pyinstaller + - name: Build binary + run: pyinstaller "main.spec" + - name: Upload artifacts to GitHub Release + env: + GITHUB_TOKEN: ${{ github.token }} + run: >- + gh release upload + '${{ github.ref_name }}' dist/*exe + --repo '${{ github.repository }}' \ No newline at end of file diff --git a/.gitignore b/.gitignore index 5e9695b..6b64ff1 100644 --- a/.gitignore +++ b/.gitignore @@ -125,4 +125,7 @@ dmypy.json .idea/ -.jython_cache/ \ No newline at end of file +.jython_cache/ + +venv/ +env/ \ No newline at end of file diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index cfdd040..0000000 --- a/.travis.yml +++ /dev/null @@ -1,23 +0,0 @@ -os: windows -language: shell -before_install: - - choco install python --version=3.9 - - python -m pip install --upgrade pip -env: PATH=/c/Python39:/c/Python39/Scripts:$PATH -install: - - pip install https://github.com/pyinstaller/pyinstaller/archive/develop.tar.gz - - pip install -r requirements.txt -script: - - bash -c echo "Tests would go here" -before_deploy: - - pyinstaller "main.spec" -deploy: - provider: releases - api_key: $RELEASE_TOKEN - file_glob: true - file: dist/*.exe - skip_cleanup: true - draft: false - on: - tags: true - name: $TRAVIS_TAG \ No newline at end of file diff --git a/README.md b/README.md index e3b5e3f..2dcde38 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # Forensics.im Microsoft Teams Parser & Autopsy Plugin 🕵️‍♂️ [![MIT License](https://img.shields.io/apm/l/atomic-design-ui.svg?)](https://github.com/lxndrblz/forensicsim/blob/main/LICENSE.md) -![Build Status](https://www.travis-ci.com/lxndrblz/forensicsim.svg?token=ts66FZeijedzeqpkgTit&branch=main) +![Build Status](https://img.shields.io/github/actions/workflow/status/lxndrblz/forensicsim/release.yaml) Forensics.im is an Autopsy Plugin, which allows parsing *levelDB* of modern Electron-based Instant Messenger Applications like Microsoft Teams. Unlike the From 25a498c3cdc0da15f55049de787236b1d5c500b9 Mon Sep 17 00:00:00 2001 From: Markus Bilz Date: Sat, 6 Jan 2024 19:51:28 +0100 Subject: [PATCH 03/12] refactor: test gh release action --- .github/workflows/release.yaml | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index c4552bb..e143fdb 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -1,6 +1,7 @@ on: - release: - types: [published] + # release: + # types: [published] + workflow_dispatch: permissions: contents: write jobs: @@ -19,10 +20,10 @@ jobs: python -m pip install -r requirements.txt pyinstaller - name: Build binary run: pyinstaller "main.spec" - - name: Upload artifacts to GitHub Release - env: - GITHUB_TOKEN: ${{ github.token }} - run: >- - gh release upload - '${{ github.ref_name }}' dist/*exe - --repo '${{ github.repository }}' \ No newline at end of file + # - name: Upload artifacts to GitHub Release + # env: + # GITHUB_TOKEN: ${{ github.token }} + # run: >- + # gh release upload + # '${{ github.ref_name }}' dist/*exe + # --repo '${{ github.repository }}' \ No newline at end of file From e3ff8d3a50e1548fa771ca39f41598cc606bd8f3 Mon Sep 17 00:00:00 2001 From: Markus Bilz Date: Sat, 6 Jan 2024 19:52:28 +0100 Subject: [PATCH 04/12] refactor: run action on push --- .github/workflows/release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index e143fdb..7e495d3 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -1,7 +1,7 @@ on: # release: # types: [published] - workflow_dispatch: + push: permissions: contents: write jobs: From 6becc02326311b774e2920e533a4a74dfe43843f Mon Sep 17 00:00:00 2001 From: Markus Bilz Date: Sat, 6 Jan 2024 20:01:45 +0100 Subject: [PATCH 05/12] refactor: fix os name --- .github/workflows/release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 7e495d3..b582df3 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -7,7 +7,7 @@ permissions: jobs: build: name: Build exectuable 📦 - runs-on: windows + runs-on: windows-latest steps: - uses: actions/checkout@v4 - name: Set up Python From 6c55a3c84267272ebd115fc14f3709739dcd18c2 Mon Sep 17 00:00:00 2001 From: Markus Bilz Date: Sat, 6 Jan 2024 20:06:23 +0100 Subject: [PATCH 06/12] refactor update dependency of pyfiglet --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 0a42b4a..8733fd9 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ setuptools~=57.0.0 chardet~=4.0.0 -pyfiglet~=0.8.post1 +pyfiglet~=1.0.2 colorama~=0.4.4 beautifulsoup4~=4.9.3 click~=8.0.1 \ No newline at end of file From ea9add9e3df99cf63e4cd19b674b4a48cbea2a7d Mon Sep 17 00:00:00 2001 From: Markus Bilz Date: Sat, 6 Jan 2024 20:20:24 +0100 Subject: [PATCH 07/12] refactor: update path in 'main.spec' --- main.spec | 2 +- requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/main.spec b/main.spec index 023eb0a..d3dadd8 100644 --- a/main.spec +++ b/main.spec @@ -5,7 +5,7 @@ block_cipher = None a = Analysis(['utils\\main.py'], binaries=[], - datas=[('C:/Python39/Lib/site-packages/pyfiglet', 'pyfiglet')], + datas=[('c:\hostedtoolcache\windows\python\*\x64\lib\site-packages\pyfiglet', 'pyfiglet')], hiddenimports=[], hookspath=[], runtime_hooks=[], diff --git a/requirements.txt b/requirements.txt index 8733fd9..0a42b4a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ setuptools~=57.0.0 chardet~=4.0.0 -pyfiglet~=1.0.2 +pyfiglet~=0.8.post1 colorama~=0.4.4 beautifulsoup4~=4.9.3 click~=8.0.1 \ No newline at end of file From f248322c1417a53d0b3eb48afee0b1647a3b53bb Mon Sep 17 00:00:00 2001 From: Markus Bilz Date: Sat, 6 Jan 2024 20:22:26 +0100 Subject: [PATCH 08/12] refactor: remove wildcard from data path --- main.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.spec b/main.spec index d3dadd8..9e805f9 100644 --- a/main.spec +++ b/main.spec @@ -5,7 +5,7 @@ block_cipher = None a = Analysis(['utils\\main.py'], binaries=[], - datas=[('c:\hostedtoolcache\windows\python\*\x64\lib\site-packages\pyfiglet', 'pyfiglet')], + datas=[('c:\hostedtoolcache\windows\python\3.9.13\x64\lib\site-packages\pyfiglet', 'pyfiglet')], hiddenimports=[], hookspath=[], runtime_hooks=[], From 4f03583ff9442202b2d04c8e40af883e0b9e22c9 Mon Sep 17 00:00:00 2001 From: Markus Bilz Date: Sat, 6 Jan 2024 20:26:38 +0100 Subject: [PATCH 09/12] refactor: add trailing slash --- main.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.spec b/main.spec index 9e805f9..9a51037 100644 --- a/main.spec +++ b/main.spec @@ -5,7 +5,7 @@ block_cipher = None a = Analysis(['utils\\main.py'], binaries=[], - datas=[('c:\hostedtoolcache\windows\python\3.9.13\x64\lib\site-packages\pyfiglet', 'pyfiglet')], + datas=[('c:\hostedtoolcache\windows\python\3.9.13\x64\lib\site-packages\pyfiglet\', 'pyfiglet')], hiddenimports=[], hookspath=[], runtime_hooks=[], From 5652e6b6c659070a656f72f091847f42c6cb9aeb Mon Sep 17 00:00:00 2001 From: Markus Bilz Date: Sat, 6 Jan 2024 20:35:10 +0100 Subject: [PATCH 10/12] refactor: fix data path --- main.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.spec b/main.spec index 9a51037..9648381 100644 --- a/main.spec +++ b/main.spec @@ -5,7 +5,7 @@ block_cipher = None a = Analysis(['utils\\main.py'], binaries=[], - datas=[('c:\hostedtoolcache\windows\python\3.9.13\x64\lib\site-packages\pyfiglet\', 'pyfiglet')], + datas=[('c:\hostedtoolcache\windows\python\3.9.13\x64\lib\site-packages\pyfiglet\*', 'pyfiglet')], hiddenimports=[], hookspath=[], runtime_hooks=[], From ffde22ba8d664e1835804db1e5503af95c170dd1 Mon Sep 17 00:00:00 2001 From: Markus Bilz Date: Sat, 6 Jan 2024 20:37:00 +0100 Subject: [PATCH 11/12] refactor: fix data path to former logic --- main.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.spec b/main.spec index 9648381..2e97c9d 100644 --- a/main.spec +++ b/main.spec @@ -5,7 +5,7 @@ block_cipher = None a = Analysis(['utils\\main.py'], binaries=[], - datas=[('c:\hostedtoolcache\windows\python\3.9.13\x64\lib\site-packages\pyfiglet\*', 'pyfiglet')], + datas=[('c:/hostedtoolcache/windows/python/3.9.13/x64/lib/site-packages/pyfiglet', 'pyfiglet')], hiddenimports=[], hookspath=[], runtime_hooks=[], From 3435e9533f2443d63987a836d34f8130dd54e806 Mon Sep 17 00:00:00 2001 From: Markus Bilz Date: Sat, 6 Jan 2024 20:39:05 +0100 Subject: [PATCH 12/12] refactor: revert changes from testing --- .github/workflows/release.yaml | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index b582df3..ab6c93c 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -1,7 +1,6 @@ on: - # release: - # types: [published] - push: + release: + types: [published] permissions: contents: write jobs: @@ -20,10 +19,10 @@ jobs: python -m pip install -r requirements.txt pyinstaller - name: Build binary run: pyinstaller "main.spec" - # - name: Upload artifacts to GitHub Release - # env: - # GITHUB_TOKEN: ${{ github.token }} - # run: >- - # gh release upload - # '${{ github.ref_name }}' dist/*exe - # --repo '${{ github.repository }}' \ No newline at end of file + - name: Upload artifacts to GitHub Release + env: + GITHUB_TOKEN: ${{ github.token }} + run: >- + gh release upload + '${{ github.ref_name }}' dist/*exe + --repo '${{ github.repository }}' \ No newline at end of file