freewvs.git

@@ -26,7 +26,8 @@ import ConfigParser, os, glob, pprint, re, optparse, sys

 def versioncompare(safe_version, find_version):

-  if safe_version==[""]: return True

+    if safe_version == [""]:

+        return True

     for i in range(min(len(find_version), len(safe_version))):

         if int(find_version[i])<int(safe_version[i]):

             return True

@@ -34,9 +35,10 @@ def versioncompare(safe_version,find_version):

             return False

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

-def vulnprint(appname,version,safeversion,vuln,filename,subdir):

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

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

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

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

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

+          % vars()

 pp = pprint.PrettyPrinter(indent=4)

@@ -45,7 +47,8 @@ parser = optparse.OptionParser()

 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 for development")

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

+                  "for development")

 opts, args = parser.parse_args()

 # Parse vulnerability database

@@ -68,24 +71,32 @@ for sect in config.sections():

     # match magic

     item['variable'] = []

     for var in config.get(sect,'variable').split(","):

-        item['variable'].append(re.compile(re.escape(var)+r"[^0-9.]*[.]*([0-9.]*[0-9])[^0-9.]"))

+        item['variable'].append(re.compile(re.escape(var)+

+                                r"[^0-9.]*[.]*([0-9.]*[0-9])[^0-9.]"))

     # optional options

-  if config.has_option(sect,'extra_match'): item['extra_match']=config.get(sect,'extra_match')

-  else: item['extra_match']=False

-  if config.has_option(sect,'add_minor'): item['add_minor']=config.get(sect,'add_minor')

-  else: item['add_minor']=False

-  if config.has_option(sect,'old_safe'): item['old_safe']=config.get(sect,'old_safe').split(",")

-  else: item['old_safe']=[]

+    if config.has_option(sect,'extra_match'):

+        item['extra_match'] = config.get(sect,'extra_match')

+    else:

+        item['extra_match'] = False

+    if config.has_option(sect,'add_minor'):

+        item['add_minor'] = config.get(sect,'add_minor')

+    else:

+        item['add_minor'] = False

+    if config.has_option(sect,'old_safe'):

+        item['old_safe'] = config.get(sect,'old_safe').split(",")

+    else:

+        item['old_safe'] = []

     vdb.append(item)

-if opts.DEBUG: pp.pprint(vdb)

+if opts.DEBUG:

+    pp.pprint(vdb)

 # start the search

-for dir in args:

-  for root,NULL,files in os.walk(dir):

+for fdir in args:

+    for root, NULL, files in os.walk(fdir):

         for filename in files:

             for item in vdb:

                 if filename == item['file']:

@@ -94,8 +105,10 @@ for dir in args:

                     filestr = file.read()

                     file.close()

-          if item['extra_match']: ematch=(filestr.find(item['extra_match'])!=-1)

-          else: ematch=True

+                    if item['extra_match']:

+                        ematch = (filestr.find(item['extra_match']) != -1)

+                    else:

+                        ematch = True

                     findversion = []

                     for var in item['variable']:

@@ -112,16 +125,26 @@ for dir in args:

                         # Very ugly phpbb workaround

                         if item['add_minor']:

                             findversion = findversion.split('.')

-              findversion[-1]=str(int(findversion[-1])+int(item['add_minor']))

+                            findversion[-1] = str(int(findversion[-1])+

+                                            int(item['add_minor']))

                             findversion = '.'.join(findversion)

-            if not (versioncompare(item['safe'].split('.'),findversion.split('.'))) or item['old_safe'].count(findversion)>0:

+                        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'])

+                                if opts.DEBUG:

+                                    print "File "+mfile

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

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

                         else:

-              if opts.DEBUG: print "File "+mfile

-              vulnprint (item['name'],findversion,item['safe'],item['vuln'],mfile,item['subdir'])

+                            if opts.DEBUG:

+                                print "File "+mfile

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

+                                       item['safe'], item['vuln'], \

+                                       mfile, item['subdir'])

                     else:

-            if opts.DEBUG: print "regexp failed for "+item['name']+" on "+mfile

+                        if opts.DEBUG:

+                            print "regexp failed for " + \

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