From e3af9c785521b4794106192b50fb6ce44db09848 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robin=20L=C3=B6sch?= Date: Wed, 20 Dec 2023 15:31:28 +0100 Subject: [PATCH 1/5] Fix copyright notice in LICENSE file: Enter Copyright holder and year --- .gitignore | 3 +++ LICENSE | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 83ef6c3..849c78a 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,6 @@ maltego_trx.egg-info venv env *.code-workspace +**/*.pem +settings.csv +transforms.csv diff --git a/LICENSE b/LICENSE index 63b4b68..707c41b 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) [year] [fullname] +Copyright (c) [2024] [Maltego Technologies] Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal From 4ecdea4093160fe8770bccbced037958521399ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robin=20L=C3=B6sch?= Date: Wed, 20 Dec 2023 15:32:22 +0100 Subject: [PATCH 2/5] Add GmbH suffix --- LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index 707c41b..3b78bad 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) [2024] [Maltego Technologies] +Copyright (c) [2024] [Maltego Technologies GmbH] Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal From 008b44b7e9870be04b0331f8125d4072624ddc00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robin=20L=C3=B6sch?= Date: Wed, 20 Dec 2023 16:07:20 +0100 Subject: [PATCH 3/5] Bump Cryptography (>=41.0.7) and Flask (>=3.0.0) dependencies --- README.md | 2 ++ maltego_trx/__init__.py | 2 +- requirements.txt | 5 +++-- setup.py | 5 +++-- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index e403724..7e84718 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,8 @@ ## Release Notes +__1.6.2__: Update cryptography (42.0.0) and Flask (3.0.0) dependencies + __1.6.1__: Update cryptography and Flask dependency and deprecate Python 3.7 __1.6.0__: Automatically generate am `.mtz` for your local transforms diff --git a/maltego_trx/__init__.py b/maltego_trx/__init__.py index ac30235..c8a19b1 100644 --- a/maltego_trx/__init__.py +++ b/maltego_trx/__init__.py @@ -1 +1 @@ -VERSION = "1.6.1" +VERSION = "1.6.2" diff --git a/requirements.txt b/requirements.txt index 2cf72cb..24e4992 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,3 @@ -flask>=2.2.3 -cryptography==39.0.1 +flask>=3.0.0 +cryptography>=41.0.7 +requests>=2.31.0 \ No newline at end of file diff --git a/setup.py b/setup.py index a29f294..f63d0a5 100644 --- a/setup.py +++ b/setup.py @@ -16,8 +16,9 @@ author_email='support@maltego.com', license='MIT', install_requires=[ - 'flask>=2.2.0', - 'cryptography>=39.0.1' + 'flask>=3.0.0', + 'cryptography>=41.0.0', + 'requests>=2.31.0' ], packages=[ 'maltego_trx', From 8c547a4537d4eeeeafc76e56d91d40387545e065 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robin=20L=C3=B6sch?= Date: Wed, 20 Dec 2023 16:23:17 +0100 Subject: [PATCH 4/5] Make action run on pull request rather then target branch --- .github/workflows/pythonx-boot-check.yaml | 2 +- .github/workflows/pythonx-pytest.yaml | 2 +- .github/workflows/sonatype-jack.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pythonx-boot-check.yaml b/.github/workflows/pythonx-boot-check.yaml index add4f2d..a19dfe0 100644 --- a/.github/workflows/pythonx-boot-check.yaml +++ b/.github/workflows/pythonx-boot-check.yaml @@ -1,7 +1,7 @@ name: 'Runs with Python3.6 - Python3.10' on: - pull_request_target: + pull_request: branches: - 'master' diff --git a/.github/workflows/pythonx-pytest.yaml b/.github/workflows/pythonx-pytest.yaml index 8545e1a..607bf44 100644 --- a/.github/workflows/pythonx-pytest.yaml +++ b/.github/workflows/pythonx-pytest.yaml @@ -1,7 +1,7 @@ name: 'PyTest with Python3.6 - Python3.10' on: - pull_request_target: + pull_request: branches: - 'master' diff --git a/.github/workflows/sonatype-jack.yml b/.github/workflows/sonatype-jack.yml index 6697fc5..26a73e3 100644 --- a/.github/workflows/sonatype-jack.yml +++ b/.github/workflows/sonatype-jack.yml @@ -1,7 +1,7 @@ name: 'Sonatype Jake' on: - pull_request_target: + pull_request: branches: - 'master' From 87effb6e26bfe8aed73b325eae1f8a4ca4aa513b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robin=20L=C3=B6sch?= Date: Thu, 21 Dec 2023 09:28:56 +0100 Subject: [PATCH 5/5] add jake whitelist to ignore CVE-2018-20225 --- .github/workflows/sonatype-jack.yml | 2 +- jake-whitelist.json | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 jake-whitelist.json diff --git a/.github/workflows/sonatype-jack.yml b/.github/workflows/sonatype-jack.yml index 26a73e3..34e0ec0 100644 --- a/.github/workflows/sonatype-jack.yml +++ b/.github/workflows/sonatype-jack.yml @@ -27,4 +27,4 @@ jobs: pip3 freeze > frozen.requirements.txt pip3 install jake - jake ddt \ No newline at end of file + jake ddt --whitelist jake-whitelist.json diff --git a/jake-whitelist.json b/jake-whitelist.json new file mode 100644 index 0000000..6f50422 --- /dev/null +++ b/jake-whitelist.json @@ -0,0 +1 @@ +{"ignore": [{"id": "CVE-2018-20225", "reason": "Only valid if private indexes are used"}]} \ No newline at end of file