Comparison on flavors

Code cleaning ...
This commit is contained in:
Paul 2016-02-20 12:40:51 +01:00
parent 080505a032
commit 43c6164e10
2 changed files with 110 additions and 92 deletions

View File

@ -5,6 +5,7 @@ import os
import re import re
import urllib import urllib
from urlparse import urlparse from urlparse import urlparse
try: try:
import config import config
except ImportError: except ImportError:
@ -16,31 +17,34 @@ except ImportError:
print("Please install python-cdb from pypi or via package manager") print("Please install python-cdb from pypi or via package manager")
exit() exit()
def make_list(files): def make_list(files):
blacklists = [] blacklists = []
for l in files: for l in files:
splitlist = l.split("/") splitlist = l.split("/")
list_type = splitlist[len(splitlist)-2] list_type = splitlist[len(splitlist) - 2]
blacklists.append([list_type,l]) blacklists.append([list_type, l])
return blacklists return blacklists
def make_db(blacklist_files,config):
def make_db(blacklist_files, config):
lib = [] lib = []
for bl in blacklist_files: for bl in blacklist_files:
bl_cdb_file = ("%s/%s.cdb" % (config.blacklists_dir,bl[0])) bl_cdb_file = ("%s/%s.cdb" % (config.blacklists_dir, bl[0]))
bl_cdb_file_tmp = ("%s/%s.tmp" % (config.blacklists_dir,bl[0])) bl_cdb_file_tmp = ("%s/%s.tmp" % (config.blacklists_dir, bl[0]))
if(bl[0] in config.blacklists): if (bl[0] in config.blacklists):
if not os.path.isfile(bl_cdb_file): if not os.path.isfile(bl_cdb_file):
cdb_file = cdb.cdbmake(bl_cdb_file,bl_cdb_file_tmp) cdb_file = cdb.cdbmake(bl_cdb_file, bl_cdb_file_tmp)
cache = dict() cache = dict()
f = open(bl[1], "r") f = open(bl[1], "r")
for line in f: for line in f:
cdb_file.add(line.strip("\n"),"True") cdb_file.add(line.strip("\n"), "True")
cdb_file.finish() cdb_file.finish()
lib.append(bl_cdb_file) lib.append(bl_cdb_file)
return lib return lib
def compare(outline,blacklist_cache):
def compare(outline, blacklist_cache):
result = False result = False
for blacklist in blacklist_cache: for blacklist in blacklist_cache:
cdb_file = cdb.init(blacklist) cdb_file = cdb.init(blacklist)
@ -54,20 +58,25 @@ def compare(outline,blacklist_cache):
tmpline = tmpline.partition('.')[2] tmpline = tmpline.partition('.')[2]
return result return result
def squid_response(response): def squid_response(response):
sys.stdout.write("%s\n" % response) sys.stdout.write("%s\n" % response)
sys.stdout.flush() sys.stdout.flush()
domain_files = [os.path.join(dp, f) for dp, dn, fn in os.walk(os.path.expanduser(config.blacklists_dir)) for f in fn if re.match(r"domains*", f)] domain_files = [os.path.join(dp, f) for dp, dn, fn in os.walk(os.path.expanduser(config.blacklists_dir)) for f in fn if re.match(r"domains*", f)]
blacklist_files = make_list(domain_files) blacklist_files = make_list(domain_files)
blacklist_cache = make_db(blacklist_files,config) blacklist_cache = make_db(blacklist_files, config)
while True: while True:
try:
line = sys.stdin.readline().strip() line = sys.stdin.readline().strip()
outline = urlparse(line).netloc outline = urlparse(line).netloc
if line: if line:
if compare(outline,blacklist_cache): if compare(outline, blacklist_cache):
squid_response("OK") squid_response("OK")
else: else:
squid_response("ERR") squid_response("ERR")
except KeyboardInterrupt:
break

View File

@ -5,24 +5,27 @@ import os
import re import re
import urllib import urllib
from urlparse import urlparse from urlparse import urlparse
try: try:
import config import config
except ImportError: except ImportError:
print("Please create config.py using config.py.sample") print("Please create config.py using config.py.sample")
exit() exit()
def make_list(files): def make_list(files):
blacklists = [] blacklists = []
for l in files: for l in files:
splitlist = l.split("/") splitlist = l.split("/")
list_type = splitlist[len(splitlist)-2] list_type = splitlist[len(splitlist) - 2]
blacklists.append([list_type,l]) blacklists.append([list_type, l])
return blacklists return blacklists
def make_db(blacklist_files,blacklists):
def make_db(blacklist_files, config):
lib = dict() lib = dict()
for bl in blacklist_files: for bl in blacklist_files:
if(bl[0] in blacklists): if (bl[0] in config.blacklists):
cache = dict() cache = dict()
f = open(bl[1], "r") f = open(bl[1], "r")
for line in f: for line in f:
@ -31,7 +34,8 @@ def make_db(blacklist_files,blacklists):
del cache del cache
return lib return lib
def compare(outline,blacklist_cache):
def compare(outline, blacklist_cache):
result = False result = False
for blacklist in blacklist_cache: for blacklist in blacklist_cache:
tmpline = outline tmpline = outline
@ -44,20 +48,25 @@ def compare(outline,blacklist_cache):
tmpline = tmpline.partition('.')[2] tmpline = tmpline.partition('.')[2]
return result return result
def squid_response(response): def squid_response(response):
sys.stdout.write("%s\n" % response) sys.stdout.write("%s\n" % response)
sys.stdout.flush() sys.stdout.flush()
domain_files = [os.path.join(dp, f) for dp, dn, fn in os.walk(os.path.expanduser(config.blacklists_dir)) for f in fn if re.match(r"domains*", f)] domain_files = [os.path.join(dp, f) for dp, dn, fn in os.walk(os.path.expanduser(config.blacklists_dir)) for f in fn if re.match(r"domains*", f)]
blacklist_files = make_list(domain_files) blacklist_files = make_list(domain_files)
blacklist_cache = make_db(blacklist_files,config.blacklists) blacklist_cache = make_db(blacklist_files, config)
while True: while True:
try:
line = sys.stdin.readline().strip() line = sys.stdin.readline().strip()
outline = urlparse(line).netloc outline = urlparse(line).netloc
if line: if line:
if compare(outline,blacklist_cache): if compare(outline, blacklist_cache):
squid_response("OK") squid_response("OK")
else: else:
squid_response("ERR") squid_response("ERR")
except KeyboardInterrupt:
break