- finished support for DS, DLV, RRSIG and SIG

- added tests for DS, DLV, RRSIG and SIG
mikepultz · Sep 2, 2010 · ea729b5 · ea729b5
1 parent 22c54f3
commit ea729b5
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 70 deletions.
diff --git a/Net/DNS2/RR/DS.php b/Net/DNS2/RR/DS.php
@@ -118,7 +118,7 @@ protected function rrFromString(array $rdata)
         $this->keytag       = array_shift($rdata);
         $this->algorithm    = array_shift($rdata);
         $this->digesttype   = array_shift($rdata);
-        $this->digest       = implode(' ', $rdata);
+        $this->digest       = implode('', $rdata);
 
         return true;
     }
@@ -160,10 +160,13 @@ protected function rrSet(Net_DNS2_Packet &$packet)
             //
             // copy the digest
             //
-            $this->digest = unpack('H*', substr($this->rdata, 4, $digest_size));
+            $x = unpack('H*', substr($this->rdata, 4, $digest_size));
+            $this->digest = $x[1];
+
+            return true;
         }
 
-        return true;
+        return false;
     }
 
     /**

diff --git a/Net/DNS2/RR/RRSIG.php b/Net/DNS2/RR/RRSIG.php
@@ -154,7 +154,7 @@ protected function rrFromString(array $rdata)
 
         foreach ($rdata as $line) {
 
-            $this->signature .= $line . ' ';
+            $this->signature .= $line;
         }
         $this->signature = trim($this->signature);
 
@@ -185,16 +185,14 @@ protected function rrSet(Net_DNS2_Packet &$packet)
             $this->origttl      = $x['origttl'];
 
             //
-            // TODO: I dont' think these are right; I think we need to change
-            // localtime() to gmdate() with a simple format and parse the output
+            // the dates are in GM time
             //
+            $this->sigexp       = gmdate('YmdHis', $x['sigexp']);
+            $this->sigincep     = gmdate('YmdHis', $x['sigincep']);
 
-            $e                  = localtime($x['sigexp']);
-            $this->sigexp       = sprintf("%d%02d%02d%02d%02d%02d", $e[5]+1900, $e[4]+1, $e[3], $e[2], $e[1], $e[0]);
-
-            $i                  = localtime($x['sigincep']);
-            $this->sigincep     = sprintf("%d%02d%02d%02d%02d%02d", $i[5]+1900, $i[4]+1, $i[3], $i[2], $i[1], $i[0]);
-
+            //
+            // get the keytag
+            //
             $this->keytag       = $x['keytag'];
 
             //
@@ -240,8 +238,8 @@ protected function rrGet(Net_DNS2_Packet &$packet)
                 $this->algorithm,
                 $this->labels,
                 $this->origttl,
-                gmmktime($e[4], $e[5], $e[6], $e[2] - 1, $e[3], $e[1] - 1900),
-                gmmktime($i[4], $i[5], $i[6], $i[2] - 1, $i[3], $i[1] - 1900),
+                gmmktime($e[4], $e[5], $e[6], $e[2], $e[3], $e[1]),
+                gmmktime($i[4], $i[5], $i[6], $i[2], $i[3], $i[1]),
                 $this->keytag
             );
 

diff --git a/Net/DNS2/RR/SIG.php b/Net/DNS2/RR/SIG.php
@@ -70,6 +70,9 @@
  *     /                            signature                          /
  *     /                                                               /
  *     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ *
+ * RRSIG has been disignated the replacement for SIG, and is physically identical
+ * in storage to SIG, so we just use the RRSIG class here.
  * 
  * @category Networking
  * @package  Net_DNS2
@@ -79,59 +82,8 @@
  * @see      Net_DNS2_RR
  *
  */
