Changeset 229

Timestamp:

02/08/12 16:00:24 (12 years ago)

Author:

Kris Deugau

Message:

/trunk

Record validation refactoring
Complete A and AAAA record (*almost* identical)

File:

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

trunk/DNSDB.pm

@@ -241 +241 @@
 # A record
 sub _validate_1 {
+  my $dbh = shift;
+  my $defrec = shift;
+  my $revrec = shift;
+  my $id = shift;      # parent (group_id for defrecs, rdns_id for reverse records,
+                       # domain_id for domain records)
+
+  # These next two should be references, so we can pass them back altered.  Yes, we really want to do that.
+  my $host = shift;
+  my $val = shift;
+  my $addr = shift;
+
+  return ('FAIL', 'Reverse zones cannot contain A records') if $revrec eq 'y';
+
+  # Coerce all hostnames to end in ".DOMAIN" for group/default records,
+  # or the intended parent domain for live records.
+  my $pname = ($defrec eq 'y' ? 'DOMAIN' : domainName($dbh,$id));
+  $$host =~ s/\.*$/\.$pname/ if $$host !~ /$pname$/;
+
+  # Check IP is well-formed, and that it's a v4 address
+  return ('FAIL',"A record must be a valid IPv4 address")
+        unless $addr && !$addr->{isv6};
+  # coerce IP/value to normalized form for storage
+  $$val = $addr->addr;
+
   return ('OK','OK');
 } # done A record
@@ -281 +305 @@
 # AAAA record
 sub _validate_28 {
+  my $dbh = shift;
+  my $defrec = shift;
+  my $revrec = shift;
+  my $id = shift;      # parent (group_id for defrecs, rdns_id for reverse records,
+                       # domain_id for domain records)
+
+  # These next two should be references, so we can pass them back altered.  Yes, we really want to do that.
+  my $host = shift;
+  my $val = shift;
+  my $addr = shift;
+
+  return ('FAIL', 'Reverse zones cannot contain AAAA records') if $revrec eq 'y';
+
+  # Coerce all hostnames to end in ".DOMAIN" for group/default records,
+  # or the intended parent domain for live records.
+  my $pname = ($defrec eq 'y' ? 'DOMAIN' : domainName($dbh,$id));
+  $$host =~ s/\.*$/\.$pname/ if $$host !~ /$pname$/;
+
+  # Check IP is well-formed, and that it's a v6 address
+  return ('FAIL',"AAAA record must be a valid IPv6 address")
+        unless $addr && $addr->{isv6};
+  # coerce IP/value to normalized form for storage
+  $$val = $addr->addr;
+
   return ('OK','OK');
 } # done AAAA record