From f5b2c32d03aac0b86e91c7776e5931d234de03ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Vinot?= Date: Mon, 29 Aug 2016 17:45:41 +0200 Subject: [PATCH 1/2] Move non-tornado code to a class --- qos_server/__init__.py | 215 ++++------------------------------------- qos_server/query.py | 179 ++++++++++++++++++++++++++++++++++ 2 files changed, 197 insertions(+), 197 deletions(-) create mode 100644 qos_server/query.py diff --git a/qos_server/__init__.py b/qos_server/__init__.py index 4fb43a0..9ab78dc 100644 --- a/qos_server/__init__.py +++ b/qos_server/__init__.py @@ -22,101 +22,16 @@ from tornado.concurrent import run_on_executor from concurrent.futures import ThreadPoolExecutor import argparse -from ipaddress import ip_address -import redis -import json import sys import signal +from .query import Query + def handle_signal(sig, frame): IOLoop.instance().add_callback(IOLoop.instance().stop) -def getFirstSeen(t1=None, t2=None): - if t1 is None or t2 is None: - return False - rec = "s:" + t1.lower() + ":" + t2.lower() - recget = r.get(rec) - if recget is not None: - return int(recget.decode(encoding='UTF-8')) - - -def getLastSeen(t1=None, t2=None): - if t1 is None or t2 is None: - return False - rec = "l:" + t1.lower() + ":" + t2.lower() - recget = r.get(rec) - if recget is not None: - return int(recget.decode(encoding='UTF-8')) - - -def getCount(t1=None, t2=None): - if t1 is None or t2 is None: - return False - rec = "o:" + t1.lower() + ":" + t2.lower() - recget = r.get(rec) - if recget is not None: - return int(recget.decode(encoding='UTF-8')) - - -def getRecord(t=None): - if t is None: - return False - rrfound = [] - for rr in rrset: - if (rr['Value']) is not None and rr['Value'] in rrset_supported: - rec = "r:" + t + ":" + rr['Value'] - rs = r.smembers(rec) - if rs: - for v in rs: - rrval = {} - rdata = v.decode(encoding='UTF-8').strip() - rrval['time_first'] = getFirstSeen(t1=t, t2=rdata) - rrval['time_last'] = getLastSeen(t1=t, t2=rdata) - if rrval['time_first'] is None: - break - rrval['count'] = getCount(t1=t, t2=rdata) - rrval['rrtype'] = rr['Type'] - rrval['rrname'] = t - rrval['rdata'] = rdata - if origin: - rrval['origin'] = origin - rrfound.append(rrval) - return rrfound - - -def getAssociatedRecords(rdata=None): - if rdata is None: - return False - rec = "v:" + rdata.lower() - records = [] - if r.smembers(rec): - for v in r.smembers(rec): - records.append(v.decode(encoding='UTF-8')) - return records - - -def RemDuplicate(d=None): - if d is None: - return False - outd = [dict(t) for t in set([tuple(o.items()) for o in d])] - return outd - - -def JsonQOF(rrfound=None, RemoveDuplicate=True): - if rrfound is None: - return False - rrqof = "" - - if RemoveDuplicate: - rrfound = RemDuplicate(d=rrfound) - - for rr in rrfound: - rrqof = rrqof + json.dumps(rr) + "\n" - return rrqof - - class InfoHandler(tornado.web.RequestHandler): def get(self): response = {'version': 'git', @@ -124,14 +39,6 @@ class InfoHandler(tornado.web.RequestHandler): self.write(response) -def is_ip(q): - try: - ip_address(q) - return True - except: - return False - - class QueryHandler(tornado.web.RequestHandler): # Default value in Python 3.5 @@ -142,11 +49,11 @@ class QueryHandler(tornado.web.RequestHandler): @run_on_executor def run_request(self, q): to_return = [] - if is_ip(q): - for x in getAssociatedRecords(q): - to_return.append(JsonQOF(getRecord(x))) + if query.is_ip(q): + for x in query.getAssociatedRecords(q): + to_return.append(query.getRecord(x)) else: - to_return.append(JsonQOF(getRecord(t=q.strip()))) + to_return.append(query.getRecord(t=q.strip())) return to_return @tornado.gen.coroutine @@ -171,12 +78,12 @@ class FullQueryHandler(tornado.web.RequestHandler): @run_on_executor def run_request(self, q): to_return = [] - if is_ip(q): - for x in getAssociatedRecords(q): - to_return.append(JsonQOF(getRecord(x))) + if query.is_ip(q): + for x in query.getAssociatedRecords(q): + to_return.append(query.getRecord(x)) else: - for x in getAssociatedRecords(q): - to_return.append(JsonQOF(getRecord(t=x.strip()))) + for x in query.getAssociatedRecords(q): + to_return.append(query.getRecord(t=x.strip())) return to_return @tornado.gen.coroutine @@ -193,10 +100,7 @@ class FullQueryHandler(tornado.web.RequestHandler): def main(): - global rrset - global r - global rrset_supported - global origin + global query signal.signal(signal.SIGINT, handle_signal) signal.signal(signal.SIGTERM, handle_signal) argParser = argparse.ArgumentParser(description='qof-server server') @@ -214,91 +118,7 @@ def main(): redis_listen = args.rl redis_db = args.rd - rrset = [ - {"Reference": "[RFC1035]", "Type": "A", "Value": "1", "Meaning": "a host address", "Template": "", "Registration Date": ""}, - {"Reference": "[RFC1035]", "Type": "NS", "Value": "2", "Meaning": "an authoritative name server", "Template": "", "Registration Date": ""}, - {"Reference": "[RFC1035]", "Type": "MD", "Value": "3", "Meaning": "a mail destination (OBSOLETE - use MX)", "Template": "", "Registration Date": ""}, - {"Reference": "[RFC1035]", "Type": "MF", "Value": "4", "Meaning": "a mail forwarder (OBSOLETE - use MX)", "Template": "", "Registration Date": ""}, - {"Reference": "[RFC1035]", "Type": "CNAME", "Value": "5", "Meaning": "the canonical name for an alias", "Template": "", "Registration Date": ""}, - {"Reference": "[RFC1035]", "Type": "SOA", "Value": "6", "Meaning": "marks the start of a zone of authority", "Template": "", "Registration Date": ""}, - {"Reference": "[RFC1035]", "Type": "MB", "Value": "7", "Meaning": "a mailbox domain name (EXPERIMENTAL)", "Template": "", "Registration Date": ""}, - {"Reference": "[RFC1035]", "Type": "MG", "Value": "8", "Meaning": "a mail group member (EXPERIMENTAL)", "Template": "", "Registration Date": ""}, - {"Reference": "[RFC1035]", "Type": "MR", "Value": "9", "Meaning": "a mail rename domain name (EXPERIMENTAL)", "Template": "", "Registration Date": ""}, - {"Reference": "[RFC1035]", "Type": "NULL", "Value": "10", "Meaning": "a null RR (EXPERIMENTAL)", "Template": "", "Registration Date": ""}, - {"Reference": "[RFC1035]", "Type": "WKS", "Value": "11", "Meaning": "a well known service description", "Template": "", "Registration Date": ""}, - {"Reference": "[RFC1035]", "Type": "PTR", "Value": "12", "Meaning": "a domain name pointer", "Template": "", "Registration Date": ""}, - {"Reference": "[RFC1035]", "Type": "HINFO", "Value": "13", "Meaning": "host information", "Template": "", "Registration Date": ""}, - {"Reference": "[RFC1035]", "Type": "MINFO", "Value": "14", "Meaning": "mailbox or mail list information", "Template": "", "Registration Date": ""}, - {"Reference": "[RFC1035]", "Type": "MX", "Value": "15", "Meaning": "mail exchange", "Template": "", "Registration Date": ""}, - {"Reference": "[RFC1035]", "Type": "TXT", "Value": "16", "Meaning": "text strings", "Template": "", "Registration Date": ""}, - {"Reference": "[RFC1183]", "Type": "RP", "Value": "17", "Meaning": "for Responsible Person", "Template": "", "Registration Date": ""}, - {"Reference": "[RFC1183][RFC5864]", "Type": "AFSDB", "Value": "18", "Meaning": "for AFS Data Base location", "Template": "", "Registration Date": ""}, - {"Reference": "[RFC1183]", "Type": "X25", "Value": "19", "Meaning": "for X.25 PSDN address", "Template": "", "Registration Date": ""}, - {"Reference": "[RFC1183]", "Type": "ISDN", "Value": "20", "Meaning": "for ISDN address", "Template": "", "Registration Date": ""}, - {"Reference": "[RFC1183]", "Type": "RT", "Value": "21", "Meaning": "for Route Through", "Template": "", "Registration Date": ""}, - {"Reference": "[RFC1706]", "Type": "NSAP", "Value": "22", "Meaning": "for NSAP address, NSAP style A record", "Template": "", "Registration Date": ""}, - {"Reference": "[RFC1348][RFC1637][RFC1706]", "Type": "NSAP-PTR", "Value": "23", "Meaning": "for domain name pointer, NSAP style", "Template": "", "Registration Date": ""}, - {"Reference": "[RFC4034][RFC3755][RFC2535][RFC2536][RFC2537][RFC2931][RFC3110][RFC3008]", "Type": "SIG", "Value": "24", "Meaning": "for security signature", "Template": "", "Registration Date": ""}, - {"Reference": "[RFC4034][RFC3755][RFC2535][RFC2536][RFC2537][RFC2539][RFC3008][RFC3110]", "Type": "KEY", "Value": "25", "Meaning": "for security key", "Template": "", "Registration Date": ""}, - {"Reference": "[RFC2163]", "Type": "PX", "Value": "26", "Meaning": "X.400 mail mapping information", "Template": "", "Registration Date": ""}, - {"Reference": "[RFC1712]", "Type": "GPOS", "Value": "27", "Meaning": "Geographical Position", "Template": "", "Registration Date": ""}, - {"Reference": "[RFC3596]", "Type": "AAAA", "Value": "28", "Meaning": "IP6 Address", "Template": "", "Registration Date": ""}, - {"Reference": "[RFC1876]", "Type": "LOC", "Value": "29", "Meaning": "Location Information", "Template": "", "Registration Date": ""}, - {"Reference": "[RFC3755][RFC2535]", "Type": "NXT", "Value": "30", "Meaning": "Next Domain (OBSOLETE)", "Template": "", "Registration Date": ""}, - {"Reference": "[Michael_Patton][http://ana-3.lcs.mit.edu/~jnc/nimrod/dns.txt]", "Type": "EID", "Value": "31", "Meaning": "Endpoint Identifier", "Template": "", "Registration Date": "1995-06"}, - {"Reference": "[1][Michael_Patton][http://ana-3.lcs.mit.edu/~jnc/nimrod/dns.txt]", "Type": "NIMLOC", "Value": "32", "Meaning": "Nimrod Locator", "Template": "", "Registration Date": "1995-06"}, - {"Reference": "[1][RFC2782]", "Type": "SRV", "Value": "33", "Meaning": "Server Selection", "Template": "", "Registration Date": ""}, - {"Reference": "[\n ATM Forum Technical Committee, \"ATM Name System, V2.0\", Doc ID: AF-DANS-0152.000, July 2000. Available from and held in escrow by IANA.]", "Type": "ATMA", "Value": "34", "Meaning": "ATM Address", "Template": "", "Registration Date": ""}, - {"Reference": "[RFC2915][RFC2168][RFC3403]", "Type": "NAPTR", "Value": "35", "Meaning": "Naming Authority Pointer", "Template": "", "Registration Date": ""}, - {"Reference": "[RFC2230]", "Type": "KX", "Value": "36", "Meaning": "Key Exchanger", "Template": "", "Registration Date": ""}, - {"Reference": "[RFC4398]", "Type": "CERT", "Value": "37", "Meaning": "CERT", "Template": "", "Registration Date": ""}, - {"Reference": "[RFC3226][RFC2874][RFC6563]", "Type": "A6", "Value": "38", "Meaning": "A6 (OBSOLETE - use AAAA)", "Template": "", "Registration Date": ""}, - {"Reference": "[RFC6672]", "Type": "DNAME", "Value": "39", "Meaning": "DNAME", "Template": "", "Registration Date": ""}, - {"Reference": "[Donald_E_Eastlake][http://tools.ietf.org/html/draft-eastlake-kitchen-sink]", "Type": "SINK", "Value": "40", "Meaning": "SINK", "Template": "", "Registration Date": "1997-11"}, - {"Reference": "[RFC6891][RFC3225]", "Type": "OPT", "Value": "41", "Meaning": "OPT", "Template": "", "Registration Date": ""}, - {"Reference": "[RFC3123]", "Type": "APL", "Value": "42", "Meaning": "APL", "Template": "", "Registration Date": ""}, - {"Reference": "[RFC4034][RFC3658]", "Type": "DS", "Value": "43", "Meaning": "Delegation Signer", "Template": "", "Registration Date": ""}, - {"Reference": "[RFC4255]", "Type": "SSHFP", "Value": "44", "Meaning": "SSH Key Fingerprint", "Template": "", "Registration Date": ""}, - {"Reference": "[RFC4025]", "Type": "IPSECKEY", "Value": "45", "Meaning": "IPSECKEY", "Template": "", "Registration Date": ""}, - {"Reference": "[RFC4034][RFC3755]", "Type": "RRSIG", "Value": "46", "Meaning": "RRSIG", "Template": "", "Registration Date": ""}, - {"Reference": "[RFC4034][RFC3755]", "Type": "NSEC", "Value": "47", "Meaning": "NSEC", "Template": "", "Registration Date": ""}, - {"Reference": "[RFC4034][RFC3755]", "Type": "DNSKEY", "Value": "48", "Meaning": "DNSKEY", "Template": "", "Registration Date": ""}, - {"Reference": "[RFC4701]", "Type": "DHCID", "Value": "49", "Meaning": "DHCID", "Template": "", "Registration Date": ""}, - {"Reference": "[RFC5155]", "Type": "NSEC3", "Value": "50", "Meaning": "NSEC3", "Template": "", "Registration Date": ""}, - {"Reference": "[RFC5155]", "Type": "NSEC3PARAM", "Value": "51", "Meaning": "NSEC3PARAM", "Template": "", "Registration Date": ""}, - {"Reference": "[RFC6698]", "Type": "TLSA", "Value": "52", "Meaning": "TLSA", "Template": "", "Registration Date": ""}, - {"Reference": "[RFC5205]", "Type": "HIP", "Value": "55", "Meaning": "Host Identity Protocol", "Template": "", "Registration Date": ""}, - {"Reference": "[Jim_Reid]", "Type": "NINFO", "Value": "56", "Meaning": "NINFO", "Template": "NINFO/ninfo-completed-template", "Registration Date": "2008-01-21"}, - {"Reference": "[Jim_Reid]", "Type": "RKEY", "Value": "57", "Meaning": "RKEY", "Template": "RKEY/rkey-completed-template", "Registration Date": "2008-01-21"}, - {"Reference": "[Wouter_Wijngaards]", "Type": "TALINK", "Value": "58", "Meaning": "Trust Anchor LINK", "Template": "TALINK/talink-completed-template", "Registration Date": "2010-02-17"}, - {"Reference": "[George_Barwood]", "Type": "CDS", "Value": "59", "Meaning": "Child DS", "Template": "CDS/cds-completed-template", "Registration Date": "2011-06-06"}, - {"Reference": "[RFC4408]", "Type": "SPF", "Value": "99", "Meaning": "", "Template": "", "Registration Date": ""}, - {"Reference": "[IANA-Reserved]", "Type": "UINFO", "Value": "100", "Meaning": "", "Template": "", "Registration Date": ""}, - {"Reference": "[IANA-Reserved]", "Type": "UID", "Value": "101", "Meaning": "", "Template": "", "Registration Date": ""}, - {"Reference": "[IANA-Reserved]", "Type": "GID", "Value": "102", "Meaning": "", "Template": "", "Registration Date": ""}, - {"Reference": "[IANA-Reserved]", "Type": "UNSPEC", "Value": "103", "Meaning": "", "Template": "", "Registration Date": ""}, - {"Reference": "[RFC6742]", "Type": "NID", "Value": "104", "Meaning": "", "Template": "ILNP/nid-completed-template", "Registration Date": ""}, - {"Reference": "[RFC6742]", "Type": "L32", "Value": "105", "Meaning": "", "Template": "ILNP/l32-completed-template", "Registration Date": ""}, - {"Reference": "[RFC6742]", "Type": "L64", "Value": "106", "Meaning": "", "Template": "ILNP/l64-completed-template", "Registration Date": ""}, - {"Reference": "[RFC6742]", "Type": "LP", "Value": "107", "Meaning": "", "Template": "ILNP/lp-completed-template", "Registration Date": ""}, - {"Reference": "[RFC7043]", "Type": "EUI48", "Value": "108", "Meaning": "an EUI-48 address", "Template": "EUI48/eui48-completed-template", "Registration Date": "2013-03-27"}, - {"Reference": "[RFC7043]", "Type": "EUI64", "Value": "109", "Meaning": "an EUI-64 address", "Template": "EUI64/eui64-completed-template", "Registration Date": "2013-03-27"}, - {"Reference": "[RFC2930]", "Type": "TKEY", "Value": "249", "Meaning": "Transaction Key", "Template": "", "Registration Date": ""}, - {"Reference": "[RFC2845]", "Type": "TSIG", "Value": "250", "Meaning": "Transaction Signature", "Template": "", "Registration Date": ""}, - {"Reference": "[RFC1995]", "Type": "IXFR", "Value": "251", "Meaning": "incremental transfer", "Template": "", "Registration Date": ""}, - {"Reference": "[RFC1035][RFC5936]", "Type": "AXFR", "Value": "252", "Meaning": "transfer of an entire zone", "Template": "", "Registration Date": ""}, - {"Reference": "[RFC1035]", "Type": "MAILB", "Value": "253", "Meaning": "mailbox-related RRs (MB, MG or MR)", "Template": "", "Registration Date": ""}, - {"Reference": "[RFC1035]", "Type": "MAILA", "Value": "254", "Meaning": "mail agent RRs (OBSOLETE - see MX)", "Template": "", "Registration Date": ""}, - {"Reference": "[RFC1035][RFC6895]", "Type": "*", "Value": "255", "Meaning": "A request for all records the server/cache has available", "Template": "", "Registration Date": ""}, - {"Reference": "[Patrik_Faltstrom]", "Type": "URI", "Value": "256", "Meaning": "URI", "Template": "URI/uri-completed-template", "Registration Date": "2011-02-22"}, - {"Reference": "[RFC6844]", "Type": "CAA", "Value": "257", "Meaning": "Certification Authority Restriction", "Template": "CAA/caa-completed-template", "Registration Date": "2011-04-07"}, - {"Reference": "[Sam_Weiler][http://cameo.library.cmu.edu/][\n Deploying DNSSEC Without a Signed Root. Technical Report 1999-19,\nInformation Networking Institute, Carnegie Mellon University, April 2004.]", "Type": "TA", "Value": "32768", "Meaning": "DNSSEC Trust Authorities", "Template": "", "Registration Date": "2005-12-13"}, - {"Reference": "[RFC4431]", "Type": "DLV", "Value": "32769", "Meaning": "DNSSEC Lookaside Validation", "Template": "", "Registration Date": ""}, - {"Reference": "", "Type": "Reserved", "Value": "65535", "Meaning": "", "Template": "", "Registration Date": ""}] - - r = redis.StrictRedis(host=redis_listen, port=redis_port, db=redis_db) - - rrset_supported = ['1', '2', '5', '15', '28', '33'] + query = Query(redis_listen, redis_port, redis_db, origin) application = tornado.web.Application([ (r"/query/(.*)", QueryHandler), @@ -314,11 +134,12 @@ def main(): if __name__ == '__main__': sys.exit(main()) elif __name__ == "test": + query = Query('localhost', 6379, 0, 'https://www.circl.lu/pdns/') qq = ["foo.be", "8.8.8.8"] for q in qq: - if is_ip(q): - for x in getAssociatedRecords(q): - print(JsonQOF(getRecord(x))) + if query.is_ip(q): + for x in query.getAssociatedRecords(q): + print(query.getRecord(x)) else: - print(JsonQOF(getRecord(t=q))) + print(query.getRecord(t=q)) diff --git a/qos_server/query.py b/qos_server/query.py new file mode 100644 index 0000000..0f671e2 --- /dev/null +++ b/qos_server/query.py @@ -0,0 +1,179 @@ +#!/usr/bin/env python3 +# -*- coding: utf-8 -*- + +import json +import redis +from ipaddress import ip_address + + +class Query(object): + + def __init__(self, redis_listen, redis_port, redis_db, origin): + self.rrset = [ + {"Reference": "[RFC1035]", "Type": "A", "Value": "1", "Meaning": "a host address", "Template": "", "Registration Date": ""}, + {"Reference": "[RFC1035]", "Type": "NS", "Value": "2", "Meaning": "an authoritative name server", "Template": "", "Registration Date": ""}, + {"Reference": "[RFC1035]", "Type": "MD", "Value": "3", "Meaning": "a mail destination (OBSOLETE - use MX)", "Template": "", "Registration Date": ""}, + {"Reference": "[RFC1035]", "Type": "MF", "Value": "4", "Meaning": "a mail forwarder (OBSOLETE - use MX)", "Template": "", "Registration Date": ""}, + {"Reference": "[RFC1035]", "Type": "CNAME", "Value": "5", "Meaning": "the canonical name for an alias", "Template": "", "Registration Date": ""}, + {"Reference": "[RFC1035]", "Type": "SOA", "Value": "6", "Meaning": "marks the start of a zone of authority", "Template": "", "Registration Date": ""}, + {"Reference": "[RFC1035]", "Type": "MB", "Value": "7", "Meaning": "a mailbox domain name (EXPERIMENTAL)", "Template": "", "Registration Date": ""}, + {"Reference": "[RFC1035]", "Type": "MG", "Value": "8", "Meaning": "a mail group member (EXPERIMENTAL)", "Template": "", "Registration Date": ""}, + {"Reference": "[RFC1035]", "Type": "MR", "Value": "9", "Meaning": "a mail rename domain name (EXPERIMENTAL)", "Template": "", "Registration Date": ""}, + {"Reference": "[RFC1035]", "Type": "NULL", "Value": "10", "Meaning": "a null RR (EXPERIMENTAL)", "Template": "", "Registration Date": ""}, + {"Reference": "[RFC1035]", "Type": "WKS", "Value": "11", "Meaning": "a well known service description", "Template": "", "Registration Date": ""}, + {"Reference": "[RFC1035]", "Type": "PTR", "Value": "12", "Meaning": "a domain name pointer", "Template": "", "Registration Date": ""}, + {"Reference": "[RFC1035]", "Type": "HINFO", "Value": "13", "Meaning": "host information", "Template": "", "Registration Date": ""}, + {"Reference": "[RFC1035]", "Type": "MINFO", "Value": "14", "Meaning": "mailbox or mail list information", "Template": "", "Registration Date": ""}, + {"Reference": "[RFC1035]", "Type": "MX", "Value": "15", "Meaning": "mail exchange", "Template": "", "Registration Date": ""}, + {"Reference": "[RFC1035]", "Type": "TXT", "Value": "16", "Meaning": "text strings", "Template": "", "Registration Date": ""}, + {"Reference": "[RFC1183]", "Type": "RP", "Value": "17", "Meaning": "for Responsible Person", "Template": "", "Registration Date": ""}, + {"Reference": "[RFC1183][RFC5864]", "Type": "AFSDB", "Value": "18", "Meaning": "for AFS Data Base location", "Template": "", "Registration Date": ""}, + {"Reference": "[RFC1183]", "Type": "X25", "Value": "19", "Meaning": "for X.25 PSDN address", "Template": "", "Registration Date": ""}, + {"Reference": "[RFC1183]", "Type": "ISDN", "Value": "20", "Meaning": "for ISDN address", "Template": "", "Registration Date": ""}, + {"Reference": "[RFC1183]", "Type": "RT", "Value": "21", "Meaning": "for Route Through", "Template": "", "Registration Date": ""}, + {"Reference": "[RFC1706]", "Type": "NSAP", "Value": "22", "Meaning": "for NSAP address, NSAP style A record", "Template": "", "Registration Date": ""}, + {"Reference": "[RFC1348][RFC1637][RFC1706]", "Type": "NSAP-PTR", "Value": "23", "Meaning": "for domain name pointer, NSAP style", "Template": "", "Registration Date": ""}, + {"Reference": "[RFC4034][RFC3755][RFC2535][RFC2536][RFC2537][RFC2931][RFC3110][RFC3008]", "Type": "SIG", "Value": "24", "Meaning": "for security signature", "Template": "", "Registration Date": ""}, + {"Reference": "[RFC4034][RFC3755][RFC2535][RFC2536][RFC2537][RFC2539][RFC3008][RFC3110]", "Type": "KEY", "Value": "25", "Meaning": "for security key", "Template": "", "Registration Date": ""}, + {"Reference": "[RFC2163]", "Type": "PX", "Value": "26", "Meaning": "X.400 mail mapping information", "Template": "", "Registration Date": ""}, + {"Reference": "[RFC1712]", "Type": "GPOS", "Value": "27", "Meaning": "Geographical Position", "Template": "", "Registration Date": ""}, + {"Reference": "[RFC3596]", "Type": "AAAA", "Value": "28", "Meaning": "IP6 Address", "Template": "", "Registration Date": ""}, + {"Reference": "[RFC1876]", "Type": "LOC", "Value": "29", "Meaning": "Location Information", "Template": "", "Registration Date": ""}, + {"Reference": "[RFC3755][RFC2535]", "Type": "NXT", "Value": "30", "Meaning": "Next Domain (OBSOLETE)", "Template": "", "Registration Date": ""}, + {"Reference": "[Michael_Patton][http://ana-3.lcs.mit.edu/~jnc/nimrod/dns.txt]", "Type": "EID", "Value": "31", "Meaning": "Endpoint Identifier", "Template": "", "Registration Date": "1995-06"}, + {"Reference": "[1][Michael_Patton][http://ana-3.lcs.mit.edu/~jnc/nimrod/dns.txt]", "Type": "NIMLOC", "Value": "32", "Meaning": "Nimrod Locator", "Template": "", "Registration Date": "1995-06"}, + {"Reference": "[1][RFC2782]", "Type": "SRV", "Value": "33", "Meaning": "Server Selection", "Template": "", "Registration Date": ""}, + {"Reference": "[\n ATM Forum Technical Committee, \"ATM Name System, V2.0\", Doc ID: AF-DANS-0152.000, July 2000. Available from and held in escrow by IANA.]", "Type": "ATMA", "Value": "34", "Meaning": "ATM Address", "Template": "", "Registration Date": ""}, + {"Reference": "[RFC2915][RFC2168][RFC3403]", "Type": "NAPTR", "Value": "35", "Meaning": "Naming Authority Pointer", "Template": "", "Registration Date": ""}, + {"Reference": "[RFC2230]", "Type": "KX", "Value": "36", "Meaning": "Key Exchanger", "Template": "", "Registration Date": ""}, + {"Reference": "[RFC4398]", "Type": "CERT", "Value": "37", "Meaning": "CERT", "Template": "", "Registration Date": ""}, + {"Reference": "[RFC3226][RFC2874][RFC6563]", "Type": "A6", "Value": "38", "Meaning": "A6 (OBSOLETE - use AAAA)", "Template": "", "Registration Date": ""}, + {"Reference": "[RFC6672]", "Type": "DNAME", "Value": "39", "Meaning": "DNAME", "Template": "", "Registration Date": ""}, + {"Reference": "[Donald_E_Eastlake][http://tools.ietf.org/html/draft-eastlake-kitchen-sink]", "Type": "SINK", "Value": "40", "Meaning": "SINK", "Template": "", "Registration Date": "1997-11"}, + {"Reference": "[RFC6891][RFC3225]", "Type": "OPT", "Value": "41", "Meaning": "OPT", "Template": "", "Registration Date": ""}, + {"Reference": "[RFC3123]", "Type": "APL", "Value": "42", "Meaning": "APL", "Template": "", "Registration Date": ""}, + {"Reference": "[RFC4034][RFC3658]", "Type": "DS", "Value": "43", "Meaning": "Delegation Signer", "Template": "", "Registration Date": ""}, + {"Reference": "[RFC4255]", "Type": "SSHFP", "Value": "44", "Meaning": "SSH Key Fingerprint", "Template": "", "Registration Date": ""}, + {"Reference": "[RFC4025]", "Type": "IPSECKEY", "Value": "45", "Meaning": "IPSECKEY", "Template": "", "Registration Date": ""}, + {"Reference": "[RFC4034][RFC3755]", "Type": "RRSIG", "Value": "46", "Meaning": "RRSIG", "Template": "", "Registration Date": ""}, + {"Reference": "[RFC4034][RFC3755]", "Type": "NSEC", "Value": "47", "Meaning": "NSEC", "Template": "", "Registration Date": ""}, + {"Reference": "[RFC4034][RFC3755]", "Type": "DNSKEY", "Value": "48", "Meaning": "DNSKEY", "Template": "", "Registration Date": ""}, + {"Reference": "[RFC4701]", "Type": "DHCID", "Value": "49", "Meaning": "DHCID", "Template": "", "Registration Date": ""}, + {"Reference": "[RFC5155]", "Type": "NSEC3", "Value": "50", "Meaning": "NSEC3", "Template": "", "Registration Date": ""}, + {"Reference": "[RFC5155]", "Type": "NSEC3PARAM", "Value": "51", "Meaning": "NSEC3PARAM", "Template": "", "Registration Date": ""}, + {"Reference": "[RFC6698]", "Type": "TLSA", "Value": "52", "Meaning": "TLSA", "Template": "", "Registration Date": ""}, + {"Reference": "[RFC5205]", "Type": "HIP", "Value": "55", "Meaning": "Host Identity Protocol", "Template": "", "Registration Date": ""}, + {"Reference": "[Jim_Reid]", "Type": "NINFO", "Value": "56", "Meaning": "NINFO", "Template": "NINFO/ninfo-completed-template", "Registration Date": "2008-01-21"}, + {"Reference": "[Jim_Reid]", "Type": "RKEY", "Value": "57", "Meaning": "RKEY", "Template": "RKEY/rkey-completed-template", "Registration Date": "2008-01-21"}, + {"Reference": "[Wouter_Wijngaards]", "Type": "TALINK", "Value": "58", "Meaning": "Trust Anchor LINK", "Template": "TALINK/talink-completed-template", "Registration Date": "2010-02-17"}, + {"Reference": "[George_Barwood]", "Type": "CDS", "Value": "59", "Meaning": "Child DS", "Template": "CDS/cds-completed-template", "Registration Date": "2011-06-06"}, + {"Reference": "[RFC4408]", "Type": "SPF", "Value": "99", "Meaning": "", "Template": "", "Registration Date": ""}, + {"Reference": "[IANA-Reserved]", "Type": "UINFO", "Value": "100", "Meaning": "", "Template": "", "Registration Date": ""}, + {"Reference": "[IANA-Reserved]", "Type": "UID", "Value": "101", "Meaning": "", "Template": "", "Registration Date": ""}, + {"Reference": "[IANA-Reserved]", "Type": "GID", "Value": "102", "Meaning": "", "Template": "", "Registration Date": ""}, + {"Reference": "[IANA-Reserved]", "Type": "UNSPEC", "Value": "103", "Meaning": "", "Template": "", "Registration Date": ""}, + {"Reference": "[RFC6742]", "Type": "NID", "Value": "104", "Meaning": "", "Template": "ILNP/nid-completed-template", "Registration Date": ""}, + {"Reference": "[RFC6742]", "Type": "L32", "Value": "105", "Meaning": "", "Template": "ILNP/l32-completed-template", "Registration Date": ""}, + {"Reference": "[RFC6742]", "Type": "L64", "Value": "106", "Meaning": "", "Template": "ILNP/l64-completed-template", "Registration Date": ""}, + {"Reference": "[RFC6742]", "Type": "LP", "Value": "107", "Meaning": "", "Template": "ILNP/lp-completed-template", "Registration Date": ""}, + {"Reference": "[RFC7043]", "Type": "EUI48", "Value": "108", "Meaning": "an EUI-48 address", "Template": "EUI48/eui48-completed-template", "Registration Date": "2013-03-27"}, + {"Reference": "[RFC7043]", "Type": "EUI64", "Value": "109", "Meaning": "an EUI-64 address", "Template": "EUI64/eui64-completed-template", "Registration Date": "2013-03-27"}, + {"Reference": "[RFC2930]", "Type": "TKEY", "Value": "249", "Meaning": "Transaction Key", "Template": "", "Registration Date": ""}, + {"Reference": "[RFC2845]", "Type": "TSIG", "Value": "250", "Meaning": "Transaction Signature", "Template": "", "Registration Date": ""}, + {"Reference": "[RFC1995]", "Type": "IXFR", "Value": "251", "Meaning": "incremental transfer", "Template": "", "Registration Date": ""}, + {"Reference": "[RFC1035][RFC5936]", "Type": "AXFR", "Value": "252", "Meaning": "transfer of an entire zone", "Template": "", "Registration Date": ""}, + {"Reference": "[RFC1035]", "Type": "MAILB", "Value": "253", "Meaning": "mailbox-related RRs (MB, MG or MR)", "Template": "", "Registration Date": ""}, + {"Reference": "[RFC1035]", "Type": "MAILA", "Value": "254", "Meaning": "mail agent RRs (OBSOLETE - see MX)", "Template": "", "Registration Date": ""}, + {"Reference": "[RFC1035][RFC6895]", "Type": "*", "Value": "255", "Meaning": "A request for all records the server/cache has available", "Template": "", "Registration Date": ""}, + {"Reference": "[Patrik_Faltstrom]", "Type": "URI", "Value": "256", "Meaning": "URI", "Template": "URI/uri-completed-template", "Registration Date": "2011-02-22"}, + {"Reference": "[RFC6844]", "Type": "CAA", "Value": "257", "Meaning": "Certification Authority Restriction", "Template": "CAA/caa-completed-template", "Registration Date": "2011-04-07"}, + {"Reference": "[Sam_Weiler][http://cameo.library.cmu.edu/][\n Deploying DNSSEC Without a Signed Root. Technical Report 1999-19,\nInformation Networking Institute, Carnegie Mellon University, April 2004.]", "Type": "TA", "Value": "32768", "Meaning": "DNSSEC Trust Authorities", "Template": "", "Registration Date": "2005-12-13"}, + {"Reference": "[RFC4431]", "Type": "DLV", "Value": "32769", "Meaning": "DNSSEC Lookaside Validation", "Template": "", "Registration Date": ""}, + {"Reference": "", "Type": "Reserved", "Value": "65535", "Meaning": "", "Template": "", "Registration Date": ""}] + self.rrset_supported = ['1', '2', '5', '15', '28', '33'] + self.r = redis.StrictRedis(host=redis_listen, port=redis_port, db=redis_db) + self.origin = origin + + def getFirstSeen(self, t1=None, t2=None): + if t1 is None or t2 is None: + return False + rec = "s:" + t1.lower() + ":" + t2.lower() + recget = self.r.get(rec) + if recget is not None: + return int(recget.decode(encoding='UTF-8')) + + def getLastSeen(self, t1=None, t2=None): + if t1 is None or t2 is None: + return False + rec = "l:" + t1.lower() + ":" + t2.lower() + recget = self.r.get(rec) + if recget is not None: + return int(recget.decode(encoding='UTF-8')) + + def getCount(self, t1=None, t2=None): + if t1 is None or t2 is None: + return False + rec = "o:" + t1.lower() + ":" + t2.lower() + recget = self.r.get(rec) + if recget is not None: + return int(recget.decode(encoding='UTF-8')) + + def getRecord(self, t=None): + if t is None: + return False + rrfound = [] + for rr in self.rrset: + if (rr['Value']) is not None and rr['Value'] in self.rrset_supported: + rec = "r:" + t + ":" + rr['Value'] + rs = self.r.smembers(rec) + if rs: + for v in rs: + rrval = {} + rdata = v.decode(encoding='UTF-8').strip() + rrval['time_first'] = self.getFirstSeen(t1=t, t2=rdata) + rrval['time_last'] = self.getLastSeen(t1=t, t2=rdata) + if rrval['time_first'] is None: + break + rrval['count'] = self.getCount(t1=t, t2=rdata) + rrval['rrtype'] = rr['Type'] + rrval['rrname'] = t + rrval['rdata'] = rdata + if self.origin: + rrval['origin'] = self.origin + rrfound.append(rrval) + return self.JsonQOF(rrfound) + + def getAssociatedRecords(self, rdata=None): + if rdata is None: + return False + rec = "v:" + rdata.lower() + records = [] + if self.r.smembers(rec): + for v in self.r.smembers(rec): + records.append(v.decode(encoding='UTF-8')) + return records + + def RemDuplicate(self, d=None): + if d is None: + return False + outd = [dict(t) for t in set([tuple(o.items()) for o in d])] + return outd + + def JsonQOF(self, rrfound=None, RemoveDuplicate=True): + if rrfound is None: + return False + rrqof = "" + + if RemoveDuplicate: + rrfound = self.RemDuplicate(d=rrfound) + + for rr in rrfound: + rrqof = rrqof + json.dumps(rr) + "\n" + return rrqof + + def is_ip(self, q): + try: + ip_address(q) + return True + except: + return False From 5cb010045fd83e4b94ee5b7bcb7a71f0a96487f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Vinot?= Date: Mon, 29 Aug 2016 23:23:29 +0200 Subject: [PATCH 2/2] More cleanup and remove usused functions --- qos_server/__init__.py | 70 +++++++++++++----------------------------- qos_server/query.py | 42 ++++++++++--------------- 2 files changed, 39 insertions(+), 73 deletions(-) diff --git a/qos_server/__init__.py b/qos_server/__init__.py index 9ab78dc..7a36884 100644 --- a/qos_server/__init__.py +++ b/qos_server/__init__.py @@ -15,27 +15,35 @@ # Copyright (c) 2013 Alexandre Dulaunoy - a@foo.be import tornado.escape -from tornado.ioloop import IOLoop import tornado.web import tornado.process +from tornado.ioloop import IOLoop from tornado.concurrent import run_on_executor -from concurrent.futures import ThreadPoolExecutor +from concurrent.futures import ThreadPoolExecutor import argparse import sys import signal +from ipaddress import ip_address -from .query import Query +from .query import QueryRecords def handle_signal(sig, frame): IOLoop.instance().add_callback(IOLoop.instance().stop) +def is_ip(q): + try: + ip_address(q) + return True + except: + return False + + class InfoHandler(tornado.web.RequestHandler): def get(self): - response = {'version': 'git', - 'software': 'pdns-qof-server'} + response = {'version': 'git', 'software': 'pdns-qof-server'} self.write(response) @@ -48,13 +56,11 @@ class QueryHandler(tornado.web.RequestHandler): @run_on_executor def run_request(self, q): - to_return = [] - if query.is_ip(q): - for x in query.getAssociatedRecords(q): - to_return.append(query.getRecord(x)) + if is_ip(q): + q = query.getAssociatedRecords(q) else: - to_return.append(query.getRecord(t=q.strip())) - return to_return + q = [q] + return [query.getRecord(x) for x in q] @tornado.gen.coroutine def get(self, q): @@ -69,36 +75,6 @@ class QueryHandler(tornado.web.RequestHandler): self.finish() -class FullQueryHandler(tornado.web.RequestHandler): - # Default value in Python 3.5 - # https://docs.python.org/3/library/concurrent.futures.html#concurrent.futures.ThreadPoolExecutor - nb_threads = tornado.process.cpu_count() * 5 - executor = ThreadPoolExecutor(nb_threads) - - @run_on_executor - def run_request(self, q): - to_return = [] - if query.is_ip(q): - for x in query.getAssociatedRecords(q): - to_return.append(query.getRecord(x)) - else: - for x in query.getAssociatedRecords(q): - to_return.append(query.getRecord(t=x.strip())) - return to_return - - @tornado.gen.coroutine - def get(self, q): - print("fquery: " + q) - try: - responses = yield self.run_request(q) - for r in responses: - self.write(r) - except Exception as e: - print('Something went wrong with {}:\n{}'.format(q, e)) - finally: - self.finish() - - def main(): global query signal.signal(signal.SIGINT, handle_signal) @@ -111,6 +87,7 @@ def main(): 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() + origin = args.o port = args.p listen = args.l @@ -118,13 +95,10 @@ def main(): redis_listen = args.rl redis_db = args.rd - query = Query(redis_listen, redis_port, redis_db, origin) + query = QueryRecords(redis_listen, redis_port, redis_db, origin) - application = tornado.web.Application([ - (r"/query/(.*)", QueryHandler), - (r"/fquery/(.*)", FullQueryHandler), - (r"/info", InfoHandler) - ]) + application = tornado.web.Application([(r"/query/(.*)", QueryHandler), + (r"/info", InfoHandler)]) application.listen(port, address=listen) IOLoop.instance().start() @@ -138,7 +112,7 @@ elif __name__ == "test": qq = ["foo.be", "8.8.8.8"] for q in qq: - if query.is_ip(q): + if is_ip(q): for x in query.getAssociatedRecords(q): print(query.getRecord(x)) else: diff --git a/qos_server/query.py b/qos_server/query.py index 0f671e2..b4d371f 100644 --- a/qos_server/query.py +++ b/qos_server/query.py @@ -3,10 +3,9 @@ import json import redis -from ipaddress import ip_address -class Query(object): +class QueryRecords(object): def __init__(self, redis_listen, redis_port, redis_db, origin): self.rrset = [ @@ -91,32 +90,32 @@ class Query(object): {"Reference": "[RFC4431]", "Type": "DLV", "Value": "32769", "Meaning": "DNSSEC Lookaside Validation", "Template": "", "Registration Date": ""}, {"Reference": "", "Type": "Reserved", "Value": "65535", "Meaning": "", "Template": "", "Registration Date": ""}] self.rrset_supported = ['1', '2', '5', '15', '28', '33'] - self.r = redis.StrictRedis(host=redis_listen, port=redis_port, db=redis_db) + self.r = redis.StrictRedis(host=redis_listen, port=redis_port, db=redis_db, decode_responses=True) self.origin = origin - def getFirstSeen(self, t1=None, t2=None): + def _getFirstSeen(self, t1=None, t2=None): if t1 is None or t2 is None: return False rec = "s:" + t1.lower() + ":" + t2.lower() recget = self.r.get(rec) if recget is not None: - return int(recget.decode(encoding='UTF-8')) + return int(recget) - def getLastSeen(self, t1=None, t2=None): + def _getLastSeen(self, t1=None, t2=None): if t1 is None or t2 is None: return False rec = "l:" + t1.lower() + ":" + t2.lower() recget = self.r.get(rec) if recget is not None: - return int(recget.decode(encoding='UTF-8')) + return int(recget) - def getCount(self, t1=None, t2=None): + def _getCount(self, t1=None, t2=None): if t1 is None or t2 is None: return False rec = "o:" + t1.lower() + ":" + t2.lower() recget = self.r.get(rec) if recget is not None: - return int(recget.decode(encoding='UTF-8')) + return int(recget) def getRecord(self, t=None): if t is None: @@ -129,19 +128,19 @@ class Query(object): if rs: for v in rs: rrval = {} - rdata = v.decode(encoding='UTF-8').strip() - rrval['time_first'] = self.getFirstSeen(t1=t, t2=rdata) - rrval['time_last'] = self.getLastSeen(t1=t, t2=rdata) + rdata = v.strip() + rrval['time_first'] = self._getFirstSeen(t1=t, t2=rdata) + rrval['time_last'] = self._getLastSeen(t1=t, t2=rdata) if rrval['time_first'] is None: break - rrval['count'] = self.getCount(t1=t, t2=rdata) + rrval['count'] = self._getCount(t1=t, t2=rdata) rrval['rrtype'] = rr['Type'] rrval['rrname'] = t rrval['rdata'] = rdata if self.origin: rrval['origin'] = self.origin rrfound.append(rrval) - return self.JsonQOF(rrfound) + return self._JsonQOF(rrfound) def getAssociatedRecords(self, rdata=None): if rdata is None: @@ -150,30 +149,23 @@ class Query(object): records = [] if self.r.smembers(rec): for v in self.r.smembers(rec): - records.append(v.decode(encoding='UTF-8')) + records.append(v) return records - def RemDuplicate(self, d=None): + def _RemDuplicate(self, d=None): if d is None: return False outd = [dict(t) for t in set([tuple(o.items()) for o in d])] return outd - def JsonQOF(self, rrfound=None, RemoveDuplicate=True): + def _JsonQOF(self, rrfound=None, RemoveDuplicate=True): if rrfound is None: return False rrqof = "" if RemoveDuplicate: - rrfound = self.RemDuplicate(d=rrfound) + rrfound = self._RemDuplicate(d=rrfound) for rr in rrfound: rrqof = rrqof + json.dumps(rr) + "\n" return rrqof - - def is_ip(self, q): - try: - ip_address(q) - return True - except: - return False