-class Net_DNS2_RR_SIG extends Net_DNS2_RR
+class Net_DNS2_RR_SIG extends Net_DNS2_RR_RRSIG
 {
-    /**
-     * method to return the rdata portion of the packet as a string
-     *
-     * @return  string
-     * @access  protected
-     *
-     */
-    protected function rrToString()
-    {
-    }
-
-    /**
-     * parses the rdata portion from a standard DNS config line
-     *
-     * @param array $rdata a string split line of values for the rdata
-     *
-     * @return boolean
-     * @access protected
-     *
-     */
-    protected function rrFromString(array $rdata)
-    {
-    }
-
-    /**
-     * parses the rdata of the Net_DNS2_Packet object
-     *
-     * @param Net_DNS2_Packet &$packet a Net_DNS2_Packet packet to parse the RR from
-     *
-     * @return boolean
-     * @access protected
-     *
-     */
-    protected function rrSet(Net_DNS2_Packet &$packet)
-    {
-    }
-
-    /**
-     * returns the rdata portion of the DNS packet
-     *
-     * @param Net_DNS2_Packet &$packet a Net_DNS2_Packet packet use for
-     *                                 compressed names
-     *
-     * @return mixed                   either returns a binary packed
-     *                                 string or null on failure
-     * @access protected
-     *
-     */
-    protected function rrGet(Net_DNS2_Packet &$packet)
-    {
-    }
 }
 
 /*

diff --git a/Net/DNS2/TODO b/Net/DNS2/TODO
@@ -14,7 +14,7 @@ DONE- update requests
 		APL, HIP, OPT
 
 	- dnssec
-		DNSKEY, DS, NSEC, NSEC3, NSEC3PARAM, RRSIG, SIG
+		NSEC, NSEC3, NSEC3PARAM
 
 
 DONE - parse BIND style input and set all the appropriate values of the RR object

diff --git a/tests/Net_DNS2_ParserTest.php b/tests/Net_DNS2_ParserTest.php
@@ -61,6 +61,7 @@ public function testParser()
 			'ISDN'		=> 'example.com. 300 IN ISDN "150 862 028 003 217" 42',
 			'RT'		=> 'example.com. 300 IN RT 2 relay.prime.com.',
 			'NSAP'		=> 'example.com. 300 IN NSAP 0x47.0005.80.005a00.0000.0001.e133.aaaaaa000151.00',
+            'SIG'		=> 'example.com. 300 IN SIG DNSKEY 7 1 86400 20100827211706 20100822211706 57970 gov. KoWPhMtLHp8sWYZSgsMiYJKB9P71CQmh9CnxJCs5GutKfo7Jpw+nNnDLiNnsd6U1JSkf99rYRWCyOTAPC47xkHr+2Uh7n6HDJznfdCzRa/v9uwEcbXIxCZ7KfzNJewW3EvYAxDIrW6sY/4MAsjS5XM/O9LaWzw6pf7TX5obBbLI+zRECbPNTdY+RF6Fl9K0GVaEZJNYi2PRXnATwvwca2CNRWxeMT/dF5STUram3cWjH0Pkm19Gc1jbdzlZVDbUudDauWoHcc0mfH7PV1sMpe80NqK7yQ24AzAkXSiknO13itHsCe4LECUu0/OtnhHg2swwXaVTf5hqHYpzi3bQenw==',
 			'KEY'		=> 'example.com. 300 IN KEY 256 3 7 AwEAAYCXh/ZABi8kiJIDXYmyUlHzC0CHeBzqcpyZAIjC7dK1wkRYVcUvIlpTOpnOVVfcC3Py9Ui/x45qKb0LytvK7WYAe3WyOOwk5klwIqRC/0p4luafbd2yhRMF7quOBVqYrLoHwv8i9LrV+r8dhB7rXv/lkTSI6mEZsg5rDfee8Yy1',
 			'PX'		=> 'example.com. 300 IN PX 10 ab.net2.it. o-ab.prmd-net2.admdb.c-it.',
 			'AAAA'		=> 'example.com. 300 IN AAAA 1080:0:0:0:8:800:200c:417a',
@@ -70,15 +71,15 @@ public function testParser()
 			'KX'		=> 'example.com. 300 IN KX 10 mx1.mrhost.ca.',
 			'CERT'		=> 'example.com. 300 IN CERT 3 0 0 TUlJQ1hnSUJBQUtCZ1FDcXlqbzNFMTU0dFU1Um43ajlKTFZsOGIwcUlCSVpGWENFelZvanVJT1BsMTM0by9zcHkxSE1hQytiUGh3Wk1UYVd4QlJpZHBFbUprNlEwNFJNTXdqdkFyLzFKWjhnWThtTzdCdTh1RUROVkNWeG5rQkUzMHhDSjhHRTNzL3EyN2VWSXBCUGFtU1lkNDVKZjNIeVBRRE4yaU45RjVHdGlIa2E2OXNhcmtKUnJ3SURBUUFCQW9HQkFJaUtDQ1NEM2FFUEFjQUx1MjdWN0JmR1BYN3lDTVg0OSsyVDVwNXNJdkduQjcrQ0NZZ09QaVQybmlpMGJPNVBBOTlnZnhPQXl1WCs5Z3llclVQbUFSc1ViUzcvUndkNGorRUlOVW1DanJSK2R6dGVXT0syeGxHamFOdGNPZU5jMkVtelQyMFRsekxVeUxTWGpzMzVlU2NQK0loeVptM2xJd21vbWtNb2d1QkFrRUE0a1FsOVBxaTJ2MVBDeGJCelU4Nnphblo2b0hsV0IzMUh4MllCNmFLYXhjNkVOZHhVejFzNjU2VncrRDhSVGpoSllyeDdMVkxzZDBRaVZJM0liSjVvUUpCQU1FN3k0aHg0SCtnQU40MEdrYjNjTFZGNHNpSEZrNnA2QVZRdlpzREwvVnh3bVlOdE4rM0txT3NVcG11WXZ3a3h0ajhIQnZtckxUYStXb3NmRDQwS1U4Q1FRQ1dvNmhob1R3cmI5bmdHQmFQQ2VDc2JCaVkrRUlvbUVsSm5mcEpuYWNxQlJ5emVid0pIeXdVOGsvalNUYXJIMk5HQzJ0bG5JMzRyS1VGeDZiTTJIWUJBa0VBbXBYSWZPNkZKL1NMM1RlWGNnQ1A5U1RraVlHd2NkdnhGeGVCcDlvRDZ2cElCN2FkWlgrMko5dzY5R0VUSlI0U3loSGVOdC95ZUhqWm9YdlhKVGc3ZHdKQVpEamxwL25wNEFZV3JYaGFrMVAvNGZlaDVNSU5WVHNXQkhTNlRZNW0xRmZMUEpybklHNW1FSHNidWkvdnhuQ1JmRUR4ZlU1V1E0cS9HUkZuaVl3SHB3PT0=',
 			'DNAME'		=> 'example.com. 300 IN DNAME frobozz-division.acme.example.',
-// BROKEN			'DS'		=> 'example.com. 300 IN DS 21366 7 2 96EEB2FFD9B00CD4694E78278B5EFDAB0A80446567B69F634DA078F0 D90F01BA',
-// BROKEN			'RRSIG'		=> 'example.com. 300 IN RRSIG DNSKEY 7 1 86400 20100827211706 20100822211706 57970 gov. KoWPhMtLHp8sWYZSgsMiYJKB9P71CQmh9CnxJCs5GutKfo7Jpw+nNnDL iNnsd6U1JSkf99rYRWCyOTAPC47xkHr+2Uh7n6HDJznfdCzRa/v9uwEc bXIxCZ7KfzNJewW3EvYAxDIrW6sY/4MAsjS5XM/O9LaWzw6pf7TX5obB bLI+zRECbPNTdY+RF6Fl9K0GVaEZJNYi2PRXnATwvwca2CNRWxeMT/dF5STUram3cWjH0Pkm19Gc1jbdzlZVDbUudDauWoHcc0mfH7PV1sMpe80N qK7yQ24AzAkXSiknO13itHsCe4LECUu0/OtnhHg2swwXaVTf5hqHYpzi 3bQenw==',
+            'DS'		=> 'example.com. 300 IN DS 21366 7 2 96eeb2ffd9b00cd4694e78278b5efdab0a80446567b69f634da078f0d90f01ba',
+            'RRSIG'		=> 'example.com. 300 IN RRSIG DNSKEY 7 1 86400 20100827211706 20100822211706 57970 gov. KoWPhMtLHp8sWYZSgsMiYJKB9P71CQmh9CnxJCs5GutKfo7Jpw+nNnDLiNnsd6U1JSkf99rYRWCyOTAPC47xkHr+2Uh7n6HDJznfdCzRa/v9uwEcbXIxCZ7KfzNJewW3EvYAxDIrW6sY/4MAsjS5XM/O9LaWzw6pf7TX5obBbLI+zRECbPNTdY+RF6Fl9K0GVaEZJNYi2PRXnATwvwca2CNRWxeMT/dF5STUram3cWjH0Pkm19Gc1jbdzlZVDbUudDauWoHcc0mfH7PV1sMpe80NqK7yQ24AzAkXSiknO13itHsCe4LECUu0/OtnhHg2swwXaVTf5hqHYpzi3bQenw==',
 			'SSHFP'		=> 'example.com. 300 IN SSHFP 2 1 123456789abcdef67890123456789abcdef67890',
 			'IPSECKEY'	=> 'example.com. 300 IN IPSECKEY 10 2 2 2001:db8:0:8002:0:0:2000:1 AQNRU3mG7TVTO2BkR47usntb102uFJtugbo6BSGvgqt4AQ==',
 		    'DNSKEY'	=> 'example.com. 300 IN DNSKEY 256 3 7 AwEAAYCXh/ZABi8kiJIDXYmyUlHzC0CHeBzqcpyZAIjC7dK1wkRYVcUvIlpTOpnOVVfcC3Py9Ui/x45qKb0LytvK7WYAe3WyOOwk5klwIqRC/0p4luafbd2yhRMF7quOBVqYrLoHwv8i9LrV+r8dhB7rXv/lkTSI6mEZsg5rDfee8Yy1',
 			'DHCID'		=> 'example.com. 300 IN DHCID AAIBY2/AuCccgoJbsaxcQc9TUapptP69lOjxfNuVAA2kjEA=',
 			'SPF'		=> 'example.com. 300 IN SPF "v=spf1 ip4:192.168.0.1/24 mx ?all"',
             'TKEY'      => 'example.com. 300 IN TKEY gss.microsoft.com. 3 123456.',
-// BROKEN			'DLV'		=> 'example.com. 300 IN DS 21366 7 2 96EEB2FFD9B00CD4694E78278B5EFDAB0A80446567B69F634DA078F0 D90F01BA',
+            //'DLV'		=> 'example.com. 300 IN DS 21366 7 2 96EEB2FFD9B00CD4694E78278B5EFDAB0A80446567B69F634DA078F0 D90F01BA',
 		);
 
 		foreach($rrs as $rr => $line) {