Changeset 609

Timestamp:

04/16/14 13:03:21 (11 years ago)

Author:

Kris Deugau

Message:

/trunk

Remove checks in addRec() and updateRec() that blocked reverse records
with a "value" that wasn't a formally correct IP address or rDNS .arpa
name for an IP.

File:

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

trunk/DNSDB.pm

@@ -375 +375 @@
   # can't do nuttin' in forward zones
 } # end _ipparent()
+
+## DNSDB::_maybeip()
+# Wrapper for quick "does this look like an IP address?" regex, so we don't make dumb copy-paste mistakes
+sub _maybeip {
+  my $izzit = shift;  # reference
+  return 1 if $$izzit =~ m,^(?:[\d\./]+|[0-9a-fA-F:/]+)$,;
+}
 
 ## DNSDB::_hostparent()
@@ -3854 +3861 @@
 
   # prep for validation
-  # Autodetect formal .arpa names
-  if ($$val =~ /\.arpa\.?$/) {
-    my ($code,$tmpval) = _zone2cidr($$val);
-    return ('FAIL', $tmpval) if $code eq 'FAIL';
-    $$val = $tmpval;
-  }
-  my $addr = NetAddr::IP->new($$val);
+  my $addr = NetAddr::IP->new($$val) if _maybeip($val);
   $$host =~ s/\.+$//;   # FQDNs ending in . are an internal detail, and really shouldn't be exposed in the UI.
 
@@ -4024 +4025 @@
 
   # prep for validation
-  # Autodetect formal .arpa names
-  if ($$val =~ /\.arpa\.?$/) {
-    my ($code,$tmpval) = _zone2cidr($$val);
-    return ('FAIL', $tmpval) if $code eq 'FAIL';
-    $$val = $tmpval;
-  }
-  my $addr = NetAddr::IP->new($$val);
+  my $addr = NetAddr::IP->new($$val) if _maybeip($val);
   $$host =~ s/\.+$//;   # FQDNs ending in . are an internal detail, and really shouldn't be exposed in the UI.