adulau/pdns-qof-server
1
0
Fork 0
mirror of https://github.com/adulau/pdns-qof-server.git synced 2024-11-22 01:57:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add full support for parameters through argparse

Browse source
This commit is contained in:
Raphaël Vinot 2016-08-29 17:05:33 +02:00
parent 6a2b5e317c
commit 138b619328
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
qos_server/__init__.py
View file

@ -200,11 +200,19 @@ def main():
signal.signal(signal.SIGINT, handle_signal) signal.signal(signal.SIGINT, handle_signal)
signal.signal(signal.SIGTERM, handle_signal) signal.signal(signal.SIGTERM, handle_signal)
argParser = argparse.ArgumentParser(description='qof-server server') argParser = argparse.ArgumentParser(description='qof-server server')
argParser.add_argument('-o', default='https://www.circl.lu/pdns/', help='Origin of the PDNS (default: https://www.circl.lu/pdns/)')
argParser.add_argument('-p', default=8888, help='qof-server TCP port (default 8888)') argParser.add_argument('-p', default=8888, help='qof-server TCP port (default 8888)')
argParser.add_argument('-l', default='localhost', help='misp-modules listen address (default localhost)') argParser.add_argument('-l', default='localhost', help='qof-server listen address (default localhost)')
argParser.add_argument('-rp', default=6379, help='redis-server TCP port (default 8888)')
argParser.add_argument('-rl', default='localhost', help='redis-server listen address (default localhost)')
argParser.add_argument('-rd', default=0, help='redis-server database (default 0)')
args = argParser.parse_args() args = argParser.parse_args()
origin = args.o
port = args.p port = args.p
listen = args.l listen = args.l
redis_port = args.rp
redis_listen = args.rl
redis_db = args.rd
rrset = [ rrset = [
{"Reference": "[RFC1035]", "Type": "A", "Value": "1", "Meaning": "a host address", "Template": "", "Registration Date": ""}, {"Reference": "[RFC1035]", "Type": "A", "Value": "1", "Meaning": "a host address", "Template": "", "Registration Date": ""},
@ -288,12 +296,10 @@ def main():
{"Reference": "[RFC4431]", "Type": "DLV", "Value": "32769", "Meaning": "DNSSEC Lookaside Validation", "Template": "", "Registration Date": ""}, {"Reference": "[RFC4431]", "Type": "DLV", "Value": "32769", "Meaning": "DNSSEC Lookaside Validation", "Template": "", "Registration Date": ""},
{"Reference": "", "Type": "Reserved", "Value": "65535", "Meaning": "", "Template": "", "Registration Date": ""}] {"Reference": "", "Type": "Reserved", "Value": "65535", "Meaning": "", "Template": "", "Registration Date": ""}]
r = redis.StrictRedis(host='localhost', port=6379, db=0) r = redis.StrictRedis(host=redis_listen, port=redis_port, db=redis_db)
rrset_supported = ['1', '2', '5', '15', '28', '33'] rrset_supported = ['1', '2', '5', '15', '28', '33']
origin = "https://www.circl.lu/pdns/"
application = tornado.web.Application([ application = tornado.web.Application([
(r"/query/(.*)", QueryHandler), (r"/query/(.*)", QueryHandler),
(r"/fquery/(.*)", FullQueryHandler), (r"/fquery/(.*)", FullQueryHandler),
@ -311,7 +317,7 @@ elif __name__ == "test":
qq = ["foo.be", "8.8.8.8"] qq = ["foo.be", "8.8.8.8"]
for q in qq: for q in qq:
if iptools.ipv4.validate_ip(q) or iptools.ipv6.validate_ip(q): if is_ip(q):
for x in getAssociatedRecords(q): for x in getAssociatedRecords(q):
print(JsonQOF(getRecord(x))) print(JsonQOF(getRecord(x)))
else: else: