Changeset 37 for trunk

Timestamp:

11/18/09 13:42:22 (15 years ago)

Author:

Kris Deugau

Message:

/trunk

AXFR import is now basically functional

• could maybe use a few more recognized types
• need to find someplace to stuff the serial from the imported SOA

Fix missing template substitution on regular new domain creation

Location:

trunk

Files:

• DNSDB.pm (modified) (13 diffs)
• dns.cgi (modified) (3 diffs)

trunk/DNSDB.pm

@@ -200 +200 @@
     while (my ($host,$type,$val,$dist,$weight,$port,$ttl) = $sth->fetchrow_array()) {
       $host =~ s/DOMAIN/$domain/g;
+      $val =~ s/DOMAIN/$domain/g;
       $sth_in->execute($host,$type,$val,$dist,$weight,$port,$ttl);
     }
@@ -814 +815 @@
 ## DNSDB::importAXFR
 # Import a domain via AXFR
+# Takes AXFR host, domain to transfer, group to put the domain in,
+# and optionally:
+#  - active/inactive state flag (defaults to active)
+#  - overwrite-SOA flag (defaults to off)
+#  - overwrite-NS flag (defaults to off, doesn't affect subdomain NS records)
+# Returns a status code (OK, WARN, or FAIL) and message - message should be blank
+# if status is OK, but WARN includes conditions that are not fatal but should
+# really be reported.
 sub importAXFR {
   my $dbh = shift;
@@ -822 +831 @@
   my $rwsoa = shift || 0;
   my $rwns = shift || 0;
+
 ##fixme:  add mode to delete&replace, merge+overwrite, merge new?
 
-my $nrecs = 0;
-my $soaflag = 0;
-my $nsflag = 0;
-my $warnmsg = '';
-my $ifrom;
+  my $nrecs = 0;
+  my $soaflag = 0;
+  my $nsflag = 0;
+  my $warnmsg = '';
+  my $ifrom;
 
   # choke on possible bad setting in ifrom
-  # IPv4 and v6!
+  # IPv4 and v6, and valid hostnames!
   ($ifrom) = ($ifrom_in =~ /^([0-9a-f\:.]+|[0-9a-z_.-]+)$/i);
   return ('FAIL', "Bad AXFR source host $ifrom")
@@ -841 +851 @@
   local $dbh->{RaiseError} = 1;
 
-  my $sth_domin = $dbh->prepare("INSERT INTO domains (domain,group_id,status) VALUES (?,?,?)");
-  my $sth_getid = $dbh->prepare("SELECT domain_id FROM domains WHERE domain=?");
+  my $sth = $dbh->prepare("SELECT domain_id FROM domains WHERE domain=?");
   my $dom_id;
 
 # quick check to start to see if we've already got one
-  $sth_getid->execute($domain);
-  ($dom_id) = $sth_getid->fetchrow_array;
+  $sth->execute($domain);
+  ($dom_id) = $sth->fetchrow_array;
 
   return ('FAIL', "Domain already exists") if $dom_id;
@@ -856 +865 @@
 
 ##fixme:  serial
-    $sth_domin->execute($domain,$group,$status);
+    my $sth = $dbh->prepare("INSERT INTO domains (domain,group_id,status) VALUES (?,?,?)");
+    $sth->execute($domain,$group,$status);
 
 ## bizarre DBI<->Net::DNS interaction bug:
 ## sometimes a zone will cause an immediate commit-and-exit (sort of) of the while()
+## fixed, apparently I was doing *something* odd, but not certain what it was that
+## caused a commit instead of barfing
 
     # get domain id so we can do the records
-    $sth_getid->execute($domain);
-    ($dom_id) = $sth_getid->fetchrow_array();
+    $sth = $dbh->prepare("SELECT domain_id FROM domains WHERE domain=?");
+    $sth->execute($domain);
+    ($dom_id) = $sth->fetchrow_array();
 
     my $res = Net::DNS::Resolver->new;
@@ -870 +883 @@
         or die "Couldn't begin AXFR\n";
 
-#my $foobar = $res->axfr_next() if $domain =~ /loki/;
-#die "outside the loop with ".$foobar->type."\n" if $domain =~ /loki/;
-
     while (my $rr = $res->axfr_next()) {
       my $type = $rr->type;
 
-#die "first record! $type\n" if $domain =~ /lok/;
-
       my $sql = "INSERT INTO records (domain_id,host,type,ttl,val";
       my $vallen = "?,?,?,?,?";
-#      my $host = $rr->name;
-#      my $ttl = $rr->ttl;
-#      my $val;
-
-$soaflag = 1 if $type eq 'SOA';
-$nsflag = 1 if $type eq 'NS';
-
-##work
+
+      $soaflag = 1 if $type eq 'SOA';
+      $nsflag = 1 if $type eq 'NS';
+
       my @vallist = ($dom_id, $rr->name, $reverse_typemap{$type}, $rr->ttl);
 
@@ -900 +904 @@
         push @vallist, $rr->address;
       } elsif ($type eq 'NS') {
+# hmm.  should we warn here if subdomain NS'es are left alone?
+        next if ($rwns && ($rr->name eq $domain));
         push @vallist, $rr->nsdname;
         $nsflag = 1;
@@ -905 +911 @@
         push @vallist, $rr->cname;
       } elsif ($type eq 'SOA') {
+        next if $rwsoa;
         $vallist[1] = $rr->mname.":".$rr->rname;
         push @vallist, ($rr->refresh.":".$rr->retry.":".$rr->expire.":".$rr->minimum);
@@ -927 +934 @@
         $sql .= ",distance,weight,port" if $type eq 'SRV';
         $vallen .= ",?,?,?" if $type eq 'SRV';
+        push @vallist, $rr->target;
         push @vallist, $rr->priority;
         push @vallist, $rr->weight;
@@ -934 +942 @@
         push @vallist, ($rr->flags.":".$rr->protocol.":".$rr->algorithm.":".$rr->key.":".$rr->keytag.":".$rr->privatekeyname);
       } else {
+        push @vallist, $rr->rdatastr;
         # Finding a different record type is not fatal.... just problematic.
+        # We may not be able to export it correctly.
         $warnmsg .= "Unusual record ".$rr->name." ($type) found\n";
       }
@@ -948 +958 @@
 # DNSKEY DLV X25 TXT TSIG TKEY SSHFP SRV SPF SOA RT RP PX PTR NULL APL::AplItem
 
-# MX and SRV have known extras to stuff in.
-      if ($type eq 'MX') {
-        push @vallist, $rr->preference;
+      $sth = $dbh->prepare($sql.") VALUES (".$vallen.")") or die "problem preparing record insert SQL\n";
+      $sth->execute(@vallist) or die "failed to insert ".$rr->string.": ".$sth->errstr."\n";
+
+      $nrecs++;
+
+    } # while axfr_next
+
+    # Overwrite SOA record
+    if ($rwsoa) {
+      $soaflag = 1;
+      my $sthgetsoa = $dbh->prepare("SELECT host,val,ttl FROM default_records WHERE group_id=? AND type=?");
+      my $sthputsoa = $dbh->prepare("INSERT INTO records (domain_id,host,type,val,ttl) VALUES (?,?,?,?,?)");
+      $sthgetsoa->execute($group,$reverse_typemap{SOA});
+      while (my ($host,$val,$ttl) = $sthgetsoa->fetchrow_array()) {
+        $host =~ s/DOMAIN/$domain/g;
+        $val =~ s/DOMAIN/$domain/g;
+        $sthputsoa->execute($dom_id,$host,$reverse_typemap{SOA},$val,$ttl);
       }
-      if ($type eq 'SRV') {
+    }
+
+    # Overwrite NS records
+    if ($rwns) {
+      $nsflag = 1;
+      my $sthgetns = $dbh->prepare("SELECT host,val,ttl FROM default_records WHERE group_id=? AND type=?");
+      my $sthputns = $dbh->prepare("INSERT INTO records (domain_id,host,type,val,ttl) VALUES (?,?,?,?,?)");
+      $sthgetns->execute($group,$reverse_typemap{NS});
+      while (my ($host,$val,$ttl) = $sthgetns->fetchrow_array()) {
+        $host =~ s/DOMAIN/$domain/g;
+        $val =~ s/DOMAIN/$domain/g;
+        $sthputns->execute($dom_id,$host,$reverse_typemap{NS},$val,$ttl);
       }
-
-      my $sth_rr = $dbh->prepare($sql.") VALUES (".$vallen.")");
-      $sth_rr->execute(@vallist) or die "failed to insert ".$rr->string.": ".$sth_rr->errstr."\n" if $sth_rr->err;
-
-      if ($type eq 'SOA') {
-      }
-
-#die "die.die.die!\n";
-
-      $nrecs++;
-
-    } # while axfr_next
+    }
 
     die "No records found;  either $ifrom is not authoritative or doesn't allow transfers\n" if !$nrecs;
@@ -971 +995 @@
     die "Bad zone:  No NS records!\n" if !$nsflag;
 
-$dbh->rollback;
-#    $dbh->commit;
-
-#    die "Bad zone.  BAD zone!  No cookie!\n";
-#die "don't insert me!  I'm nasty, I am!\n";
+    $dbh->commit;
+
   };
 
