From 5d88eeb406a323af3836f4c29d8f8f19793dbfe1 Mon Sep 17 00:00:00 2001
From: mlodic <30625432+mlodic@users.noreply.github.com>
Date: Fri, 25 Feb 2022 18:09:30 +0100
Subject: [PATCH] added changelog (#909)

---
 .github/CHANGELOG.md          | 17 +++++++++++++++++
 docker/.env                   |  2 +-
 docs/source/Advanced-Usage.md | 36 +++++++++++++++++++----------------
 docs/source/conf.py           |  2 +-
 docs/source/schema.yml        |  2 +-
 intel_owl/settings.py         |  2 +-
 6 files changed, 41 insertions(+), 20 deletions(-)

diff --git a/.github/CHANGELOG.md b/.github/CHANGELOG.md
index f831915c64..76047e646d 100644
--- a/.github/CHANGELOG.md
+++ b/.github/CHANGELOG.md
@@ -2,6 +2,23 @@
 
 [**Upgrade Guide**](https://intelowl.readthedocs.io/en/latest/Installation.html#update-to-the-most-recent-version)
 
+## [v3.3.1](https://github.com/intelowlproject/IntelOwl/releases/tag/v3.3.1)
+
+**Notes:**
+- BREAKING CHANGE:
+  - We merged some additional Docker Analyzers (`thug`, `static_analyzers`, `apk_analyzers`, `box-js` and `qiling`) into a single container called `malware_tools_analyzers`. In this way, the IntelOwl configuration with all those Malware Analyzers is a lot lighter than before. Just run `--malware_tools_analyzers` as a single option to leverage all those additional analyzers.
+- fixed `--all_analyzers` and `--tor_analyzers` options not working.
+
+**New/Improved Analyzers:**
+- Added option to run shellcodes with Mandiant tools (Floss, SpeakEasy and Capa)
+- Minor fix to [Qiling](https://github.com/qilingframework/qiling) Analyzers
+- Added new Observable Analyzer for [Stalkphish](https://stalkphish.io)
+- Added new Yara Analyzer for [Malpedia](https://malpedia.caad.fkie.fraunhofer.de/) Rules
+
+**Other:**
+- Added Issue Templates
+- Renewed PR automation to better detect possible bugs in deployments and to improve performance
+
 ## [v3.3.0](https://github.com/intelowlproject/IntelOwl/releases/tag/v3.3.0)
 
 **Notes:**
diff --git a/docker/.env b/docker/.env
index 009ee1b504..3a217f6058 100644
--- a/docker/.env
+++ b/docker/.env
@@ -1,5 +1,5 @@
 ### DO NOT CHANGE THIS VALUE !!
 ### It should be updated only when you pull latest changes off from the 'master' branch of IntelOwl.
-INTELOWL_TAG_VERSION=v3.3.0
+INTELOWL_TAG_VERSION=v3.3.1
 ### Change this to `develop` when doing local development.
 INTELOWL_NG_TAG_VERSION=v3.1.0
diff --git a/docs/source/Advanced-Usage.md b/docs/source/Advanced-Usage.md
index 70f96a1e00..15959acd4b 100644
--- a/docs/source/Advanced-Usage.md
+++ b/docs/source/Advanced-Usage.md
@@ -45,25 +45,29 @@ table, th, td {
   </tr>
   <tr>
     <td>Malware Tools Analyzers</td>
-    <td><code>PEframe_Scan</code>, 
-    <code>Capa_Info</code>,
-    <code>Floss</code>,
-    <code>Strings_Info_Classic</code>,
-    <code>Strings_Info_ML</code>,
-    <code>Manalyze</code>,
-    <code>ClamAV</code>,
-    <code>Thug_URL_Info</code>,
-    <code>Thug_HTML_Info</code>,
-    <code>BoxJS_Scan_JavaScript</code>,
-    <code>APKiD_Scan_APK_DEX_JAR</code>,
-    <code>Qiling_Windows</code>,
-    <code>Qiling_Windows_Shellcode</code>,
-    <code>Qiling_Linux</code>,
-    <code>Qiling_Linux_Shellcode</code></td>
+    <td>
+      <ul>
+      <li><code>PEframe_Scan</code></li>
+      <li><code>Capa_Info</code></li>
+      <li><code>Floss</code></li>
+      <li><code>Strings_Info_Classic</code>,
+      <code>Strings_Info_ML</code></li>
+      <li><code>Manalyze</code></li>
+      <li><code>ClamAV</code></li>
+      <li><code>Thug_URL_Info</code>,
+      <code>Thug_HTML_Info</code></li>
+      <li><code>BoxJS_Scan_JavaScript</code></li>
+      <li><code>APKiD_Scan_APK_DEX_JAR</code></li>
+      <li><code>Qiling_Windows</code>,
+      <code>Qiling_Windows_Shellcode</code>,
+      <code>Qiling_Linux</code>,
+      <code>Qiling_Linux_Shellcode</code></li>
+     </ul>
+    </td>
     <td>
     <ul>
-      <li>Capa detects capabilities in executable files</li>
       <li>PEFrame performs static analysis on Portable Executable malware and malicious MS Office documents</li>
+      <li>Capa detects capabilities in executable files</li>
       <li>FLOSS automatically deobfuscate strings from malware binaries</li>
       <li>String_Info_Classic extracts human-readable strings where as ML version of it ranks them</li>
       <li>Manalyze statically analyzes PE (Portable-Executable) files in-depth</li>
diff --git a/docs/source/conf.py b/docs/source/conf.py
index bd6fa74401..c8dcda7936 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -29,7 +29,7 @@
 author = "Matteo Lodi"
 
 # The full version, including alpha/beta/rc tags
-release = "v3.3.0"
+release = "v3.3.1"
 
 
 # -- General configuration ---------------------------------------------------
diff --git a/docs/source/schema.yml b/docs/source/schema.yml
index 6425e31ad9..9429fdca70 100644
--- a/docs/source/schema.yml
+++ b/docs/source/schema.yml
@@ -1,7 +1,7 @@
 openapi: 3.0.3
 info:
   title: IntelOwl API specification
-  version: 3.3.0
+  version: 3.3.1
 paths:
   /api/analyze_file:
     post:
diff --git a/intel_owl/settings.py b/intel_owl/settings.py
index b9a79b4718..e1c49a6876 100644
--- a/intel_owl/settings.py
+++ b/intel_owl/settings.py
@@ -155,7 +155,7 @@ def retrieve(self, file, analyzer):
 # DRF Spectacular
 SPECTACULAR_SETTINGS = {
     "TITLE": "IntelOwl API specification",
-    "VERSION": "3.3.0",
+    "VERSION": "3.3.1",
 }
 
 # Django-Rest-Durin