Merge pull request #465 from intelowlproject/develop

v2.4.0

Author: mlodic

.github/CHANGELOG.md

@@ -1,6 +1,22 @@
 # Changelog
 
 [**Upgrade Guide**](https://intelowl.readthedocs.io/en/latest/Installation.html#update-to-the-most-recent-version)
+## [v2.4.0](https://github.com/intelowlproject/IntelOwl/releases/tag/v2.4.0)
+
+We welcome new GSoC students ([Sarthak Khattar](https://twitter.com/Mr_Momo07) and [Shubham Pandey](https://twitter.com/imshubham31)) in the Organization!
+
+
+Main updates:
+- new release of the official GUI [IntelOwl-Ng](https://github.com/intelowlproject/IntelOwl-ng/releases/tag/v2.1.0)
+- added [Malpedia](https://malpedia.caad.fkie.fraunhofer.de) analyzer
+
+Then a lot of maintenance and overall project stability issues solved:
+- removed `eventlet` broken dependency
+- bumped new versions of a lot of dependencies
+- Improved "Installation" and "Contribute" documentation
+- added new badges to the README
+- added `--django-server` [option](https://intelowl.readthedocs.io/en/latest/Contribute.html#how-to-start) to speed up development
+- other little refactors and fixes
 
 ## [v2.3.0](https://github.com/intelowlproject/IntelOwl/releases/tag/v2.3.0)
 - Added [API documentation](https://intelowl.readthedocs.io) with both [Redoc](https://github.com/Redocly/redoc) and [OpenAPI](https://github.com/OAI/OpenAPI-Specification) Format

README.md

@@ -1,10 +1,18 @@
 <img src="static_intel/intel_owl_positive.png" width=547 height=150 alt="Intel Owl"/>
 
+
+[![GitHub release (latest by date)](https://img.shields.io/github/v/release/intelowlproject/IntelOwl)](https://github.com/intelowlproject/IntelOwl/releases)
+[![GitHub Repo stars](https://img.shields.io/github/stars/intelowlproject/IntelOwl?style=social)](https://github.com/intelowlproject/IntelOwl/stargazers)
+[![Twitter Follow](https://img.shields.io/twitter/follow/intel_owl?style=social)](https://twitter.com/intel_owl)
+[![Official Site](https://img.shields.io/badge/official-site-blue)](https://intelowlproject.github.io)
+
+
 [![Language grade: Python](https://img.shields.io/lgtm/grade/python/g/intelowlproject/IntelOwl.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/intelowlproject/IntelOwl/context:python)
 [![CodeFactor](https://www.codefactor.io/repository/github/intelowlproject/intelowl/badge)](https://www.codefactor.io/repository/github/intelowlproject/intelowl)
 [![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
 [![codecov](https://codecov.io/gh/intelowlproject/IntelOwl/branch/master/graph/badge.svg?token=R097M4TYA6)](https://codecov.io/gh/intelowlproject/IntelOwl)
-![Build & Tests](https://github.com/intelowlproject/IntelOwl/workflows/Build%20&%20Tests/badge.svg)
+[![Build & Tests](https://github.com/intelowlproject/IntelOwl/workflows/Build%20&%20Tests/badge.svg)](https://github.com/intelowlproject/IntelOwl/actions)
+
 
 # Intel Owl
 
@@ -60,6 +68,8 @@ acknowledging that your use of each package will be subject to its respective
 license terms.
 
 [osslsigncode](https://github.com/develar/osslsigncode),
+[PyExifTool](https://github.com/sylikc/pyexiftool),
+[Exiftool package](https://exiftool.org/#license),
 [stringsifter](https://github.com/fireeye/stringsifter),
 [peepdf](https://github.com/jesparza/peepdf),
 [pefile](https://github.com/erocarrera/pefile),
@@ -109,17 +119,13 @@ This project was created and will be upgraded thanks to the following organizati
 
 Since its birth, this project has been participating in the GSoC under the Honeynet Project!
 
-* 2020: a lot of [new features](https://www.honeynet.org/gsoc/gsoc-2020/google-summer-of-code-2020-project-ideas/#intel-owl-improvements) were developed by Eshaan Bansal ([Twitter](https://twitter.com/mask0fmydisguis)).
-* 2021: you? [Projects available](https://www.honeynet.org/gsoc/gsoc-2021/google-summer-of-code-2021-project-ideas/)
+* 2020: a lot of [new features](https://www.honeynet.org/gsoc/gsoc-2020/google-summer-of-code-2020-project-ideas/#intel-owl-improvements) were developed by [Eshaan Bansal](https://twitter.com/mask0fmydisguis).
+* 2021: [Sarthak Khattar](https://twitter.com/Mr_Momo07) and [Shubham Pandey](https://twitter.com/imshubham31) are working on these [Projects](https://www.honeynet.org/gsoc/gsoc-2021/google-summer-of-code-2021-project-ideas/)
 
 Stay tuned for the upcoming GSoC! Join the [Honeynet Slack chat](https://gsoc-slack.honeynet.org/) for more info.
 
 ## About the author and maintainers
 
-Feel free to contact the main developers at any time:
-- Matteo Lodi ([Twitter](https://twitter.com/matte_lodi)): Author and creator
-- Eshaan Bansal ([Twitter](https://twitter.com/mask0fmydisguis)): Principal maintainer
-
-We also have:
-- a dedicated twitter account for the project: [@intel_owl](https://twitter.com/intel_owl).
-- [official site](https://intelowlproject.github.io) hosted in Github Pages
+Feel free to contact the main developers at any time in Twitter:
+- [Matteo Lodi](https://twitter.com/matte_lodi): Author and creator
+- [Eshaan Bansal](https://twitter.com/mask0fmydisguis): Principal maintainer

api_app/admin.py

@@ -1,3 +1,6 @@
+# This file is a part of IntelOwl https://github.com/intelowlproject/IntelOwl
+# See the file 'LICENSE' for copying permission.
+
 from django.contrib import admin
 
 from durin.admin import AuthTokenAdmin
@@ -33,35 +36,32 @@ class CustomAuthTokenAdmin(AuthTokenAdmin):
     Custom admin view for AuthToken model
     """
 
-    fieldsets = []
     exclude = []
     raw_id_fields = ("user",)
-    readonly_fields = ("token", "expiry", "client")
-    __fieldsets_custom = [
-        (
-            "Create token for PyIntelOwl",
-            {
-                "fields": ("user",),
-                "description": """
+    readonly_fields = ("token", "expiry", "created", "expires_in")
+
+    def get_fieldsets(self, request, obj=None):
+        if not obj:
+            return [
+                (
+                    "Create token for PyIntelOwl",
+                    {
+                        "fields": ("user",),
+                        "description": """
                     <h3>Token will be auto-generated on save.</h3>
                     <h3>This token will be valid for 10 years.</h3>
                 """,
-            },
-        ),
-    ]
-
-    def add_view(self, request, extra_content=None):
-        self.fieldsets = self.__fieldsets_custom
-        return super(CustomAuthTokenAdmin, self).add_view(request)
+                    },
+                ),
+            ]
+        return super().get_fieldsets(request, obj)
 
     def has_change_permission(self, *args, **kwargs):
         return False
 
     def save_model(self, request, obj, form, change):
-        client = Client.objects.get(name="pyintelowl")
-        obj = AuthToken.objects.create(
-            user=obj.user, client=client
-        )  # lgtm [py/unused-local-variable]
+        obj.client = Client.objects.get(name="pyintelowl")
+        super(CustomAuthTokenAdmin, self).save_model(request, obj, form, change)
 
 
 admin.site.register(Job, JobAdminView)

api_app/api.py

@@ -1,3 +1,6 @@
+# This file is a part of IntelOwl https://github.com/intelowlproject/IntelOwl
+# See the file 'LICENSE' for copying permission.
+
 import logging
 
 from api_app import models, serializers, helpers
@@ -485,7 +488,11 @@ class JobViewSet(
     viewsets.GenericViewSet,
 ):
 
-    queryset = models.Job.objects.order_by("-received_request_time").all()
+    queryset = (
+        models.Job.objects.prefetch_related("tags")
+        .order_by("-received_request_time")
+        .all()
+    )
     serializer_class = serializers.JobSerializer
     serializer_action_classes = {
         "list": serializers.JobListSerializer,

api_app/apps.py

@@ -1,3 +1,6 @@
+# This file is a part of IntelOwl https://github.com/intelowlproject/IntelOwl
+# See the file 'LICENSE' for copying permission.
+
 from django.apps import AppConfig
 
 

api_app/auth.py

@@ -1,3 +1,6 @@
+# This file is a part of IntelOwl https://github.com/intelowlproject/IntelOwl
+# See the file 'LICENSE' for copying permission.
+
 import logging
 
 from django.contrib.auth import login, logout
@@ -11,8 +14,7 @@
 
 
 class LoginView(durin_views.LoginView):
-    @staticmethod
-    def get_client_obj(request):
+    def get_client_obj(self, request):
         return Client.objects.get(name="web-browser")
 
     def post(self, request, *args, **kwargs):

api_app/crons.py

@@ -1,3 +1,6 @@
+# This file is a part of IntelOwl https://github.com/intelowlproject/IntelOwl
+# See the file 'LICENSE' for copying permission.
+
 import datetime
 import logging
 

api_app/documents.py

@@ -1,3 +1,6 @@
+# This file is a part of IntelOwl https://github.com/intelowlproject/IntelOwl
+# See the file 'LICENSE' for copying permission.
+
 from django_elasticsearch_dsl import Document, fields
 from django_elasticsearch_dsl.registries import registry
 from .models import Job

api_app/exceptions.py

@@ -1,3 +1,7 @@
+# This file is a part of IntelOwl https://github.com/intelowlproject/IntelOwl
+# See the file 'LICENSE' for copying permission.
+
+
 class NotRunnableAnalyzer(Exception):
     pass
 

api_app/helpers.py

@@ -1,3 +1,6 @@
+# This file is a part of IntelOwl https://github.com/intelowlproject/IntelOwl
+# See the file 'LICENSE' for copying permission.
+
 # general helper functions used by the Django API
 
 import json