Changeset 1636

Timestamp:

11/20/08 14:42:48 (2 months ago)

Author:

peet

Message:

rrsig prototype

Files:

• branches/0.4.7/lib/cxnet/cxnet/zeroconf.py (modified) (15 diffs)

branches/0.4.7/lib/cxnet/cxnet/zeroconf.py

@@ -155 +155 @@
-_TYPE_AAAA = 28
-_TYPE_SRV = 33
+_TYPE_RRSIG = 46
+_TYPE_DNSKEY = 48
-_TYPE_ANY =  255
-
@@ -184 +186 @@
-                   _TYPE_AAAA : "quada",
-                   _TYPE_SRV : "srv",
+                   _TYPE_RRSIG : "rrsig",
+                   _TYPE_DNSKEY : "dnskey",
-                   _TYPE_ANY : "any" }
-
@@ -338 +342 @@
-        def __eq__(self, other):
-                """Tests equality as per DNSRecord"""
-
-
-
+
-
-        def suppressedBy(self, msg):
@@ -389 +391 @@
-                return DNSEntry.toString(self, "record", arg)
-
+class DNSSignature(DNSRecord):
+        """An abstract DNS signature record class"""
+        
+        def __init__(self, name, type, clazz, ttl):
+                DNSRecord.__init__(self, name, type, clazz, ttl)
+                self.type_covered = _TYPE_ANY
+                # we use private algorithm type 253
+                # according to RFC 2535, Section 11
+                self.algorithm = 253
+                self.labels = 0
+                self.original_ttl = 0
+                self.expiration = 0
+                self.inception = 0
+                self.tag = 0
+                self.signer = "none"
+                self.signature = "none"
+        
+        def write(self, out):
+                # write header
+                out.writeShort(self.type_covered)
+                out.writeUChar(self.algorithm)
+                out.writeUChar(self.labels)
+                out.writeInt(self.original_ttl)
+                out.writeInt(self.expiration)
+                out.writeInt(self.inception)
+                out.writeShort(self.tag)
+                out.writeName(self.signer)
+                out.writeUChar(len(self.signature))
+                out.writeString(self.signature,len(self.signature))
+        
+        def __eq__(self,other):
+                if isinstance(other, DNSSignature):
+                        return self.type_covered == other.type_covered and self.signer == other.signer and self.signature == other.signature
+                return 0
+        def __repr__(self):
+                return "RRSIG: [%s] %s ( %s )" % (_TYPES[self.type_covered], self.signer, self.signature)
+
+class DNSSignatureI(DNSSignature):
+        """Create a DNSRecord from a signature"""
+        
+        def __init__(self, name, type, clazz, ttl, header, signer, signature):
+                DNSSignature.__init__(self, name, type, clazz, ttl)
+                (self.type_covered,self.algorithm,self.labels,self.original_ttl,self.expiration,self.inception,self.tag) = \
+                        struct.unpack("!HBBIIIH",header)
+                self.signer = signer
+                self.signature = signature
+
+class DNSSignatureS(DNSSignature):
+        """Create signature from a DNSRecord"""
+        
+        def __init__(self, name, type, clazz, record):
+                DNSSignature.__init__(self, name, type, clazz, record.ttl)
+                self.type_covered = record.type
+                self.original_ttl = record.ttl
+                self.signer = record.name
+                self.signature = "BALADALA"
+
-class DNSAddress(DNSRecord):
-        """A DNS address record"""
@@ -405 +464 @@
-                if isinstance(other, DNSAddress):
-                        return self.address == other.address and self.name == other.name
-0
+DNSRecord.__eq__(self,other)
-
-        def __repr__(self):
@@ -432 +491 @@
-                if isinstance(other, DNSHinfo):
-                        return self.cpu == other.cpu and self.os == other.os
-0
+DNSRecord.__eq__(self,other)
-
-        def __repr__(self):
@@ -453 +512 @@
-                if isinstance(other, DNSPointer):
-                        return self.alias == other.alias
-0
+DNSRecord.__eq__(self,other)
-
-        def __repr__(self):
@@ -496 +555 @@
-                if isinstance(other, DNSText):
-                        return self.text == other.text
-0
+DNSRecord.__eq__(self,other)
-
-        def __repr__(self):
@@ -526 +585 @@
-                if isinstance(other, DNSService):
-                        return self.priority == other.priority and self.weight == other.weight and self.port == other.port and self.server == other.server
-0
+DNSRecord.__eq__(self,other)
-
-        def __repr__(self):
@@ -627 +686 @@
-                        elif info[0] == _TYPE_HINFO:
-                                rec = DNSHinfo(domain, info[0], info[1], info[2], self.readCharacterString(), self.readCharacterString())
+                        elif info[0] == _TYPE_RRSIG:
+                                rec = DNSSignatureI(domain, info[0], info[1], info[2],self.readString(18),self.readName(),self.readCharacterString())
-                        elif info[0] == _TYPE_AAAA:
-                                rec = DNSAddress(domain, info[0], info[1], info[2], self.readString(16))
@@ -719 +780 @@
-                if record is not None:
-                        if now == 0 or not record.isExpired(now):
+                                # FIXME sign here
-                                self.answers.append((record, now))
+                                if not isinstance(record,DNSSignature):
+                                        self.answers.append((DNSSignatureS(record.name, _TYPE_RRSIG, _CLASS_IN, record),now))
-
-        def addAuthorativeAnswer(self, record):
@@ -733 +797 @@
-                format = '!c'
-                self.data.append(struct.pack(format, chr(value)))
+                self.size += 1
+
+        def writeUChar(self, value):
+                """Writes an unsigned char to the packet"""
+                format = '!B'
+                self.data.append(struct.pack(format, value))
-                self.size += 1
-
@@ -1289 +1359 @@
-                """String representation"""
-                addr = self.getAddress()
-
-
-
+
+
+
+
-                if self.text is None:
-                        result += "None"
@@ -1729 +1800 @@
-if __name__ == '__main__':      
-        print "Multicast DNS Service Discovery for Python, version", __version__
-"127.0.0.1"
+("127.0.0.1",)
-        print "1. Testing registration of a service..."
-        desc = {'version':'0.10','a':'test value', 'b':'another value'}
-
+
+
+
-        print "   Registering service..."
-        r.registerService(info)
@@ -1740 +1813 @@
-        print "   Query done."
-        print "3. Testing query of own service..."
-str(r.getServiceInfo("_http._tcp.local.", "My Service Name._http._tcp.local."
+repr(r.getServiceInfo(d, n
-        print "   Query done."
-
+
+
+
+
+
+
+
+
+
+
+
+
-        r.unregisterService(info)
-        print "   Unregister done."