add support for raw dump

Signed-off-by: Keshav Priyadarshi <git@keshav.space>

Author: keshav-space

vulntotal/vulntotal-cli.py

@@ -23,6 +23,7 @@
 #  Visit https://github.com/nexB/vulnerablecode/ for support and download.
 
 import argparse
+import json
 import pydoc
 
 from packageurl import PackageURL
@@ -40,30 +41,33 @@ def get_help():
    ╚██╔╝  ╚██████╔╝███████╗██║ ╚███║   ██║   ╚█████╔╝   ██║   ██║  ██║███████╗
     ╚═╝    ╚═════╝ ╚══════╝╚═╝  ╚══╝   ╚═╝    ╚════╝    ╚═╝   ╚═╝  ╚═╝╚══════╝
 
-Usage: vulntotal-cli.py [-h] [-p PURL] [-l] [-d validator [validator ...]]
-                        [-e validator [validator ...]]
+Usage: vulntotal-cli.py [-h] [-l] [-r] [-d validator [validator ...]]
+                        [-e validator [validator ...]] [-p PURL]
 
-Discription:
+Description:
     When no -e/-d flag is provided CLI will run the PURL through
     all the available validators.
 
 
 Optional arguments:
   -h, --help                        Show this help message and exit
-  -p PURL, --purl PURL              PackageURL to run through validator/s
   -l, --list                        Lists all the available validators
+  -r, --raw                         List of all the raw response from vendor
 
   -e validator [validator ...]      Enable these validator/s only
   --enable validator [validator ...]
 
   -d validator [validator ...]      Disable these validator/s
   --disable validator [validator ...]
 
+  -p PURL, --purl PURL              PackageURL to run through validator/s
+
 Examples:
     python vulntotal-cli.py --list
     python vulntotal-cli.py -p 'pkg:pypi/jinja2@2.4.1'
-    python vulntotal-cli.py -e osv vulnerablecode -p 'pkg:pypi/jinja2@2.4.1'
-    python vulntotal-cli.py -d osv -p 'pkg:pypi/jinja2@2.4.1'
+    python vulntotal-cli.py -e osv vulnerablecode -p 'pkg:go/github.com/cloudflare/cfrpki@v1.4.1'
+    python vulntotal-cli.py -d osv -p 'pkg:maven/org.apache.tomcat/tomcat@10.1.0-M8'
+    python vulntotal-cli.py -r -e osv -p 'pkg:npm/semver-regex@3.1.3'
 """
 
 
@@ -97,11 +101,24 @@ def list_validators():
 
 def formatted_row(validator, advisory):
     aliases = "\n".join(advisory.aliases)
-    affected = " ".join(advisory.affected_versions)
-    fixed = " ".join(advisory.fixed_versions)
+    affected = "  ".join(advisory.affected_versions)
+    fixed = "  ".join(advisory.fixed_versions)
     return [validator.upper(), aliases, affected, fixed]
 
 
+def get_raw_response(purl, validators):
+    if not validators:
+        print("No validators available!")
+        return
+
+    all_raw_responses = {}
+    for key, validator in validators.items():
+        vendor = validator()
+        vendor_advisories = vendor.validator_advisory(PackageURL.from_string(purl))
+        all_raw_responses[key] = vendor.raw_dump
+    print(all_raw_responses)
+
+
 def run_validators(purl, validators):
     if not validators:
         print("No validators available!")
@@ -116,14 +133,11 @@ def run_validators(purl, validators):
     for key, validator in validators.items():
         vendor = validator()
         vendor_advisories = vendor.validator_advisory(PackageURL.from_string(purl))
-        not_vulnerable_in_vendor_advisory = True
-
-        for advisory in vendor_advisories:
-            if not_vulnerable_in_vendor_advisory:
-                not_vulnerable_in_vendor_advisory = False
-            table.add_row(formatted_row(key, advisory))
 
-        if not_vulnerable_in_vendor_advisory:
+        if vendor_advisories:
+            for advisory in vendor_advisories:
+                table.add_row(formatted_row(key, advisory))
+        else:
             table.add_row([key.upper(), "None", "None", "None"])
 
     pydoc.pager(table.draw())
@@ -138,6 +152,9 @@ def handler():
     parser.add_argument(
         "-l", "--list", action="store_true", help="Lists all the available validators"
     )
+    parser.add_argument(
+        "-r", "--raw", action="store_true", help="List of all the raw response from vendor"
+    )
     parser.add_argument(
         "-e", "--enable", metavar="validator", nargs="+", help="Enable these validator/s only"
     )
@@ -157,6 +174,17 @@ def handler():
     elif args.list:
         list_validators()
 
+    elif args.raw:
+        if args.purl:
+            if args.enable:
+                get_raw_response(args.purl, get_enabled_validator(args.enable))
+
+            elif args.disable:
+                get_raw_response(args.purl, get_undisabled_validator(args.disable))
+
+            else:
+                get_raw_response(args.purl, VALIDATORS_REGISTRY)
+
     elif args.purl:
         if args.enable:
             run_validators(args.purl, get_enabled_validator(args.enable))