add v4 support

Author: zeloff

pyproject.toml

@@ -1,9 +1,9 @@
 [tool.poetry]
 name = "vulners"
-version = "2.2.3"
+version = "2.3.0"
 description = "Python library and command-line utility for Vulners (https://vulners.com)"
 readme = "README.md"
-authors = ["Kirill Ermakov <[email protected]>", "Andrei Churin <[email protected]>"]
+authors = ["Vulners Team"]
 keywords = ["security", "network", "vulners", "vulnerability", "CVE"]
 classifiers = [
     "Development Status :: 5 - Production/Stable",

vulners/base.py

@@ -248,6 +248,27 @@ def __init__(self, value):
         self.value = value
 
 
+class Any(Param):
+    def __init__(self, *args, **kwargs):
+        assert all([p.__base__ == Param for p in args]), "Invalid argument type"
+        self.__params = [p(**kwargs) for p in args]
+        super(Any, self).__init__(**kwargs)
+
+    def validate(self, param, value):
+        errs = []
+        for _param in self.__params:
+            try:
+                return _param.validate(param, value)
+            except ParamError as e:
+                errs.append(e)
+                pass
+
+        raise ParamError(
+            "Expect %s but got '%s'",
+            (" or ".join([p.__class__.__name__ for p in self.__params]), type(value)),
+        )
+
+
 class String(Param):
     def __init__(self, choices=None, *args, **kwargs):
         super(String, self).__init__(*args, **kwargs)

vulners/vulners.py

@@ -4,6 +4,7 @@
 import zipfile
 
 from .base import (
+    Any,
     Boolean,
     Const,
     Dict,
@@ -185,10 +186,13 @@ def _get_burp_software_content(content, _):
             ("sw_edition", String(required=False)),
             ("target_sw", String(required=False)),
             ("target_hw", String(required=False)),
-            ("respect_major_version", String(required=False, choices=["yes", "no", "true", "false"])),
+            (
+                "respect_major_version",
+                String(required=False, choices=["yes", "no", "true", "false"]),
+            ),
             ("exclude_any_version", String(required=False, choices=["yes", "no", "true", "false"])),
-            ("type", String(required=False)), # deprecated
-            ("exactmatch", Boolean(default=False)), # deprecated
+            ("type", String(required=False)),  # deprecated
+            ("exactmatch", Boolean(default=False)),  # deprecated
         ],
         content_handler=_get_burp_software_content,
     )
@@ -208,8 +212,13 @@ def get_software_vulnerabilities(
         target_hw=None,
         respect_major_version=None,
         exclude_any_version=None,
-        only_ids=None
+        only_ids=None,
     ):
+        warnings.warn(
+            "get_software_vulnerabilities() is deprecated and will be removed in future release. "
+            "Use VulnersApi.audit_software() or VulnersApi.audit_host() instead.",
+            DeprecationWarning,
+        )
         """
         Find software vulnerabilities using name and version.
 
@@ -227,16 +236,45 @@ def get_software_vulnerabilities(
             target_hw,
             respect_major_version,
             exclude_any_version,
-            only_ids
+            only_ids,
         )
 
+    audit_software = Endpoint(
+        method="post",
+        url="/api/v4/audit/software-batch/",
+        params=[
+            (
+                "software",
+                List(
+                    item=Dict(),
+                    description="List of dicts. E.g., [{'product': 'curl', 'version': '8.11.1', ...}, ...]",
+                ),
+            ),
+        ],
+        content_handler=lambda c, _: c["result"],
+    )
+
+    audit_host = Endpoint(
+        method="post",
+        url="/api/v4/audit/host/",
+        params=[
+            (
+                "software",
+                List(
+                    item=Dict(),
+                    description="List of dicts. E.g., [{'product': 'curl', 'version': '8.11.1', ...}, ...]",
+                ),
+            ),
+            ("application", Any(String, Dict, required=False)),
+            ("operation_system", Any(String, Dict, required=False)),
+            ("hardware", Any(String, Dict, required=False)),
+        ],
+        content_handler=lambda c, _: c["result"],
+    )
+
     @validate_params(cpe=String())
     def get_cpe_vulnerabilities(
-        self,
-        cpe,
-        respect_major_version=None,
-        exclude_any_version=None,
-        only_ids=None
+        self, cpe, respect_major_version=None, exclude_any_version=None, only_ids=None
     ):
         """
         Find software vulnerabilities using CPE string. See CPE references at https://cpe.mitre.org/specification/
@@ -654,7 +692,7 @@ def scanlist_report(self, limit=30, offset=0, filter=None, sort=""):
             ("format", String(default="html", choices=("html", "json", "pdf"))),
             ("crontab", String(allow_null=True, default=None)),
             ("query_type", String(default="lucene")),
-        ]
+        ],
     )
 
     edit_subscription = Endpoint(
@@ -664,16 +702,19 @@ def scanlist_report(self, limit=30, offset=0, filter=None, sort=""):
             ("subscriptionid", String()),
             ("format", String(allow_null=True, default=None, choices=("html", "json", "pdf"))),
             ("crontab", String(allow_null=True, default=None)),
-            ("active", String(allow_null=True, default=None, choices=("yes", "no", "true", "false"))),
-        ]
+            (
+                "active",
+                String(allow_null=True, default=None, choices=("yes", "no", "true", "false")),
+            ),
+        ],
     )
 
     delete_subscription = Endpoint(
         method="post",
         url="/api/v3/subscriptions/removeEmailSubscription/",
         params=[
             ("subscriptionid", String()),
-        ]
+        ],
     )
 
     get_webhooks = Endpoint(