From 27f145ef1729f05df0b3ab8cc23182c613f3c72f Mon Sep 17 00:00:00 2001 From: sebastien Date: Tue, 19 Nov 2024 18:38:50 +0100 Subject: [PATCH 1/3] ARS-642 --- PatrowlEnginesUtils/PatrowlEngine.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/PatrowlEnginesUtils/PatrowlEngine.py b/PatrowlEnginesUtils/PatrowlEngine.py index 4ba63cb..f8fbe06 100644 --- a/PatrowlEnginesUtils/PatrowlEngine.py +++ b/PatrowlEnginesUtils/PatrowlEngine.py @@ -218,8 +218,8 @@ def _getsslcontext(self, options): return context - def clean(self, scan_id): - """Clean all the scans.""" + def clean(self) -> tuple[dict, int]: + """Clean all scans.""" res = {"page": "clean"} # Terminate processes for scan_id in self.scans.keys(): @@ -235,7 +235,7 @@ def clean(self, scan_id): res.update({"status": "success"}) return jsonify(res), 200 - def clean_scan(self, scan_id): + def clean_scan(self, scan_id: int) -> tuple[dict, int]: """Clean a scan identified by his 'id'.""" res = {"page": "clean_scan"} res.update({"scan_id": scan_id}) @@ -257,7 +257,7 @@ def clean_scan(self, scan_id): self.scans.pop(scan_id) res.update({"status": "removed"}) - return jsonify(res) + return jsonify(res), 200 def _engine_is_busy(self): """Returns if engine is busy scanning.""" From 76e41e8f4b08ad2a2ed297aa3118c37b6b6f6c15 Mon Sep 17 00:00:00 2001 From: sebastien Date: Tue, 19 Nov 2024 18:39:32 +0100 Subject: [PATCH 2/3] Updated VERSION (1.2.2rc1) --- PatrowlEnginesUtils/__init__.py | 2 +- VERSION | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/PatrowlEnginesUtils/__init__.py b/PatrowlEnginesUtils/__init__.py index e2688b6..f11c395 100644 --- a/PatrowlEnginesUtils/__init__.py +++ b/PatrowlEnginesUtils/__init__.py @@ -3,7 +3,7 @@ __title__ = 'patrowl_engine_utils' -__version__ = '1.2.1' +__version__ = '1.2.2rc1' __author__ = 'Nicolas MATTIOCCO' __license__ = 'AGPLv3' __copyright__ = 'Copyright (C) 2018-2021 Nicolas Mattiocco - @MaKyOtOx' diff --git a/VERSION b/VERSION index 6085e94..852a28d 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.2.1 +1.2.2rc1 diff --git a/setup.py b/setup.py index 37afd76..802cf7a 100644 --- a/setup.py +++ b/setup.py @@ -6,7 +6,7 @@ setup( name='PatrowlEnginesUtils', - version='1.2.1', + version='1.2.2rc1', description='Common classes for PatrowlEngines', url='https://github.com/Patrowl/PatrowlEnginesUtils', author='Nicolas Mattiocco', From a4bb394a227fd067f6f63ac6a543e97fd27b2f1a Mon Sep 17 00:00:00 2001 From: sebastien Date: Thu, 28 Nov 2024 16:07:32 +0100 Subject: [PATCH 3/3] Updated VERSION (1.2.2) --- PatrowlEnginesUtils/__init__.py | 2 +- VERSION | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/PatrowlEnginesUtils/__init__.py b/PatrowlEnginesUtils/__init__.py index f11c395..7999226 100644 --- a/PatrowlEnginesUtils/__init__.py +++ b/PatrowlEnginesUtils/__init__.py @@ -3,7 +3,7 @@ __title__ = 'patrowl_engine_utils' -__version__ = '1.2.2rc1' +__version__ = '1.2.2' __author__ = 'Nicolas MATTIOCCO' __license__ = 'AGPLv3' __copyright__ = 'Copyright (C) 2018-2021 Nicolas Mattiocco - @MaKyOtOx' diff --git a/VERSION b/VERSION index 852a28d..23aa839 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.2.2rc1 +1.2.2 diff --git a/setup.py b/setup.py index 802cf7a..2cdf8e7 100644 --- a/setup.py +++ b/setup.py @@ -6,7 +6,7 @@ setup( name='PatrowlEnginesUtils', - version='1.2.2rc1', + version='1.2.2', description='Common classes for PatrowlEngines', url='https://github.com/Patrowl/PatrowlEnginesUtils', author='Nicolas Mattiocco',