Merge branch 'main' of https://github.com/ziadhany/vulnerablecode into view_fix

Author: ziadhany

Makefile

@@ -27,6 +27,7 @@ VENV=venv
 ACTIVATE?=. ${VENV}/bin/activate;
 VIRTUALENV_PYZ=etc/thirdparty/virtualenv.pyz
 BLACK_ARGS=-l 100 .
+ISORT_ARGS=.
 # Do not depend on Python to generate the SECRET_KEY
 GET_SECRET_KEY=`base64 /dev/urandom | head -c50`
 # Customize with `$ make envfile ENV_FILE=/etc/vulnerablecode/.env`
@@ -61,14 +62,20 @@ envfile:
 	@echo SECRET_KEY=\"${GET_SECRET_KEY}\" > ${ENV_FILE}
 
 check:
+	@echo "-> Run isort validation"
+	@${ACTIVATE} isort --check-only ${ISORT_ARGS}
 	@echo "-> Run black validation"
 	@${ACTIVATE} black --check ${BLACK_ARGS}
 
 black:
 	@echo "-> Apply black code formatter"
 	${VENV}/bin/black ${BLACK_ARGS}
 
-valid: black
+isort:
+	@echo "-> Apply isort code formatter"
+	${VENV}/bin/isort ${ISORT_ARGS}
+
+valid: isort black
 
 clean:
 	@echo "-> Clean the Python env"

SOURCES.rst

@@ -47,3 +47,7 @@
 +----------------+------------------------------------------------------------------------------------------------------+----------------------------------------------------+
 |suse_scores     | https://ftp.suse.com/pub/projects/security/yaml/suse-cvss-scores.yaml                                |vulnerability severity scores by SUSE               |
 +----------------+------------------------------------------------------------------------------------------------------+----------------------------------------------------+
+|mozilla         | https://github.com/mozilla/foundation-security-advisories                                            |mozilla                                             |
++-----------------------------------------------------------------------------------------------------------------------+----------------------------------------------------+
+|mattermost      | https://mattermost.com/security-updates/                                                             |mattermost server, desktop and mobile apps          |
++----------------+------------------------------------------------------------------------------------------------------+----------------------------------------------------+

pyproject.toml

@@ -43,4 +43,10 @@ addopts = [
     "-rfExXw",
     "--strict",
     "--doctest-modules"
-]
+]
+
+[tool.isort]
+profile = "black"
+line_length = 100
+force_single_line = true
+skip_gitignore = true

pytest.ini

@@ -30,5 +30,8 @@ addopts =
 	--ignore=vulnerabilities/importers/suse_backports.py
 	--ignore=vulnerabilities/importers/suse_scores.py
 	--ignore=vulnerabilities/importers/ubuntu_usn.py
+	--ignore=vulnerabilities/importers/mozilla.py
+	--ignore=vulnerabilities/importers/mattermost.py
+	--ignore=vulnerabilities/importers/xen.py
 	--ignore=vulnerabilities/management/commands/create_cpe_to_purl_map.py
 	--ignore=vulnerabilities/lib_oval.py

requirements-dev.txt

@@ -1,5 +1,6 @@
-pytest
-pytest-django
-freezegun
-ipython
-black
+black==22.1.0
+freezegun==1.1.0
+ipython==8.0.1
+isort==5.10.1
+pytest==7.0.0
+pytest-django==4.5.2

requirements.txt

@@ -17,3 +17,5 @@ lxml>=4.6.4
 gunicorn>=20.1.0
 django-environ==0.4.5
 defusedxml==0.7.1
+
+Markdown==3.3.4

setup.py

@@ -4,7 +4,6 @@
 from setuptools import find_packages
 from setuptools import setup
 
-
 requirements = [
     r.strip() for r in open("requirements.txt") if r.strip() and not r.strip().startswith("#")
 ]

vulnerabilities/admin.py

@@ -23,13 +23,11 @@
 
 from django.contrib import admin
 
-from vulnerabilities.models import (
-    PackageRelatedVulnerability,
-    Package,
-    Vulnerability,
-    VulnerabilityReference,
-    VulnerabilitySeverity,
-)
+from vulnerabilities.models import Package
+from vulnerabilities.models import PackageRelatedVulnerability
+from vulnerabilities.models import Vulnerability
+from vulnerabilities.models import VulnerabilityReference
+from vulnerabilities.models import VulnerabilitySeverity
 
 
 @admin.register(Vulnerability)

vulnerabilities/api.py

@@ -25,10 +25,11 @@
 
 from django_filters import rest_framework as filters
 from packageurl import PackageURL
-
-from rest_framework import serializers, viewsets
+from rest_framework import serializers
+from rest_framework import viewsets
 from rest_framework.decorators import action
 from rest_framework.response import Response
+
 from vulnerabilities.models import Package
 from vulnerabilities.models import Vulnerability
 from vulnerabilities.models import VulnerabilityReference

vulnerabilities/fixtures/openssl.json

@@ -40764,5 +40764,19 @@
                 ]
             }
         }
+    },
+    {
+        "model": "vulnerabilities.importer",
+        "pk": 17,
+        "fields": {
+            "name": "xen",
+            "license": "gplv2",
+            "last_run": null,
+            "data_source": "XenDataSource",
+            "data_source_cfg": {
+                "etags": {},
+                "db_url": "https://xenbits.xen.org/xsa/xsa.json"
+            }
+        }
     }
 ]