freewvs.git

@@ -31,7 +31,13 @@ except ImportError: # python2

     # this one supports encoding='...'

     from codecs import open

-import os, glob, pprint, re, optparse, sys, gettext

+import os

+import glob

+import pprint

+import re

+import optparse

+import sys

+import gettext

 from xml.sax.saxutils import escape

 gettext.textdomain('freewvs')

@@ -47,23 +54,25 @@ def versioncompare(safe_version, find_version):

             return False

     return (len(find_version) < len(safe_version))

-def vulnprint(appname, version, safeversion, vuln, vfilename, subdir, style = None):

+

+def vulnprint(appname, version, safeversion, vuln, vfilename, subdir,

+              style=None):

     appdir = '/'.join(os.path.abspath(vfilename).split('/')[:-1-subdir])

     if not style:

-        print ("%(appname)s %(version)s (%(safeversion)s) %(vuln)s %(appdir)s" \

-              % vars())

+        print("%(appname)s %(version)s (%(safeversion)s) %(vuln)s"

+              "%(appdir)s" % vars())

     elif style == 'fancy':

         print(_("Directory: %(appdir)s") % vars())

         if safeversion != "ok":

             if safeversion != "":

-                print (_("Vulnerable %(appname)s %(version)s found, please update to " \

-                        "%(safeversion)s or above.") % vars())

+                print(_("Vulnerable %(appname)s %(version)s found, please "

+                        "update to %(safeversion)s or above.") % vars())

             else:

-                print (_("Vulnerable %(appname)s %(version)s found, no fixed version available." \

-                        ) % vars())

+                print(_("Vulnerable %(appname)s %(version)s found, no fixed "

+                        "version available.") % vars())

             if vuln[:3] == "CVE":

-                print (_("http://cve.mitre.org/cgi-bin/cvename.cgi?name=%(vuln)s") \

-                        % vars())

+                print(_("http://cve.mitre.org/cgi-bin/cvename.cgi?name="

+                        "%(vuln)s") % vars())

             else:

                 print(vuln)

         else:

@@ -86,16 +95,17 @@ def vulnprint(appname, version, safeversion, vuln, vfilename, subdir, style = No

 pp = pprint.PrettyPrinter(indent=4)

 # Command-line options

-parser = optparse.OptionParser(usage="usage: %prog [options] <path> [<path2> ...]")

+parser = optparse.OptionParser(usage="usage: %prog [options] <path>"

+                               "[<path2> ...]")

 parser.add_option("-a", "--all", action="store_true", dest="ALL",

                   help="Show all webapps found, not just vulnerable")

 parser.add_option("-d", "--debug", action="store_true", dest="DEBUG",

-                  help="Show lots of debugging output, mainly useful"+ \

+                  help="Show lots of debugging output, mainly useful"

                   "for development")

-parser.add_option("-f", "--fancy", action="store_const", dest="OUTPUT", const="fancy",

-                  help="Show more fancy output")

-parser.add_option("-x", "--xml", action="store_const", dest="OUTPUT", const="xml",

-                  help="Output results as XML")

+parser.add_option("-f", "--fancy", action="store_const", dest="OUTPUT",

+                  const="fancy", help="Show more fancy output")

+parser.add_option("-x", "--xml", action="store_const", dest="OUTPUT",

+                  const="xml", help="Output results as XML")

 opts, args = parser.parse_args()

 # Parse vulnerability database

@@ -105,7 +115,7 @@ try:

     config.read(glob.glob('/usr/local/share/freewvs/*.freewvs'))

     config.read(glob.glob(os.path.dirname(sys.argv[0])+'/freewvsdb/*.freewvs'))

 except configparser.MissingSectionHeaderError as err:

-    print("Error parsing config files: %s" % err);

+    print("Error parsing config files: %s" % err)

 vdb = []

 for sect in config.sections():

@@ -185,35 +195,35 @@ for fdir in args:

                                                   int(item['add_minor']))

                             findversion = '.'.join(findversion)

-                        if not (versioncompare(item['safe'].split('.'), \

+                        if not (versioncompare(item['safe'].split('.'),

                                 findversion.split('.'))) or \

                                 item['old_safe'].count(findversion) > 0:

                             if opts.ALL:

                                 if opts.DEBUG:

                                     print("File "+mfile)

-                                vulnprint(item['name'], findversion, \

-                                          "ok", "", mfile, item['subdir'], \

+                                vulnprint(item['name'], findversion,

+                                          "ok", "", mfile, item['subdir'],

                                           opts.OUTPUT)

                         else:

                             if opts.DEBUG:

                                 print("File " + mfile)

                             safev = "9999"

                             for ver in item['old_safe']:

-                                if (versioncompare(ver.split('.'), \

-                                    findversion.split('.') ) and \

-                                    not versioncompare(ver.split('.'), \

+                                if(versioncompare(ver.split('.'),

+                                   findversion.split('.')) and

+                                   not versioncompare(ver.split('.'),

                                    safev.split('.'))):

                                     safev = ver

                             if safev == "9999":

                                 safev = item['safe']

-                            vulnprint (item['name'], findversion, \

-                                       safev, item['vuln'], \

+                            vulnprint(item['name'], findversion,

+                                      safev, item['vuln'],

                                       mfile, item['subdir'], opts.OUTPUT)

                     else:

                         if opts.DEBUG:

-                            print ("regexp failed for " + \

+                            print("regexp failed for " +

                                   item['name'] + " on " + mfile)

 if opts.OUTPUT == 'xml':