Merge pull request #19 from Patrowl/develop

1.2.2 Fix clean API

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."""

PatrowlEnginesUtils/__init__.py

@@ -3,7 +3,7 @@
 
 
 __title__ = 'patrowl_engine_utils'
-__version__ = '1.2.1'
+__version__ = '1.2.2'
 __author__ = 'Nicolas MATTIOCCO'
 __license__ = 'AGPLv3'
 __copyright__ = 'Copyright (C) 2018-2021 Nicolas Mattiocco - @MaKyOtOx'

VERSION

@@ -1 +1 @@
-1.2.1
+1.2.2

setup.py

@@ -6,7 +6,7 @@
 
 setup(
     name='PatrowlEnginesUtils',
-    version='1.2.1',
+    version='1.2.2',
     description='Common classes for PatrowlEngines',
     url='https://github.com/Patrowl/PatrowlEnginesUtils',
     author='Nicolas Mattiocco',