Split the autogen plugin into separate forward/reverse plugins

Author: [email protected]

debian/changelog

@@ -1,3 +1,9 @@
+pymds (0.4) precise; urgency=low
+
+  * Split autogen plugin into separate forward/reverse plugins (REQUIRES CONFIG CHANGE!).
+
+ -- Robert Mibus <[email protected]>  Thu, 14 Feb 2013 07:40:38 +1030
+
 pymds (0.3) precise; urgency=low
 
   * Remove the hard-dependency on Python 2.7's os.initgroups()

examples/autogen.conf

@@ -1,4 +1,4 @@
 [default]
 domain=ipv6.example.com
-source=pymdsautogen:ipv6.example.com:20010db8
+source=pymdsautogen6fwd:ipv6.example.com:20010db8
 name servers=localhost:127.0.0.1:86400

examples/autogenreverse.conf

@@ -1,5 +1,5 @@
 [default]
 domain=8.b.d.0.1.0.0.2.ip6.arpa
-source=pymdsautogen:ipv6.example.com:20010db8
+source=pymdsautogen6rev:ipv6.example.com:20010db8
 filters=pymdsoverride:autogenreverse-override.txt
 name servers=localhost:127.0.0.1:86400

pymdsautogen6fwd.py

@@ -0,0 +1,69 @@
+# Copyright (c) 2011 Robert Mibus & Internode
+#
+# Permission is hereby granted, free of charge, to any person
+# obtaining a copy of this software and associated documentation
+# files (the "Software"), to deal in the Software without
+# restriction, including without limitation the rights to use,
+# copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following
+# conditions:
+#
+#     The above copyright notice and this permission notice shall be
+#     included in all copies or substantial portions of the Software.
+#
+#     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+#     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+#     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+#     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+
+
+#
+# A pymds source filter.
+#
+# pymdsautogen makes stuff up on the fly
+#
+# initializer: a "base domain" under which AAAA records go, and an IPv6 prefix
+# (for which PTR records work).
+#
+
+import struct
+
+from utils import *
+
+import ipaddr
+import string
+import re
+
+class Source(object):
+    def __init__(self, basedomain, v6prefix):
+        self._answers = {}
+	self.basedomain = basedomain.split('.')
+	self.v6prefix = v6prefix
+
+    def get_response(self, query, domain, qtype, qclass, src_addr):
+	if qtype == 28 or qtype == 255: # 'AAAA' or 'ANY':
+		print 'Responding to AAAA query for %s.%s' % (query, domain)
+		try:
+			# We SHOULD make sure this matches our v6prefix, but currently
+			# we don't...
+			addr = ipaddr.IPv6Address(query.replace('-',':'))
+			return 0, [{
+				'qtype': 28, # Hard-coded to 'AAAA', in case we're from an ANY query
+				'qclass': qclass,
+				'ttl': 86400,
+				'rdata': addr.packed
+				}]
+		except:
+			print "No AAAA available"
+			return 3, []
+	else: # NS, A, MX, etc. -- but don't return NXDOMAIN if there's a PTR or AAAA
+		print "Responding to other query type..."
+		print "Checking if we have a valid PTR or AAAA record:"
+		rcode_aaaa, resp = self.get_response(query, domain, 28, qclass, src_addr)
+		if rcode_aaaa == 0:
+			print "AAAA found, returning for NS"
+			return 0, []
+		else:
+			print "No AAAA found, no NS to return..."
+			return 3, []

pymdsautogen.py pymdsautogen6rev.py

@@ -68,35 +68,13 @@ def get_response(self, query, domain, qtype, qclass, src_addr):
 			'rdata': labels2str([data] + self.basedomain),
 			}]
 
-	elif qtype == 28 or qtype == 255: # 'AAAA' or 'ANY':
-		print 'Responding to AAAA query for %s.%s' % (query, domain)
-		try:
-			# We SHOULD make sure this matches our v6prefix, but currently
-			# we don't...
-			addr = ipaddr.IPv6Address(query.replace('-',':'))
-			return 0, [{
-				'qtype': 28, # Hard-coded to 'AAAA', in case we're from an ANY query
-				'qclass': qclass,
-				'ttl': 86400,
-				'rdata': addr.packed
-				}]
-		except:
-			# Could be a PTR record instead maybe?
-			rcode_ptr, resp = self.get_response(query, domain, 12, qclass, src_addr)
-			if rcode_ptr == 0:
-				"Not an AAAA for this record, but there's a PTR"
-				return 0, []
-			# Guess not!
-			print "No AAAA available"
-			return 3, []
-	else: # NS, A, MX, etc. -- but don't return NXDOMAIN if there's a PTR or AAAA
+	else: # NS, A, MX, etc. -- but don't return NXDOMAIN if there's a PTR
 		print "Responding to other query type..."
 		print "Checking if we have a valid PTR or AAAA record:"
 		rcode_ptr, resp = self.get_response(query, domain, 12, qclass, src_addr)
-		rcode_aaaa, resp = self.get_response(query, domain, 28, qclass, src_addr)
-		if rcode_ptr == 0 or rcode_aaaa == 0:
-			print "PTR or AAAA found, returning for NS"
+		if rcode_ptr == 0:
+			print "PTR found, returning for NS"
 			return 0, []
 		else:
-			print "No PTR or AAAA found, no NS to return..."
+			print "No PTR found, no NS to return..."
 			return 3, []