Index: /trunk/DNSDB.pm =================================================================== --- /trunk/DNSDB.pm (revision 32) +++ /trunk/DNSDB.pm (revision 33) @@ -15,4 +15,5 @@ use Exporter; use DBI; +use Net::DNS; #use Net::SMTP; #use NetAddr::IP qw( Compact ); @@ -811,4 +812,79 @@ +## DNSDB::importAXFR +# Import a domain via AXFR +sub importAXFR { + my $dbh = shift; + my $ifrom = shift; + my $domain = shift; + my $group = shift; + my $status = shift || 1; + my $rwsoa = shift || 0; + my $rwns = shift || 0; +##fixme: add mode to delete&replace, merge+overwrite, merge new? + + my $res = Net::DNS::Resolver->new; +$res->axfr_start($domain); +my $nrecs = 0; +my $flags = 0; + + # Allow transactions, and raise an exception on errors so we can catch it later. + # Use local to make sure these get "reset" properly on exiting this block + local $dbh->{AutoCommit} = 0; + local $dbh->{RaiseError} = 1; + + eval { + # can't do this, can't nest transactions. sigh. + #my ($dcode, $dmsg) = addDomain($dbh, $domain, $group, $status); + +##fixme: serial + my $sth = $dbh->prepare("INSERT INTO domains (domain,group_id,status) VALUES (?,?,?)"); + $sth->execute($domain,$group,$state); + + # get domain id so we can do the records + $sth = $dbh->prepare("select domain_id from domains where domain='$domain'"); + $sth->execute; + ($dom_id) = $sth->fetchrow_array(); + + while (my $rr = $res->axfr_next) { + my $type = $rr->type; +# nasty big ugly case-like thing here, since we have to do *some* different +# processing depending on the record. le sigh. + my $sql = "INSERT INTO records (domain_id,host,type,val,ttl"; + my $vallen = "?,?,?,?,?"; + my $host,$val; + +##work +# gnnnnnh. going to need to (rr->string) -> split -> +my @vallist; + if ($type eq 'SOA') { + $host = $rr->mname.":".$rr->rname; + $val = $rr->refresh.":".$rr->retry.":".$rr->expire.":".$rr->minimum; + } + if ($type eq 'MX' || $type eq 'SRV') { + $sql .= ",distance"; + $vallen .= ",?"; + $sql .= ",weight,port" if $type eq 'SRV'; + $vallen .= ",?,?" if $type eq 'SRV'; + } +$sth = $dbh->prepare($sql.") VALUES (".$vallen.")"); +$sth->execute(@vallist); + + #print $rr->rdata."\n"; + } + }; + + if ($@) { + my $msg = $@; + eval { $dbh->rollback; }; + return ('FAIL',$msg); + } else { + return ('OK',"ook"); + } + + return ('WARN'," +} # end importAXFR() + + # shut Perl up 1; Index: /trunk/dns.cgi =================================================================== --- /trunk/dns.cgi (revision 32) +++ /trunk/dns.cgi (revision 33) @@ -601,6 +601,34 @@ $page->param(rwsoa => $webvar{rwsoa}) if $webvar{rwsoa}; $page->param(rwns => $webvar{rwns}) if $webvar{rwns}; + $page->param(dominactive => 1) unless $webvar{domactive}; $page->param(importdoms => $webvar{importdoms}) if $webvar{importdoms}; ##work + +##fixme: check group too? + if ($webvar{doit} eq 'y' && !$webvar{ifrom}) { + $page->param(errmsg => "Need to set host to import from"); + } elsif ($webvar{doit} eq 'y' && !$webvar{importdoms}) { + $page->param(errmsg => "Need domains to import"); + } else { + my @domlist = split /\s+/, $webvar{importdoms}; + my @results; +my $rnum = 0; + foreach my $domain (@domlist) { + # do stuff! DNSDB::importAXFR($webvar{ifrom}, $webvar{rwsoa}, $webvar{rwns}, $domain, ) + my %row; + $row{domain} = $domain; +# $row{row} = $rnum++; + if ($domain eq 'deepnet.cx' || $domain eq 'wh-int') { + $row{domok} = 0; $row{domerr} = "foo! hahahaha!"; + } elsif ($domain eq 'waslokido.com') { + $row{domwarn} = 0; $row{domwarn} = "foo! hahahaha!"; + } else { + $row{domok} = 1; + } + push @results, \%row; + } + $page->param(axfrresults => \@results); + } + push @debugbits, "
$webvar{importdoms}
"; } Index: /trunk/templates/axfr.tmpl =================================================================== --- /trunk/templates/axfr.tmpl (revision 32) +++ /trunk/templates/axfr.tmpl (revision 33) @@ -5,5 +5,5 @@ -
Query error:
+
Error:
@@ -35,4 +35,8 @@ + Import as active? + checked> + + Domains to import:
(one per line) @@ -46,19 +50,15 @@ +
- - - - + + + + + -
AXFR Import Results
Imported OK
Failed:
Try again? - value="0">No/Discard
- value="R">Replace
- value="M">Merge + Overwrite
- value="M">Merge only new records - 		Imported OKWarning: Failed:
Index: /trunk/templates/dns.css =================================================================== --- /trunk/templates/dns.css (revision 32) +++ /trunk/templates/dns.css (revision 33) @@ -70,4 +70,15 @@ background-color: #DDDDDD; } +td.err { + border: solid 2px #FF0000; + color: red; + background-color: #e0e0e0; +} +td.warn { + border: solid 2px #FFFF00; + color: #333300; + background-color: #e0e0e0; +} + .meat { align: center;