little change filter.py

This commit is contained in:
Bastian Schroll 2015-05-24 23:52:10 +02:00
parent 623d8967aa
commit d460947685
2 changed files with 9 additions and 5 deletions

View file

@ -41,9 +41,12 @@ filter_range_end = 9999999
[Filters]
#RegEX Filter Configuration
#No Filter for a Typ/Plugin Combination = all Data pass
#INDIVIDUAL_NAME = TYP;PLUGIN;REGEX
##testfilter = ZVEI;template;25[0-9F]{3} #only ZVEI to template with 25###
#only ZVEI to template with 25###
#testfilter = ZVEI;template;25[0-9F]{3}
[Plugins]
@ -51,6 +54,7 @@ filter_range_end = 9999999
MySQL = 0
BosMon = 0
httpRequest = 0
# for developing template-module
template = 0

View file

@ -24,16 +24,16 @@ def checkFilters(data,typ,plugin):
logging.debug("search Filter for %s to %s", typ, plugin)
#extract the correct data for filtering
if typ == "FMS": data = data["fms"]
if typ == "ZVEI": data = data["zvei"]
if typ == "POC": data = data["poc"]
#if typ == "FMS": data = data["fms"]
#if typ == "ZVEI": data = data["zvei"]
#if typ == "POC": data = data["poc"]
foundFilter = False
for i in globals.filterList:
if i["typ"] == typ and i["plugin"] == plugin:
foundFilter = True
logging.debug("found Filter: %s = %s", i["name"], i["regex"])
if re.search(i["regex"], data):
if re.search(i["regex"], data[typ.lower()]):
logging.debug("Filter passed: %s", i["name"])
return True
else: