Attachment 711239 Details for Bug 922413 – 2nd attempt at a solution.

[patch] 2nd attempt at a solution.

Fast.patch (text/plain), 4.95 KB, created by Glen Eustace on 2013-03-16 23:44:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Glen Eustace

Created: 2013-03-16 23:44:01 UTC

Size: 4.95 KB

patch

obsolete

>--- Fast.pm.orig	2013-03-17 12:42:02.622799746 +1300
>+++ Fast.pm	2013-03-17 12:40:57.916037461 +1300
>@@ -4,7 +4,7 @@
> # can do whatever you want with this stuff. If we meet some day, and you think
> # this stuff is worth it, you can buy me a beer in return.   Anton Berezin
> # ----------------------------------------------------------------------------
>-# Copyright (c) 2005-2012 SPARTA, Inc.
>+# Copyright (c) 2005-2013 SPARTA, Inc.
> # All rights reserved.
> #  
> # Redistribution and use in source and binary forms, with or without
>@@ -33,7 +33,7 @@
> # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
> # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
> #
>-# $Id: Fast.pm 7066 2012-09-24 21:44:49Z hardaker $
>+# $Id: Fast.pm 7292 2013-01-02 19:32:41Z hardaker $
> #
> package Net::DNS::ZoneFile::Fast;
> # documentation at the __END__ of the file
>@@ -55,6 +55,7 @@
> my $pat_name = qr{[-\*\w\$\d\/*]+(?:\.[-\*\w\$\d\/]+)*};
> my $pat_maybefullnameorroot = qr{(?:\.|[-\w\$\d\/*]+(?:\.[-\w\$\d\/]+)*\.?)};
> 
>+#
> # Added the ability to have a backslash in the SOA username.  This is to
> # provide for the RFC-allowed "Joe\.Jones.example.com" construct to allow
> # dots in usernames.  Keeping the original version here for easy reference.
>@@ -77,6 +78,7 @@
> my $key;
> my $dnskey;
> my $ds;
>+my $nsec3;
> my $on_error;
> my $quiet;
> my $soft_errors;
>@@ -920,14 +922,38 @@
>       } elsif (/\G(nsec3)[ \t]+/igc) {
> 	  error ("You are missing required modules for NSEC3 support")
> 	    if (!$nsec3capable);
>-	  if (/\G\s*(\d+)\s+(\d+)\s+(\d+)\s+([-0-9A-Fa-f]+)\s+($pat_maybefullname)\s+(.*?)$pat_skip$/gc) {
>+          if (/\G\s*(\d+)\s+(\d+)\s+(\d+)\s+([-0-9A-Fa-f]+)\s+($pat_maybefullname)\s+(.*?)$pat_skip$/gc) {
>+              # XXX: set the typebm field ourselves?
>+              my ($alg, $flags, $iters, $salt, $nxthash, $typelist) =
>+                ($1, $2, $3, $4, $5, $6);
>+              $typelist = join(" ",sort split(/\s+/,$typelist));
>+              my $binhash = MIME::Base32::decode(uc($nxthash));
>+              push @zone,
>+                {
>+                 Line        => $ln,
>+                 name        => $domain,
>+                 class       => "IN",
>+                 ttl         => $ttl,
>+                 type        => "NSEC3",
>+                 hashalgo    => $alg,
>+                 flags       => $flags,
>+                 iterations  => $iters,
>+                 hnxtname    => $nxthash,
>+                 hnxtnamebin => $binhash,
>+                 hashlength  => length($binhash),
>+                 salt        => $salt,
>+                 saltbin     => pack("H*",$salt),
>+                 saltlength  => int(length($salt)/2),
>+                 typelist    => $typelist,
>+                 typebm      =>
>+                 Net::DNS::RR::NSEC::_typearray2typebm(split(/\s+/,$typelist)),
>+                };
>+# multi-line
>+          } elsif (/\G\s*(\d+)\s+(\d+)\s+(\d+)\s+([-0-9A-Fa-f]+)\s+\(/gc) {
> 	      # XXX: set the typebm field ourselves?
>-	      my ($alg, $flags, $iters, $salt, $nxthash, $typelist) =
>-		($1, $2, $3, $4, $5, $6);
>-	      $typelist = join(" ",sort split(/\s+/,$typelist));
>-	      my $binhash = MIME::Base32::decode(uc($nxthash));
>-	      push @zone, 
>-		{
>+	      my ($alg, $flags, $iters, $salt) =
>+		($1, $2, $3, $4);
>+	      $nsec3 =	{
> 		 Line        => $ln,
> 		 name        => $domain,
> 		 class       => "IN",
>@@ -936,16 +962,11 @@
> 		 hashalgo    => $alg,
> 		 flags       => $flags,
> 		 iterations  => $iters,
>-		 hnxtname    => $nxthash,
>-		 hnxtnamebin => $binhash,
>-		 hashlength  => length($binhash),
> 		 salt        => $salt,
> 		 saltbin     => pack("H*",$salt),
> 		 saltlength  => int(length($salt)/2),
>-		 typelist    => $typelist,
>-		 typebm      =>
>-		 Net::DNS::RR::NSEC::_typearray2typebm(split(/\s+/,$typelist)),
>-		};
>+              };
>+	      $parse = \&parse_nsec3;
> 	  } else {
> 	      error("bad NSEC3 data");
> 	  }
>@@ -1224,6 +1245,31 @@
>       }
>   }
> 
>+sub parse_nsec3
>+  {
>+      #got more data
>+      if ( /\s*((\w+\s+)+)\)\s*$/) {
>+         my $typelist = $1;
>+	 $typelist = join(" ",sort split(/\s+/,$typelist));
>+         $nsec3->{ 'typelist' } = $typelist;
>+	 $nsec3->{ 'typebm' } =
>+	     Net::DNS::RR::NSEC::_typearray2typebm(split(/\s+/,$typelist));
>+	 push @zone, $nsec3; 
>+	 # we're done
>+	 $parse = \&parse_line;
>+         $nsec3 = undef;
>+      } elsif ( /\G\s*([A-Z0-9]{32})\s*$/gc) {
>+         my $nxthash = $1;
>+	 my $binhash = MIME::Base32::decode(uc($nxthash));
>+         $nsec3->{ 'hnxtname' } = $nxthash;
>+         $nsec3->{ 'hnxtnamebin' } = $binhash;
>+         $nsec3->{ 'hashlength' } = length( $binhash );
>+      } elsif ( /\G\s+$/gc ) {			# Empty line
>+      } else {
>+         error( "bad NSEC3 continuation lines" );
>+      } 
>+  }
>+
> sub parse_soa_number
>   {
>       error("parse_soa_number: internal error, no \$soa") unless $soa;
>@@ -1523,7 +1569,7 @@
> 
>   Anton Berezin
> 
>-Copyright (c) 2004-2012 SPARTA, Inc.
>+Copyright (c) 2004-2013 SPARTA, Inc.
>   All rights reserved.
>    
>   Redistribution and use in source and binary forms, with or without

Actions: View | Diff

Attachments on bug 922413: 711147 | 711239