[web] master update

[Mark J. Cox]

The branch master has been updated
       via  e06c12c5f7222ba0a7fc7982bf8e4b8f696d0222 (commit)
       via  9d0d2ec0fd21f46e4503282a9b9f1739869accfb (commit)
      from  9801203e145577c03541cf147946d107d9ae74c5 (commit)


- Log -----------------------------------------------------------------
commit e06c12c5f7222ba0a7fc7982bf8e4b8f696d0222
Author: Mark J. Cox <mark at awe.com>
Date:   Fri Mar 20 09:02:32 2020 +0000

    Simple fix for #159 if we can't open the schema tell the user how to work around it.  We
    actually need to do that because some older? Ubuntu systems were having problems with the
    CA cert from github

commit 9d0d2ec0fd21f46e4503282a9b9f1739869accfb
Author: Mark J. Cox <mark at awe.com>
Date:   Thu Mar 19 14:43:19 2020 +0000

    Mitre have been stripping whitespace after commas on submitted entries, so let's
    do that by default.  But they are keeping the whitespace after :.
    
    fixes #160

-----------------------------------------------------------------------

Summary of changes:
 bin/vulnxml2json.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/bin/vulnxml2json.py b/bin/vulnxml2json.py
index cffa29f..3b1dcbb 100755
--- a/bin/vulnxml2json.py
+++ b/bin/vulnxml2json.py
@@ -39,7 +39,11 @@ if not options.input:
    exit();
 
 if options.schema:
-   response = urllib.urlopen(options.schema)
+   try:
+      response = urllib.urlopen(options.schema)
+   except:
+      print "Problem opening schema: try downloading it manually then specify it using --schema option: %s" % options.schema
+      exit()
    schema_doc = json.loads(response.read())
 
 cvej = list()
@@ -146,7 +150,7 @@ for issue in cvej:
        continue
 
     f = codecs.open(options.outputdir+"/"+fn, 'w', 'utf-8')
-    f.write(json.dumps(issue, sort_keys=True, indent=4))
+    f.write(json.dumps(issue, sort_keys=True, indent=4, separators=(',',': ')))
     print "wrote %s" %(options.outputdir+"/"+fn)
     f.close()