Changeset 660 for trunk

Timestamp:

09/12/14 18:04:03 (10 years ago)

Author:

Kris Deugau

Message:

/trunk

Tweak some IP validation internals; accept a CIDR suffix to be nice to

callers.

Almost(?) always use inetlazy() function on sorts on the records table;

it looks bad to have reverse records properly sorted by IP, but domain
records only sorted by string value.

File:

• trunk/DNSDB.pm (modified) (3 diffs)

trunk/DNSDB.pm

@@ -517 +517 @@
     # Fail on "compact" IPv4 variants, because they are not consistent and predictable.
     return ('FAIL',"A record must be a valid IPv4 address")
-        unless ${$args{host}} =~ /^\d+\.\d+\.\d+\.\d+$/;
+        unless ${$args{host}} =~ m{^\d+\.\d+\.\d+\.\d+(/\d+)?$};
     $args{addr} = new NetAddr::IP ${$args{host}};
     return ('FAIL',"A record must be a valid IPv4 address")
@@ -1044 +1044 @@
     # but that gets stupid in forward zones, since these records are shared.
     return ('FAIL', "$typemap{${$args{rectype}}} record must be a valid IPv4 address")
-      if ${$args{rectype}} == 65280 && ${$args{val}} !~ /^\d+\.\d+\.\d+\.\d+$/;
+      if ${$args{rectype}} == 65280 && ${$args{val}} !~ m{^\d+\.\d+\.\d+\.\d+(?:/\d+)?$};
     return ('FAIL', "$typemap{${$args{rectype}}} record must be a valid IPv6 address")
-      if ${$args{rectype}} == 65281 && ${$args{val}} !~ /^[a-fA-F0-9:]+$/;
+      if ${$args{rectype}} == 65281 && ${$args{val}} !~ m{^[a-fA-F0-9:]+(?:/\d+)?$};
     # If things are not OK, this should prevent Stupid in the error log.
     $args{addr} = new NetAddr::IP ${$args{val}}
@@ -4020 +4020 @@
   foreach my $sf (split /,/, $args{sortby}) {
     $sf = "r.$sf";
-    $sf =~ s/r\.val/inetlazy(r.val)/
-        if $args{revrec} eq 'y' && $args{defrec} eq 'n';
+    $sf =~ s/r\.val/inetlazy(r.val)/;
+# hmm.  do we really need to limit this?
+#       if $args{revrec} eq 'y' && $args{defrec} eq 'n';
     $sf =~ s/r\.type/t.alphaorder/;
     $newsort .= ",$sf";