freewvs.git

@@ -130,10 +130,8 @@ for sect in config.sections():

     item['subdir'] = int(config.get(sect, 'subdir'))

     # match magic

-    item['variable'] = []

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

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

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

+    item['variable'] = re.compile(re.escape(config.get(sect, 'variable'))

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

     # optional options

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

@@ -180,28 +178,18 @@ for fdir in args:

                     filestr = file.read()

                     file.close()

-                    if item['extra_match']:

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

-                    elif item['extra_nomatch']:

-                        ematch = not filestr.find(item['extra_nomatch']) != -1

-                    else:

-                        ematch = True

-

-                    if (item['path_match']

-                       and not root.endswith(item['path_match'])):

+                    if ((item['extra_match']

+                       and item['extra_match'] not in filestr)

+                       or (item['extra_nomatch']

+                       and item['extra_nomatch'] not in filestr)

+                       or (item['path_match']

+                       and not root.endswith(item['path_match']))):

                         continue

-                    findversion = []

-                    for var in item['variable']:

-                        var = var.search(filestr)

-                        if not var:

-                            findversion = False

-                            break

-                        else:

-                            findversion.append(var.group(1))

-

-                    if findversion and ematch:

-                        findversion = '.'.join(findversion)

+                    findversion = item['variable'].search(filestr)

+                    if not findversion:

+                        continue

+                    findversion=findversion.group(1)

                     # Very ugly phpbb workaround

                     if item['add_minor']:

@@ -236,10 +224,5 @@ for fdir in args:

                                   safev, item['vuln'],

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

-                    else:

-                        if opts.DEBUG:

-                            print("regexp failed for "

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

-

 if opts.OUTPUT == 'xml':

     print('</freewvs>')