Merge pull request #187 from intelowlproject/develop

4.4.1

Author: mlodic

.github/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## [4.4.1](https://github.com/intelowlproject/pyintelowl/releases/tag/4.4.1)
+- Analyzing a File with a Playbook now works correctly
+- other little bug fixing
+
 ## [4.4.0](https://github.com/intelowlproject/pyintelowl/releases/tag/4.4.0)
 - this version supports the usage of a proxy while connecting to IntelOwl via Python code.
 

.github/workflows/pull_request_automation.yml

@@ -11,7 +11,7 @@ jobs:
       fail-fast: false
       max-parallel: 5
       matrix:
-        python-version: ['3.7', '3.8', '3.9.7', '3.10']
+        python-version: ['3.7', '3.8', '3.9', '3.10']
 
     steps:
     - uses: actions/checkout@v2

docs/conf.py

@@ -13,7 +13,7 @@
 import os
 import sys
 
-VERSION = "4.4.0"
+VERSION = "4.4.1"
 GITHUB_URL = "https://github.com/intelowlproject/pyintelowl"
 
 sys.path.append(os.path.abspath("../"))

pyintelowl/pyintelowl.py

@@ -261,7 +261,10 @@ def send_file_analysis_playbook_request(
 
             if runtime_configuration:
                 data["runtime_configuration"] = json.dumps(runtime_configuration)
-            files = {"file": (filename, binary)}
+            # `files` is wanted to be different from the other
+            # /api/analyze_file endpoint
+            # because the server is using different serializers
+            files = {"files": (filename, binary)}
             answer = self.__send_analysis_request(
                 data=data, files=files, playbook_mode=True
             )
@@ -472,6 +475,7 @@ def __send_analysis_request(self, data=None, files=None, playbook_mode=False):
         Internal use only.
         """
         response = None
+        answer = {}
         if files is None:
             url = self.instance + "/api/analyze_observable"
             if playbook_mode:
@@ -495,7 +499,9 @@ def __send_analysis_request(self, data=None, files=None, playbook_mode=False):
             answer = response.json()
             if playbook_mode:
                 # right now, we are only supporting single input result
-                answer = answer.get("results", [])[0]
+                answers = answer.get("results", [])
+                if answers:
+                    answer = answers[0]
 
             warnings = answer.get("warnings", [])
             if self.cli:
@@ -505,11 +511,12 @@ def __send_analysis_request(self, data=None, files=None, playbook_mode=False):
                     [i yellow]{warnings if warnings else None}[/]
                 """
             else:
-                info_log = f"""New Job running..
-                    ID: {answer['job_id']} | Status: {answer['status']}.
-                    Got {len(warnings)} warnings:
-                    {warnings if warnings else None}
-                """
+                info_log = (
+                    f"New Job running.. ID: {answer['job_id']} "
+                    f"| Status: {answer['status']}."
+                    f" Got {len(warnings)} warnings:"
+                    f" {warnings if warnings else None}"
+                )
             self.logger.info(info_log)
             response.raise_for_status()
         except Exception as e:
@@ -813,12 +820,12 @@ def _new_analysis_playbook_cli(
 
         # 2nd step: poll for result
         if should_poll:
-            if resp["status"] != "accepted":
+            if resp.get("status", "") != "accepted":
                 self.logger.fatal("Can't poll a failed job")
             # import poll function
             from .cli._jobs_utils import _poll_for_job_cli
 
-            job_id = resp["job_id"]
+            job_id = resp.get("job_id", 0)
             _ = _poll_for_job_cli(self, job_id)
             self.logger.info(
                 f"""

pyintelowl/version.py

@@ -1 +1 @@
-__version__ = "4.4.0"
+__version__ = "4.4.1"