Changeset 617

Timestamp:

04/24/14 14:48:16 (11 years ago)

Author:

Kris Deugau

Message:

/trunk

Move case-folding in addRec() and updateRec() to its own sub. Add calls
in addDomain() and addRDNS() to case-fold records after all the other
mangling is done, just before inserting the new live record.

Extends/updates change in r542.

File:

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

trunk/DNSDB.pm

@@ -1118 +1118 @@
   return ('OK','OK');
 }
+
+# Subs not specific to a particular record type
+
+# Convert $$host and/or $$val to lowercase as appropriate.
+# Should only be called if $self->{lowercase} is true.
+# $rectype is also a reference for caller convenience
+sub _caseclean {
+  my ($rectype, $host, $val, $defrec, $revrec) = @_;
+
+  # Can't case-squash default records, due to DOMAIN, ZONE, and ADMINDOMAIN templating
+  return if $defrec eq 'y';
+
+  if ($typemap{$$rectype} eq 'TXT' || $typemap{$$rectype} eq 'SPF') {
+    # TXT records should preserve user entry in the string.
+    # SPF records are a duplicate of TXT with a new record type value (99)
+    $$host = lc($$host) if $revrec eq 'n';      # only lowercase $$host on live forward TXT;  preserve TXT content
+    $$val = lc($$val) if $revrec eq 'y';        # only lowercase $$val on live reverse TXT;  preserve TXT content
+  } else {
+    # Non-TXT, live records, are fully case-insensitive
+    $$host = lc($$host);
+    $$val = lc($$val);
+  } # $typemap{$$rectype} else
+
+} # _caseclean()
 
 
@@ -1985 +2009 @@
       $host =~ s/DOMAIN/$domain/g;
       $val =~ s/DOMAIN/$domain/g;
+      _caseclean(\$type, \$host, \$val, 'n', 'n') if $self->{lowercase};
       $sth_in->execute($host, $type, $val, $dist, $weight, $port, $ttl, $defloc);
       if ($typemap{$type} eq 'SOA') {
@@ -2289 +2314 @@
         }
       }
+
+      _caseclean(\$type, \$host, \$val, 'n', 'y') if $self->{lowercase};
 
       $sth_in->execute($domid,$host,$type,$val,$ttl,$defloc);
@@ -3884 +3911 @@
   }
 
-  if ($self->{lowercase}) {
-    if ($typemap{$$rectype} ne 'TXT') {
-      $$host = lc($$host);
-      $$val = lc($$val);
-    } else {
-      # TXT records should preserve user entry in the string.
-      if ($revrec eq 'n') {
-        $$host = lc($$host);
-      } else {
-        $$val = lc($$val);
-      }
-    }
-  }
+  _caseclean($rectype, $host, $val, $defrec, $revrec) if $self->{lowercase};
 
   # prep for validation
@@ -4045 +4060 @@
   }
 
-  if ($self->{lowercase}) {
-    if ($typemap{$$rectype} ne 'TXT') {
-      $$host = lc($$host);
-      $$val = lc($$val);
-    } else {
-      # TXT records should preserve user entry in the string.
-      if ($revrec eq 'n') {
-        $$host = lc($$host);
-      } else {
-        $$val = lc($$val);
-      }
-    }
-  }
+  _caseclean($rectype, $host, $val, $defrec, $revrec) if $self->{lowercase};
 
   # prep for validation