@@ -981 +1002 @@
     my $msg = $@;
     eval { $dbh->rollback; };
-#    $dbh->do("delete from domains where domain='$domain'");
     return ('FAIL',$msg." $warnmsg");
   } else {
-#    $dbh->do("delete from domains where domain='$domain'");
     return ('WARN', $warnmsg) if $warnmsg;
     return ('OK',"ook");
   }
 
+  # it should be impossible to get here.
   return ('WARN',"OOOK!");
 } # end importAXFR()

trunk/dns.cgi

@@ -68 +68 @@
 
 # default
-#my $perpage = 15;
-my $perpage = 3;
+my $perpage = 15;
+#my $perpage = 3;
 my $offset = ($webvar{offset} ? $webvar{offset} : 0);
 
@@ -601 +601 @@
   $page->param(rwsoa => $webvar{rwsoa}) if $webvar{rwsoa};
   $page->param(rwns => $webvar{rwns}) if $webvar{rwns};
-  $page->param(dominactive => 1) if !$webvar{domactive};
+  $page->param(dominactive => 1) if (!$webvar{domactive} && $webvar{doit});     # eww.
   $page->param(importdoms => $webvar{importdoms}) if $webvar{importdoms};
 ##work
@@ -623 +623 @@
         $row{domwarn} = $msg;
       }
-      $row{domerr} = $msg if $code eq 'FAIL';
+      if ($code eq 'FAIL') {
+        $msg =~ s|\n|<br />|g;
+        $row{domerr} = $msg;
+      }
       # do stuff!  DNSDB::importAXFR($webvar{ifrom}, $webvar{rwsoa}, $webvar{rwns}, $domain, <flags>)
       $row{domain} = $domain;